X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=57150c39777d1535d414adb7999912cd3aed54fd;hb=cc6f7ebe59c148e62cd9f1947d9ba30638db2980;hp=3cd229d884800b37b5cb1f0b8034bd9e67b1dee6;hpb=1c37c329efcec099e7af2eb3db81fc7182e5a51d;p=jalview.git

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 3cd229d..57150c3 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -23,7 +23,7 @@ import java.awt.*;
 import java.awt.event.*;
 
 public class OverviewPanel
-    extends Panel implements Runnable
+    extends Panel implements Runnable, MouseMotionListener, MouseListener
 {
   Image miniMe;
   AlignViewport av;
@@ -32,11 +32,17 @@ 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
+  SequenceRenderer sr;
+  FeatureRenderer fr;
+
+
   Frame nullFrame;
 
   public OverviewPanel(AlignmentPanel ap)
@@ -47,14 +53,29 @@ public class OverviewPanel
     nullFrame = new Frame();
     nullFrame.addNotify();
 
+
+    sr = new SequenceRenderer(av);
+    sr.graphics = nullFrame.getGraphics();
+    sr.renderGaps( false );
+    fr = new FeatureRenderer(av);
+    fr.drawText = 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
     {
@@ -81,32 +102,24 @@ public class OverviewPanel
       }
     });
 
-    addMouseMotionListener(new MouseMotionAdapter()
-    {
-      public void mouseDragged(MouseEvent evt)
-      {
-        doMouseDragged(evt);
-      }
-    });
+    addMouseMotionListener(this);
 
-    addMouseListener(new MouseAdapter()
-    {
-      public void mousePressed(MouseEvent evt)
-      {
-        doMousePressed(evt);
-      }
-
-      public void mouseReleased(MouseEvent evt)
-      {
-        doMouseReleased(evt);
-      }
-    });
+    addMouseListener(this);
 
     updateOverviewImage();
 
   }
 
-  public void doMousePressed(MouseEvent evt)
+
+  public void mouseEntered(MouseEvent evt)
+  {}
+  public void mouseExited(MouseEvent evt)
+  {}
+  public void mouseClicked(MouseEvent evt)
+  {}
+  public void mouseMoved(MouseEvent evt)
+  {}
+  public void mousePressed(MouseEvent evt)
   {
     boxX = evt.getX();
     boxY = evt.getY();
@@ -115,7 +128,7 @@ public class OverviewPanel
     repaint();
   }
 
-  public void doMouseReleased(MouseEvent evt)
+  public void mouseReleased(MouseEvent evt)
   {
     boxX = evt.getX();
     boxY = evt.getY();
@@ -124,7 +137,7 @@ public class OverviewPanel
                          (int) (boxY / scaleh / av.getCharHeight()));
   }
 
-  public void doMouseDragged(MouseEvent evt)
+  public void mouseDragged(MouseEvent evt)
   {
     boxX = evt.getX();
     boxY = evt.getY();
@@ -170,6 +183,10 @@ public class OverviewPanel
         return;
     }
 
+    if (av.showSequenceFeatures)
+      fr.featuresDisplayed = ap.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed;
+
+
     resizing = true;
 
     if ( (getSize().width > 0) && (getSize().height > 0))
@@ -212,83 +229,56 @@ 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++)
+    int lastcol=-1, lastrow=-1;
+    Color color = Color.yellow;
+    int row, col;
+    for (col = 0; col < width; col++)
+    {
+      for (row = 0; row < sequencesHeight; row++)
       {
-        eSeq = 0;
-        eRes += maxSize;
-        if (eRes > alwidth)
+        if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow)
         {
-          eRes = alwidth;
+          mg.drawLine(col, row, col, row);
+          continue;
         }
 
-        for (int sSeq = 0, chunky = 0; sSeq < alheight; sSeq += maxSize, chunky++)
+        if (av.conservation != null)
         {
-          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;
+          mg.translate(col, sequencesHeight);
+          ap.annotationPanel.drawGraph(mg, av.conservation,
+                                       (int) (sampleCol) + 1,
+                                       graphHeight,
+                                       (int) (col * sampleCol),
+                                       (int) (col * sampleCol) + 1);
+          mg.translate( -col, -sequencesHeight);
+        }
 
-          blocky += (int) ( (float) sSeq / (float) alheight * sequencesHeight);
+        lastrow = (int)(row*sampleRow);
+        lastcol = (int)(col*sampleCol);
 
-          mg.drawImage(block, blockx,
-                       blocky,
-                       blockx + blockw,
-                       blocky + blockh,
+        if(av.alignment.getSequenceAt(lastrow).getLength()>lastcol)
+        {
+          color = sr.findSequenceColour(av.alignment.getSequenceAt(lastrow), lastcol);
 
-                       0, 0, block.getWidth(null), block.getHeight(null), this);
 
-          block = null;
+          if (av.showSequenceFeatures)
+            color = fr.findFeatureColour(color,
+                                        av.alignment.getSequenceAt(lastrow),
+                                         lastcol);
         }
 
-      }
+        mg.setColor(color);
+        mg.drawLine(col,row,col,row);
 
+      }
     }
-    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();