X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=5391e7862d131cc95ffa7ee9465633729e907f03;hb=04bb62b586382f183f08eb70131e7bf5f67cb47a;hp=6c968a259c8042c1d73253037bf3fa8e40292eba;hpb=a8458ff4b33d8deb7e09a39b8ce5576880f6a862;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 6c968a2..5391e78 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -40,13 +40,18 @@ public class OverviewPanel extends JPanel implements Runnable
     float scaleh = 1f;
     int width;
     int sequencesHeight;
-    int graphHeight = 30;
+    int graphHeight = 20;
     int boxX = -1;
     int boxY = -1;
     int boxWidth = -1;
     int boxHeight = -1;
     boolean resizing = false;
 
+    // Can set different properties in this seqCanvas than
+    // main visible SeqCanvas
+    SequenceRenderer sr;
+    FeatureRenderer fr;
+
     /**
      * Creates a new OverviewPanel object.
      *
@@ -58,14 +63,26 @@ public class OverviewPanel extends JPanel implements Runnable
         this.ap = ap;
         setLayout(null);
 
+        sr = new SequenceRenderer(av);
+        sr.renderGaps( false );
+        fr = new FeatureRenderer(av);
+        fr.transparency = ap.seqPanel.seqCanvas.getFeatureRenderer().transparency;
+        fr.featuresDisplayed = ap.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed;
+
         // scale the initial size of overviewpanel to shape of alignment
         float initialScale = (float) av.alignment.getWidth() / (float) av.alignment.getHeight();
 
+        if(av.conservation==null)
+          graphHeight = 0;
+
+
         if (av.alignment.getWidth() > av.alignment.getHeight())
         {
             // wider
             width = 400;
             sequencesHeight = (int) (400f / initialScale);
+            if(sequencesHeight<40)
+              sequencesHeight = 40;
         }
         else
         {
@@ -95,6 +112,7 @@ public class OverviewPanel extends JPanel implements Runnable
             {
                 public void mouseDragged(MouseEvent evt)
                 {
+                  if(!av.wrapAlignment)
                     doMouseDragged(evt);
                 }
             });
@@ -103,11 +121,13 @@ public class OverviewPanel extends JPanel implements Runnable
             {
                 public void mousePressed(MouseEvent evt)
                 {
+                  if(!av.wrapAlignment)
                     doMousePressed(evt);
                 }
 
                 public void mouseReleased(MouseEvent evt)
                 {
+                  if(!av.wrapAlignment)
                     doMouseReleased(evt);
                 }
             });
@@ -140,11 +160,8 @@ public class OverviewPanel extends JPanel implements Runnable
         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()));
-        }
     }
 
     /**
@@ -158,11 +175,9 @@ public class OverviewPanel extends JPanel implements Runnable
         boxY = evt.getY();
         checkValid();
 
-        if (!resizing)
-        {
-            ap.setScrollValues((int) (boxX / scalew / av.getCharWidth()),
-                (int) (boxY / scaleh / av.getCharHeight()));
-        }
+        ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
+                           (int) (boxY / scaleh / av.getCharHeight()));
+       repaint();
     }
 
     /**
@@ -204,6 +219,15 @@ public class OverviewPanel extends JPanel implements Runnable
 
         resizing = true;
 
+        if ( (getWidth() > 0) && (getHeight() > 0))
+        {
+          width = getWidth();
+          sequencesHeight = getHeight() - graphHeight;
+        }
+
+        setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
+        setBoxPosition();
+
         Thread thread = new Thread(this);
         thread.start();
         repaint();
@@ -223,12 +247,6 @@ public class OverviewPanel extends JPanel implements Runnable
         int alwidth = av.alignment.getWidth();
         int alheight = av.alignment.getHeight();
 
-        if ((getWidth() > 0) && (getHeight() > 0))
-        {
-            width = getWidth();
-            sequencesHeight = getHeight() - graphHeight;
-        }
-
         setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
 
         int fullsizeWidth = alwidth * av.getCharWidth();
@@ -240,92 +258,56 @@ public class OverviewPanel extends JPanel implements Runnable
         miniMe = new BufferedImage(width, sequencesHeight + graphHeight,
                 BufferedImage.TYPE_INT_RGB);
 
+
         Graphics mg = miniMe.getGraphics();
-        BufferedImage consensus = new BufferedImage(fullsizeWidth, 60,
-                BufferedImage.TYPE_3BYTE_BGR);
-        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);
+        mg.setColor(Color.orange);
+        mg.fillRect(0,0,width, miniMe.getHeight());
 
-        boolean oldRenderGaps = av.renderGaps;
+        float sampleCol = (float) alwidth / (float) width;
+        float sampleRow = (float) alheight / (float) sequencesHeight;
 
-        try
+        int lastcol=-1, lastrow=-1;
+        Color color = Color.white;
+        for (int col = 0; col < width; col++)
         {
-            // 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();
-            BufferedImage block;
-            int blockx = 0;
-            int blocky = 0;
-            int blockw = 0;
-            int blockh = 0;
-            int eRes = 0;
-            int eSeq = 0;
-
-            av.setRenderGaps(false);
-
-            for (int sRes = 0, chunkx = 0; sRes < alwidth;
-                    sRes += maxSize, chunkx++)
+          for (int row = 0; row < sequencesHeight; row++)
+          {
+            if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow)
             {
-                if(resizeAgain)
-                  break;
-
-                eSeq = 0;
-                eRes += maxSize;
-
-                if (eRes > alwidth)
-                {
-                    eRes = alwidth;
-                }
-
-                for (int sSeq = 0, chunky = 0; sSeq < alheight;
-                        sSeq += maxSize, chunky++)
-                {
-                    eSeq += maxSize;
-
-                    if (eSeq > alheight)
-                    {
-                        eSeq = alheight;
-                    }
-
-                    blocky = 0;
-                    blockx = (int) ((float) sRes / (float) alwidth * width);
-
-                    block = new BufferedImage((eRes - sRes) * av.charWidth,
-                            (eSeq - sSeq) * av.charHeight,
-                            BufferedImage.TYPE_3BYTE_BGR);
-                    g = block.getGraphics();
+              miniMe.setRGB(col,row,color.getRGB());
+              continue;
+            }
 
-                    ap.seqPanel.seqCanvas.drawPanel(g, sRes, eRes, sSeq, eSeq,
-                        sRes, sSeq, 0);
+            lastrow = (int)(row*sampleRow);
+            lastcol = (int)(col*sampleCol);
 
-                    blockh = (int) ((float) (eSeq - sSeq) / (float) alheight * sequencesHeight) +
-                        1;
-                    blockw = (int) ((float) (eRes - sRes) / (float) alwidth * width) +
-                        1;
+            color = sr.findSequenceColour(Color.white,
+                av.alignment.getSequenceAt(lastrow), lastcol);
 
-                    blocky += (int) ((float) sSeq / (float) alheight * sequencesHeight);
+            if(av.showSequenceFeatures)
+            {
+              color = fr.findFeatureColour(color,
+                                                       av.alignment.getSequenceAt(lastrow),
+                                                       lastcol);
+            }
 
-                    mg.drawImage(block, blockx, blocky, blockx + blockw,
-                        blocky + blockh, 0, 0, block.getWidth(),
-                        block.getHeight(), null);
+            miniMe.setRGB(col,row,color.getRGB());
 
-                    block = null;
-                }
+            if (av.conservation != null)
+            {
+              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);
             }
-        }
-        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();
@@ -342,6 +324,12 @@ public class OverviewPanel extends JPanel implements Runnable
      */
     public void setBoxPosition()
     {
+      int fullsizeWidth = av.alignment.getWidth() * av.getCharWidth();
+      int fullsizeHeight = av.alignment.getHeight() * av.getCharHeight();
+
+      scalew = (float) width / (float) fullsizeWidth;
+      scaleh = (float) sequencesHeight / (float) fullsizeHeight;
+
         boxX = (int) (av.getStartRes() * av.getCharWidth() * scalew);
         boxY = (int) (av.getStartSeq() * av.getCharHeight() * scaleh);
         boxWidth = (int) ((av.getEndRes() - av.getStartRes() + 1) * av.getCharWidth() * scalew);
@@ -357,26 +345,24 @@ public class OverviewPanel extends JPanel implements Runnable
      */
     public void paintComponent(Graphics g)
     {
-        g.setColor(Color.white);
-        g.fillRect(0, 0, getWidth(), getHeight());
-        g.setColor(Color.black);
-
-        if (resizing)
+        if (miniMe != null && !resizing)
         {
-            g.setFont(new Font("Verdana", Font.BOLD, 15));
-            g.drawString("Recalculating", 5, sequencesHeight / 2);
-            g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);
+          g.drawImage(miniMe, 0, 0, this);
         }
         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.white);
+          g.fillRect(0, 0, getWidth(), getHeight());
+          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.setColor(Color.red);
+        g.drawRect(boxX, boxY, boxWidth, boxHeight);
+        g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
+
     }
 }