JAL-2587 prevented double overview recalc on opening overview

[jalview.git] / src / jalview / gui / OverviewCanvas.java

diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java
index e49fd19..997d214 100644 (file)
--- a/src/jalview/gui/OverviewCanvas.java
+++ b/src/jalview/gui/OverviewCanvas.java
@@ -168,9 +168,6 @@ public class OverviewCanvas extends JComponent
   public void draw(boolean showSequenceFeatures, boolean showAnnotation,
           FeatureRenderer transferRenderer)
   {
-    // System.out.println(this.getHeight());
-    // setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
-
     miniMe = null;
     veryLastMiniMe = lastMiniMe;
 
@@ -214,7 +211,6 @@ public class OverviewCanvas extends JComponent
   @Override
   public void paintComponent(Graphics g)
   {
-
     if (restart)
     {
       if (lastMiniMe == null)
@@ -231,12 +227,12 @@ public class OverviewCanvas extends JComponent
     }
     else if (lastMiniMe != null)
     {
+      // is this a resize?
       if ((getWidth() > 0) && (getHeight() > 0)
               && ((getWidth() != od.getWidth())
                       || (getHeight() != od.getHeight())))
       {
-        // scale the alignment and annotation separately *** if there is
-        // annotation ***
+        // if there is annotation, scale the alignment and annotation separately
         if (od.getGraphHeight() > 0)
         {
           BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
@@ -263,8 +259,6 @@ public class OverviewCanvas extends JComponent
         }
         else
         {
-          System.out.println("Resetting height from/to: " + od.getHeight()
-                  + " " + getHeight());
           od.setWidth(getWidth());
           od.setHeight(getHeight());
         }
@@ -276,7 +270,7 @@ public class OverviewCanvas extends JComponent
         od.setBoxPosition(av.getAlignment().getHiddenSequences(),
                 av.getAlignment().getHiddenColumns());
       }
-      else
+      else // not a resize
       {
         if (alpha != 0) // this is a timer triggered dissolve
         {
@@ -292,20 +286,12 @@ public class OverviewCanvas extends JComponent
 
           g2d.dispose();
         }
-        /*       else if (lastMiniMe != miniMe)
-        {
-          g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-          g.setColor(TRANS_GREY);
-          g.fillRect(0, 0, getWidth(), getHeight());
-        }*/
         else
         {
           // fall back to normal behaviour
           g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
         }
-
       }
-
     }
 
     // draw the box