X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=411c2448e579498bdcf2b96f2eab28179c923e66;hb=48b925b3dd950c86b1add0f2a90a2d0f8b6e316e;hp=85a31f76f42c8a34eb3ef9fd9ce4eeaa5157bed8;hpb=02e1d788cdc3fa6df26343b984e7ed6bfb6f3262;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 85a31f7..411c244 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -27,14 +27,13 @@ import jalview.renderer.AnnotationRenderer;
 import jalview.renderer.AwtRenderPanelI;
 
 /**
- * DOCUMENT ME!
- *
+ * AnnotationPanel displays visible portion of annotation rows below unwrapped alignment 
  * @author $author$
  * @version $Revision$
  */
 public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
-        MouseListener, MouseMotionListener, ActionListener,
-        AdjustmentListener
+        MouseListener, MouseWheelListener, MouseMotionListener,
+        ActionListener, AdjustmentListener, Scrollable
 {
   final String HELIX = "Helix";
 
@@ -96,6 +95,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
 
   public final AnnotationRenderer renderer;
 
+  private MouseWheelListener[] _mwl;
+
   /**
    * Creates a new AnnotationPanel object.
    *
@@ -117,6 +118,10 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     addMouseMotionListener(this);
     ap.annotationScroller.getVerticalScrollBar()
             .addAdjustmentListener(this);
+    // save any wheel listeners on the scroller, so we can propagate scroll events to them.
+    _mwl = ap.annotationScroller.getMouseWheelListeners();
+    // and then set our own listener to consume all mousewheel events
+    ap.annotationScroller.addMouseWheelListener(this);
     renderer = new AnnotationRenderer();
   }
 
@@ -126,15 +131,78 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     renderer = new AnnotationRenderer();
   }
 
-  /**
-   * DOCUMENT ME!
-   *
-   * @param evt
-   *          DOCUMENT ME!
+  @Override
+  public void mouseWheelMoved(MouseWheelEvent e)
+  {
+    if (e.isShiftDown())
+    {
+      e.consume();
+      if (e.getWheelRotation() > 0)
+      {
+        ap.scrollRight(true);
+      }
+      else
+      {
+        ap.scrollRight(false);
+      }
+    }
+    else
+    {
+      // TODO: find the correct way to let the event bubble up to ap.annotationScroller
+      for (MouseWheelListener mwl : _mwl)
+      {
+        if (mwl != null)
+        {
+          mwl.mouseWheelMoved(e);
+        }
+        if (e.isConsumed())
+        {
+          break;
+        }
+      }
+    }
+  }
+
+  @Override
+  public Dimension getPreferredScrollableViewportSize()
+  {
+    return getPreferredSize();
+  }
+
+  @Override
+  public int getScrollableBlockIncrement(Rectangle visibleRect,
+          int orientation, int direction)
+  {
+    return 30;
+  }
+
+  @Override
+  public boolean getScrollableTracksViewportHeight()
+  {
+    return false;
+  }
+
+  @Override
+  public boolean getScrollableTracksViewportWidth()
+  {
+    return true;
+  }
+
+  @Override
+  public int getScrollableUnitIncrement(Rectangle visibleRect,
+          int orientation, int direction)
+  {
+    return 30;
+  }
+
+  /*
+   * (non-Javadoc)
+   * @see java.awt.event.AdjustmentListener#adjustmentValueChanged(java.awt.event.AdjustmentEvent)
    */
   @Override
   public void adjustmentValueChanged(AdjustmentEvent evt)
   {
+    // update annotation label display
     ap.alabels.setScrollOffset(-evt.getValue());
   }
 
@@ -146,7 +214,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 +226,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 +372,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     aa[activeRow].validateRangeAndDisplay();
 
     adjustPanelHeight();
+    ap.alignmentChanged();
     repaint();
 
     return;
@@ -809,7 +819,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
     repaint();
 
   }
-
+  private volatile boolean lastImageGood=false;
   /**
    * DOCUMENT ME!
    *
@@ -822,18 +832,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);
 
@@ -847,10 +860,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;
     }
 
@@ -876,7 +895,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