X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=7910f2dcbccdfe27c347844659d041890f9adfe4;hb=b03ab64755cdfd11f8d1f2c93d01f276d121e6d7;hp=2ddc5ff679f167e9287e0b71bd14fe8604deaf4a;hpb=c1d5d99668a2f897923f36234c8d86d14cf4f818;p=jalview.git

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 2ddc5ff..7910f2d 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -32,11 +32,16 @@ public class OverviewPanel
   float scaleh = 1f;
 
   public int width, sequencesHeight;
-  int graphHeight = 30;
+  int graphHeight = 20;
   int boxX = -1, boxY = -1, boxWidth = -1, boxHeight = -1;
 
   boolean resizing = false;
 
+  // Can set different properties in this seqCanvas than
+  // main visible SeqCanvas
+  SeqCanvas overviewSeq;
+
+
   Frame nullFrame;
 
   public OverviewPanel(AlignmentPanel ap)
@@ -47,14 +52,25 @@ public class OverviewPanel
     nullFrame = new Frame();
     nullFrame.addNotify();
 
+    overviewSeq = new SeqCanvas(av);
+    overviewSeq.isOverview = true;
+    overviewSeq.sr.renderGaps = false;
+
+
     // scale the initial size of overviewpanel to shape of alignment
     float initialScale = (float) av.alignment.getWidth() /
         (float) av.alignment.getHeight();
+
+    if(av.vconsensus==null)
+          graphHeight = 0;
+
     if (av.alignment.getWidth() > av.alignment.getHeight())
     {
       // wider
       width = 400;
       sequencesHeight = (int) (400f / initialScale);
+      if(sequencesHeight<40)
+              sequencesHeight = 40;
     }
     else
     {
@@ -120,11 +136,8 @@ public class OverviewPanel
     boxX = evt.getX();
     boxY = evt.getY();
     checkValid();
-    if (!resizing)
-    {
-      ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
+    ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
                          (int) (boxY / scaleh / av.getCharHeight()));
-    }
   }
 
   public void doMouseDragged(MouseEvent evt)
@@ -132,11 +145,9 @@ public class OverviewPanel
     boxX = evt.getX();
     boxY = evt.getY();
     checkValid();
-    if (!resizing)
-    {
-      ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
+    ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
                          (int) (boxY / scaleh / av.getCharHeight()));
-    }
+
     repaint();
     ap.repaint();
   }
@@ -169,17 +180,25 @@ public class OverviewPanel
    */
   public void updateOverviewImage()
   {
-      if (resizing)
-      {
-          resizeAgain = true;
-          return;
-      }
+    if (resizing)
+    {
+        resizeAgain = true;
+        return;
+    }
 
-      resizing = true;
+    resizing = true;
+
+    if ( (getSize().width > 0) && (getSize().height > 0))
+    {
+      width = getSize().width;
+      sequencesHeight = getSize().height - graphHeight;
+    }
+    setSize(new Dimension(width, sequencesHeight + graphHeight));
+    setBoxPosition();
 
-      Thread thread = new Thread(this);
-      thread.start();
-      repaint();
+    Thread thread = new Thread(this);
+    thread.start();
+        repaint();
   }
 
   // This is set true if the user resizes whilst
@@ -209,83 +228,36 @@ public class OverviewPanel
     miniMe = nullFrame.createImage(width, sequencesHeight + graphHeight);
 
     Graphics mg = miniMe.getGraphics();
-    Image consensus = nullFrame.createImage(fullsizeWidth, 60);
-    Graphics g = consensus.getGraphics();
-    ap.annotationPanel.drawGraph(g, av.conservation, fullsizeWidth, 60);
-    mg.drawImage(consensus, 0, sequencesHeight, width,
-                 sequencesHeight + graphHeight, 0, 0, fullsizeWidth, 60, this);
-
-    boolean oldRenderGaps = av.renderGaps;
-    try
-    {
-      // We'll have to draw the full size alignment in chunks, as an image of the
-      // whole alignment requires too much memory
-
-      // Max size depends on the font size, the following is a
-      // guess at a size which works
-      int maxSize = 2000 / av.getFont().getSize();
-      Image block;
-      int blockx = 0, blocky = 0, blockw = 0, blockh = 0, eRes = 0, eSeq = 0;
+    float sampleCol = (float) alwidth / (float) width;
+    float sampleRow = (float) alheight / (float) sequencesHeight;
 
-      av.setRenderGaps(false);
-      for (int sRes = 0, chunkx = 0; sRes < alwidth; sRes += maxSize, chunkx++)
+    for (int col = 0; col < width; col++)
+    {
+      for (int row = 0; row < sequencesHeight; row++)
       {
-        eSeq = 0;
-        eRes += maxSize;
-        if (eRes > alwidth)
-        {
-          eRes = alwidth;
-        }
-
-        for (int sSeq = 0, chunky = 0; sSeq < alheight; sSeq += maxSize, chunky++)
-        {
-          if(resizeAgain)
-                  break;
-
-          eSeq += maxSize;
-          if (eSeq > alheight)
-          {
-            eSeq = alheight;
-          }
-
-          blocky = 0;
-          blockx = (int) ( (float) sRes / (float) alwidth * width);
-
-          block = nullFrame.createImage( (eRes - sRes) * av.charWidth,
-                                        (eSeq - sSeq) * av.charHeight);
-          g = block.getGraphics();
-
-          ap.seqPanel.seqCanvas.drawPanel(g, sRes, eRes, sSeq, eSeq, sRes, sSeq,
-                                          0);
-
-          blockh = (int) ( (float) (eSeq - sSeq) / (float) alheight *
-                          sequencesHeight) + 1;
-          blockw = (int) ( (float) (eRes - sRes) / (float) alwidth * width) + 1;
-
-          blocky += (int) ( (float) sSeq / (float) alheight * sequencesHeight);
-
-          mg.drawImage(block, blockx,
-                       blocky,
-                       blockx + blockw,
-                       blocky + blockh,
-
-                       0, 0, block.getWidth(null), block.getHeight(null), this);
-
-          block = null;
-        }
+        overviewSeq.drawPanel(mg,
+                                        (int) (col * sampleCol),
+                                        (int) (col * sampleCol),
+                                        (int) (row * sampleRow),
+                                        (int) (row * sampleRow) + 1,
+                                        (int) (col * sampleCol),
+                                        (int) (row * sampleRow), 0);
+        mg.translate(0, 1);
+
+        if (av.conservation != null)
+          ap.annotationPanel.drawGraph(mg, av.conservation,
+                                       (int) (sampleCol) + 1,
+                                       graphHeight,
+                                       (int) (col * sampleCol),
+                                       (int) (col * sampleCol) + 1);
 
       }
+      mg.translate(0, -sequencesHeight);
+      mg.translate(1, 0);
 
-    }
-    catch (OutOfMemoryError error)
-    {
-      System.err.println(
-          "Out of memory when trying to calculate the overview window image!");
-    }
-
+        }
     System.gc();
 
-    av.setRenderGaps(oldRenderGaps);
     resizing = false;
 
     setBoxPosition();
@@ -320,27 +292,23 @@ public class OverviewPanel
 
   public void paint(Graphics g)
   {
-    if (resizing)
+    if (miniMe != null)
+    {
+      g.drawImage(miniMe, 0, 0, this);
+    }
+    else
     {
       g.setColor(Color.white);
       g.fillRect(0, 0, getSize().width, getSize().height);
       g.setColor(Color.black);
-
       g.setFont(new Font("Verdana", Font.BOLD, 15));
       g.drawString("Recalculating", 5, sequencesHeight / 2);
-      g.drawString("Overview.....", 5, sequencesHeight / 2 + 20);
+      g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);
     }
-    else
-    {
-      if (miniMe != null)
-      {
-        g.drawImage(miniMe, 0, 0, this);
-      }
 
-      g.setColor(Color.red);
-      g.drawRect(boxX, boxY, boxWidth, boxHeight);
-      g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
-    }
+    g.setColor(Color.red);
+    g.drawRect(boxX, boxY, boxWidth, boxHeight);
+    g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
   }
 
 }