javadoc

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

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index e00483d..df29464 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -27,8 +27,7 @@ import jalview.renderer.AnnotationRenderer;
 import jalview.renderer.AwtRenderPanelI;
 
 /**
- * DOCUMENT ME!
- *
+ * AnnotationPanel displays visible portion of annotation rows below unwrapped alignment 
  * @author $author$
  * @version $Revision$
  */
@@ -66,7 +65,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
   public BufferedImage image;
 
-  public BufferedImage fadedImage;
+  public volatile BufferedImage fadedImage;
 
   Graphics2D gg;
 
@@ -146,7 +145,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
    */
   public int adjustPanelHeight()
   {
-    int height = calcPanelHeight();
+    int height = av.calcPanelHeight();
     this.setPreferredSize(new Dimension(1, height));
     if (ap != null)
     {
@@ -158,65 +157,6 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
   }
 
   /**
-   * calculate the height for visible annotation, revalidating bounds where
-   * necessary ABSTRACT GUI METHOD
-   *
-   * @return total height of annotation
-   */
-  public int calcPanelHeight()
-  {
-    // setHeight of panels
-    AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
-    int height = 0;
-
-    if (aa != null)
-    {
-      for (int i = 0; i < aa.length; i++)
-      {
-        if (aa[i] == null)
-        {
-          System.err.println("Null annotation row: ignoring.");
-          continue;
-        }
-        if (!aa[i].visible)
-        {
-          continue;
-        }
-
-        aa[i].height = 0;
-
-        if (aa[i].hasText)
-        {
-          aa[i].height += av.charHeight;
-        }
-
-        if (aa[i].hasIcons)
-        {
-          aa[i].height += 16;
-        }
-
-        if (aa[i].graph > 0)
-        {
-          aa[i].height += aa[i].graphHeight;
-        }
-
-        if (aa[i].height == 0)
-        {
-          aa[i].height = 20;
-        }
-
-        height += aa[i].height;
-      }
-    }
-    if (height == 0)
-    {
-      // set minimum
-      height = 20;
-    }
-    return height;
-  }
-
-  /**
    * DOCUMENT ME!
    *
    * @param evt
@@ -363,6 +303,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     aa[activeRow].validateRangeAndDisplay();
 
     adjustPanelHeight();
+    ap.alignmentChanged();
     repaint();
 
     return;
@@ -715,7 +656,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     }
 
   }
-
+  private volatile boolean imageFresh=false;
   /**
    * DOCUMENT ME!
    *
@@ -758,9 +699,11 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
       fm = gg.getFontMetrics();
       gg.setColor(Color.white);
       gg.fillRect(0, 0, imgWidth, image.getHeight());
+      imageFresh=true;
     }
 
     drawComponent(gg, av.startRes, av.endRes + 1);
+    imageFresh=false;
     g.drawImage(image, 0, 0, this);
   }
 
@@ -807,7 +750,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     repaint();
 
   }
-
+  private volatile boolean lastImageGood=false;
   /**
    * DOCUMENT ME!
    *
@@ -820,18 +763,21 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
    */
   public void drawComponent(Graphics g, int startRes, int endRes)
   {
+    BufferedImage oldFaded=fadedImage;
     if (av.isCalcInProgress())
     {
       if (image == null)
       {
+        lastImageGood=false;
         return;
       }
       // We'll keep a record of the old image,
       // and draw a faded image until the calculation
       // has completed
-      if (fadedImage == null || fadedImage.getWidth() != imgWidth
-              || fadedImage.getHeight() != image.getHeight())
+      if (lastImageGood && (fadedImage == null || fadedImage.getWidth() != imgWidth
+              || fadedImage.getHeight() != image.getHeight()))
       {
+//        System.err.println("redraw faded image ("+(fadedImage==null ? "null image" : "") + " lastGood="+lastImageGood+")");
         fadedImage = new BufferedImage(imgWidth, image.getHeight(),
                 BufferedImage.TYPE_INT_RGB);
 
@@ -845,10 +791,16 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
         fadedG.drawImage(image, 0, 0, this);
 
       }
+      // make sure we don't overwrite the last good faded image until all calculations have finished
+      lastImageGood=false;
 
     }
     else
     {
+      if (fadedImage!=null)
+      {
+        oldFaded=fadedImage;
+      }
       fadedImage = null;
     }
 
@@ -874,7 +826,11 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
       return;
     }
-    renderer.drawComponent(this, av, g, activeRow, startRes, endRes);
+    lastImageGood = renderer.drawComponent(this, av, g, activeRow, startRes, endRes);
+    if (!lastImageGood && fadedImage==null)
+    {
+      fadedImage=oldFaded;
+    }
   }
 
   @Override