Merge develop to Release_2_8_3_Branch
[jalview.git] / src / jalview / appletgui / AlignmentPanel.java
old mode 100755 (executable)
new mode 100644 (file)
index 6b292e9..c74914f
@@ -1,53 +1,91 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
  * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
-
 package jalview.appletgui;
 
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
-
-public class AlignmentPanel
-    extends Panel implements AdjustmentListener
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Panel;
+import java.awt.Scrollbar;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+
+import jalview.analysis.AnnotationSorter;
+import jalview.api.AlignViewportI;
+import jalview.api.AlignmentViewPanel;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.SequenceI;
+import jalview.structure.StructureSelectionManager;
+
+public class AlignmentPanel extends Panel implements AdjustmentListener,
+        AlignmentViewPanel
 {
 
   public AlignViewport av;
+
   OverviewPanel overviewPanel;
+
   SeqPanel seqPanel;
+
   IdPanel idPanel;
+
   IdwidthAdjuster idwidthAdjuster;
+
   public AlignFrame alignFrame;
+
   ScalePanel scalePanel;
+
   AnnotationPanel annotationPanel;
+
   AnnotationLabels alabels;
 
   // this value is set false when selection area being dragged
   boolean fastPaint = true;
 
+  public void finalize()
+  {
+    alignFrame = null;
+    av = null;
+    seqPanel = null;
+    seqPanelHolder = null;
+    sequenceHolderPanel = null;
+    scalePanel = null;
+    scalePanelHolder = null;
+    annotationPanel = null;
+    annotationPanelHolder = null;
+    annotationSpaceFillerHolder = null;
+  }
+
   public AlignmentPanel(AlignFrame af, final AlignViewport av)
   {
     try
     {
       jbInit();
-    }
-    catch (Exception e)
+    } catch (Exception e)
     {
       e.printStackTrace();
     }
@@ -59,12 +97,12 @@ public class AlignmentPanel
     scalePanel = new ScalePanel(av, this);
     idwidthAdjuster = new IdwidthAdjuster(this);
     annotationPanel = new AnnotationPanel(this);
+    annotationPanelHolder.add(annotationPanel, BorderLayout.CENTER);
 
-    sequenceHolderPanel.add(annotationPanel, BorderLayout.SOUTH);
-
+    sequenceHolderPanel.add(annotationPanelHolder, BorderLayout.SOUTH);
     alabels = new AnnotationLabels(this);
 
-    setAnnotationVisible(av.showAnnotation);
+    setAnnotationVisible(av.isShowAnnotation());
 
     idPanelHolder.add(idPanel, BorderLayout.CENTER);
     idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
@@ -75,6 +113,7 @@ public class AlignmentPanel
     fontChanged();
     setScrollValues(0, 0);
 
+    apvscroll.addAdjustmentListener(this);
     hscroll.addAdjustmentListener(this);
     vscroll.addAdjustmentListener(this);
 
@@ -83,8 +122,14 @@ public class AlignmentPanel
       public void componentResized(ComponentEvent evt)
       {
         setScrollValues(av.getStartRes(), av.getStartSeq());
+        if (getSize().height > 0
+                && annotationPanelHolder.getSize().height > 0)
+        {
+          validateAnnotationDimensions(false);
+        }
         repaint();
       }
+
     });
 
     Dimension d = calculateIdWidth();
@@ -94,9 +139,8 @@ public class AlignmentPanel
 
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);
     annotationSpaceFillerHolder.setSize(d.width,
-                                        annotationPanel.getSize().height);
+            annotationPanel.getSize().height);
     alabels.setSize(d.width, annotationPanel.getSize().height);
-
     final AlignmentPanel ap = this;
     av.addPropertyChangeListener(new java.beans.PropertyChangeListener()
     {
@@ -104,27 +148,34 @@ public class AlignmentPanel
       {
         if (evt.getPropertyName().equals("alignment"))
         {
-          PaintRefresher.Refresh(ap,
-                                 av.getSequenceSetId(),
-                                 true,
-                                 true);
+          PaintRefresher.Refresh(ap, av.getSequenceSetId(), true, true);
           alignmentChanged();
         }
       }
     });
-
   }
 
+  @Override
+  public AlignViewportI getAlignViewport()
+  {
+    return av;
+  }
   public SequenceRenderer getSequenceRenderer()
   {
     return seqPanel.seqCanvas.sr;
   }
-
-  public FeatureRenderer getFeatureRenderer()
+  @Override
+  public jalview.api.FeatureRenderer getFeatureRenderer()
   {
     return seqPanel.seqCanvas.fr;
   }
-
+  @Override
+  public jalview.api.FeatureRenderer cloneFeatureRenderer()
+  {
+    FeatureRenderer nfr = new FeatureRenderer(av);
+    nfr.transferSettings(seqPanel.seqCanvas.fr);
+    return nfr;
+  }
   public void alignmentChanged()
   {
     av.alignmentChanged(this);
@@ -146,18 +197,22 @@ public class AlignmentPanel
     idPanel.idCanvas.image = null;
     FontMetrics fm = getFontMetrics(av.getFont());
 
-    scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent()));
-    idwidthAdjuster.setSize(new Dimension(10, av.charHeight + fm.getDescent()));
+    scalePanel.setSize(new Dimension(10, av.getCharHeight()
+            + fm.getDescent()));
+    idwidthAdjuster.setSize(new Dimension(10, av.getCharHeight()
+            + fm.getDescent()));
     av.updateSequenceIdColours();
     annotationPanel.image = null;
-    int ap = annotationPanel.adjustPanelHeight();
-    annotationPanel.repaint();
+    int ap = annotationPanel.adjustPanelHeight(false);
     Dimension d = calculateIdWidth();
     d.setSize(d.width + 4, seqPanel.seqCanvas.getSize().height);
     alabels.setSize(d.width + 4, ap);
+
     idPanel.idCanvas.setSize(d);
     hscrollFillerPanel.setSize(d);
 
+    validateAnnotationDimensions(false);
+    annotationPanel.repaint();
     validate();
     repaint();
 
@@ -171,6 +226,8 @@ public class AlignmentPanel
   {
     idPanel.idCanvas.setSize(w, h);
     idPanelHolder.setSize(w, idPanelHolder.getSize().height);
+    annotationSpaceFillerHolder.setSize(w,
+            annotationSpaceFillerHolder.getSize().height);
     alabels.setSize(w, alabels.getSize().height);
     validate();
   }
@@ -222,55 +279,165 @@ public class AlignmentPanel
     return new Dimension(idWidth, idPanel.idCanvas.getSize().height);
   }
 
+  /**
+   * Highlight the given results on the alignment.
+   * 
+   */
   public void highlightSearchResults(SearchResults results)
   {
+    scrollToPosition(results);
     seqPanel.seqCanvas.highlightSearchResults(results);
+  }
+
+  /**
+   * scroll the view to show the position of the highlighted region in results
+   * (if any) and redraw the overview
+   * 
+   * @param results
+   * @return false if results were not found
+   */
+  public boolean scrollToPosition(SearchResults results)
+  {
+    return scrollToPosition(results, true);
+  }
+
+  /**
+   * scroll the view to show the position of the highlighted region in results
+   * (if any)
+   * 
+   * @param results
+   * @param redrawOverview
+   *          - when set, the overview will be recalculated (takes longer)
+   * @return false if results were not found
+   */
+  public boolean scrollToPosition(SearchResults results,
+          boolean redrawOverview)
+  {
 
     // do we need to scroll the panel?
-    if (results != null)
+    if (results != null && results.getSize() > 0)
     {
-      SequenceI seq = results.getResultSequence(0);
-      int seqIndex = av.alignment.findIndex(seq);
-      int start = seq.findIndex(results.getResultStart(0)) - 1;
-      int end = seq.findIndex(results.getResultEnd(0)) - 1;
+      AlignmentI alignment = av.getAlignment();
+      int seqIndex = alignment.findIndex(results);
+      if (seqIndex == -1)
+      {
+        return false;
+      }
+      SequenceI seq = alignment.getSequenceAt(seqIndex);
+      int[] r = results.getResults(seq, 0, alignment.getWidth());
+      if (r == null)
+      {
+        if (av.applet.debug)
+        {// DEBUG
+          System.out
+                  .println("DEBUG: scroll didn't happen - results not within alignment : "
+                          + seq.getStart() + "," + seq.getEnd());
+        }
+        return false;
+      }
+      if (av.applet.debug)
+      {
+        // DEBUG
+        /*
+         * System.out.println("DEBUG: scroll: start=" + r[0] +
+         * " av.getStartRes()=" + av.getStartRes() + " end=" + r[1] +
+         * " seq.end=" + seq.getEnd() + " av.getEndRes()=" + av.getEndRes() +
+         * " hextent=" + hextent);
+         */
+      }
+      int start = r[0];
+      int end = r[1];
+      if (start < 0)
+      {
+        return false;
+      }
+      if (end == seq.getEnd())
+      {
+        return false;
+      }
+      return scrollTo(start, end, seqIndex, false, redrawOverview);
+    }
+    return true;
+  }
+
+  public boolean scrollTo(int ostart, int end, int seqIndex,
+          boolean scrollToNearest, boolean redrawOverview)
+  {
+    int startv, endv, starts, ends, width;
 
-      if (!av.wrapAlignment)
+    int start = -1;
+    if (av.hasHiddenColumns())
+    {
+      start = av.getColumnSelection().findColumnPosition(ostart);
+      end = av.getColumnSelection().findColumnPosition(end);
+      if (start == end)
       {
-        if ( (av.getStartRes() > end) || (av.getEndRes() < start) ||
-            ( (av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+        if (!scrollToNearest && !av.getColumnSelection().isVisible(ostart))
         {
-          if (start > av.alignment.getWidth() - hextent)
+          // don't scroll - position isn't visible
+          return false;
+        }
+      }
+    }
+    else
+    {
+      start = ostart;
+    }
+    if (!av.getWrapAlignment())
+    {
+      /*
+       * int spos=av.getStartRes(),sqpos=av.getStartSeq(); if ((startv =
+       * av.getStartRes()) >= start) { spos=start-1; // seqIn //
+       * setScrollValues(start - 1, seqIndex); } else if ((endv =
+       * av.getEndRes()) <= end) { // setScrollValues(spos=startv + 1 + end -
+       * endv, seqIndex); spos=startv + 1 + end - endv; } else if ((starts =
+       * av.getStartSeq()) > seqIndex) { setScrollValues(av.getStartRes(),
+       * seqIndex); } else if ((ends = av.getEndSeq()) <= seqIndex) {
+       * setScrollValues(av.getStartRes(), starts + seqIndex - ends + 1); }
+       * 
+       * /*
+       */
+      if ((av.getStartRes() > end)
+              || (av.getEndRes() < start)
+              || ((av.getStartSeq() > seqIndex) || (av.getEndSeq() < seqIndex)))
+      {
+        if (start > av.getAlignment().getWidth() - hextent)
+        {
+          start = av.getAlignment().getWidth() - hextent;
+          if (start < 0)
           {
-            start = av.alignment.getWidth() - hextent;
-            if (start < 0)
-            {
-              start = 0;
-            }
+            start = 0;
           }
-          if (seqIndex > av.alignment.getHeight() - vextent)
+
+        }
+        if (seqIndex > av.getAlignment().getHeight() - vextent)
+        {
+          seqIndex = av.getAlignment().getHeight() - vextent;
+          if (seqIndex < 0)
           {
-            seqIndex = av.alignment.getHeight() - vextent;
-            if (seqIndex < 0)
-            {
-              seqIndex = 0;
-            }
+            seqIndex = 0;
           }
-          setScrollValues(start, seqIndex);
         }
-      }
-      else
-      {
-        scrollToWrappedVisible(start);
-      }
+        // System.out.println("trying to scroll to: "+start+" "+seqIndex);
+        setScrollValues(start, seqIndex);
+      }/**/
     }
-
-    repaint();
+    else
+    {
+      scrollToWrappedVisible(start);
+    }
+    if (redrawOverview && overviewPanel != null)
+    {
+      overviewPanel.setBoxPosition();
+    }
+    paintAlignment(redrawOverview);
+    return true;
   }
 
   void scrollToWrappedVisible(int res)
   {
-    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.
-        getSize().width);
+    int cwidth = seqPanel.seqCanvas
+            .getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);
     if (res <= av.getStartRes() || res >= (av.getStartRes() + cwidth))
     {
       vscroll.setValue(res / cwidth);
@@ -290,15 +457,110 @@ public class AlignmentPanel
 
   public void setAnnotationVisible(boolean b)
   {
-    if (!av.wrapAlignment)
+    if (!av.getWrapAlignment())
     {
       annotationSpaceFillerHolder.setVisible(b);
-      annotationPanel.setVisible(b);
+      annotationPanelHolder.setVisible(b);
+    }
+    else
+    {
+      annotationSpaceFillerHolder.setVisible(false);
+      annotationPanelHolder.setVisible(false);
     }
     validate();
     repaint();
   }
 
+  /**
+   * automatically adjust annotation panel height for new annotation whilst
+   * ensuring the alignment is still visible.
+   */
+  public void adjustAnnotationHeight()
+  {
+    // TODO: display vertical annotation scrollbar if necessary
+    // this is called after loading new annotation onto alignment
+    if (alignFrame.getSize().height == 0)
+    {
+      System.out
+              .println("adjustAnnotationHeight frame size zero NEEDS FIXING");
+    }
+    fontChanged();
+    validateAnnotationDimensions(true);
+    apvscroll.addNotify();
+    hscroll.addNotify();
+    validate();
+    paintAlignment(true);
+  }
+
+  /**
+   * calculate the annotation dimensions and refresh slider values accordingly.
+   * need to do repaints/notifys afterwards.
+   */
+  protected void validateAnnotationDimensions(boolean adjustPanelHeight)
+  {
+    boolean modified = false;
+    int height = av.calcPanelHeight();
+    int minsize = 0;
+    if (hscroll.isVisible())
+    {
+      height += (minsize = hscroll.getPreferredSize().height);
+    }
+    if (apvscroll.isVisible())
+    {
+      minsize += apvscroll.getPreferredSize().height;
+    }
+    int mheight = height;
+    Dimension d = sequenceHolderPanel.getSize(), e = idPanel.getSize();
+    int seqandannot = d.height - scalePanelHolder.getSize().height;
+
+    if (adjustPanelHeight)
+    {
+      // NOTE: this logic is different in the application. Need a better
+      // algorithm to define behaviour
+      // sets initial preferred height
+      // try and set height according to alignment
+      float sscaling = (float) ((av.getCharHeight() * av.getAlignment()
+              .getHeight()) / (1.0 * mheight));
+      if (sscaling > 0.5)
+      {
+        // if the alignment is too big then
+        // default is 0.5 split
+        height = seqandannot / 2;
+      }
+      else
+      {
+        // otherwise just set the panel so that one row of sequence is visible
+        height = -av.getCharHeight() * 1
+                + (int) (seqandannot * (1 - sscaling));
+      }
+    }
+    else
+    {
+      // maintain same window layout whilst updating sliders
+      height = annotationPanelHolder.getSize().height;
+    }
+
+    if (seqandannot - height < 5)
+    {
+      height = seqandannot;
+    }
+    annotationPanel.setSize(new Dimension(d.width, height));
+    alabels.setSize(new Dimension(e.width, height));
+    annotationSpaceFillerHolder.setSize(new Dimension(e.width, height));
+    annotationPanelHolder.setSize(new Dimension(d.width, height));
+    // seqPanelHolder.setSize(d.width, seqandannot - height);
+    seqPanel.seqCanvas
+            .setSize(d.width, seqPanel.seqCanvas.getSize().height);
+    int s = apvscroll.getValue();
+    if (s > mheight - height)
+    {
+      s = 0;
+    }
+    apvscroll.setValues(s, height, 0, mheight);
+    annotationPanel.setScrollOffset(apvscroll.getValue(), false);
+    alabels.setScrollOffset(apvscroll.getValue(), false);
+  }
+
   public void setWrapAlignment(boolean wrap)
   {
     av.startSeq = 0;
@@ -310,25 +572,27 @@ public class AlignmentPanel
 
     if (wrap)
     {
-      annotationPanel.setVisible(false);
+      annotationPanelHolder.setVisible(false);
       annotationSpaceFillerHolder.setVisible(false);
     }
-    else if (av.showAnnotation)
+    else if (av.isShowAnnotation())
     {
-      annotationPanel.setVisible(true);
+      annotationPanelHolder.setVisible(true);
       annotationSpaceFillerHolder.setVisible(true);
     }
 
     idSpaceFillerPanel1.setVisible(!wrap);
 
-    fontChanged(); //This is so that the scalePanel is resized correctly
+    fontChanged(); // This is so that the scalePanel is resized correctly
 
     validate();
+    sequenceHolderPanel.validate();
     repaint();
 
   }
 
   int hextent = 0;
+
   int vextent = 0;
 
   // return value is true if the scroll is valid
@@ -380,19 +644,21 @@ public class AlignmentPanel
 
   public void setScrollValues(int x, int y)
   {
-    int width = av.alignment.getWidth();
-    int height = av.alignment.getHeight();
+    int width = av.getAlignment().getWidth();
+    int height = av.getAlignment().getHeight();
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       width = av.getColumnSelection().findColumnPosition(width);
     }
+    if (x < 0)
+    {
+      x = 0;
+    }
+    ;
 
-    av.setStartRes(x);
-    av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) - 1);
-
-    hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;
-    vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;
+    hextent = seqPanel.seqCanvas.getSize().width / av.getCharWidth();
+    vextent = seqPanel.seqCanvas.getSize().height / av.getCharHeight();
 
     if (hextent > width)
     {
@@ -404,12 +670,14 @@ public class AlignmentPanel
       vextent = height;
     }
 
-    if ( (hextent + x) > width)
+    if ((hextent + x) > width)
     {
+      System.err.println("hextent was " + hextent + " and x was " + x);
+
       x = width - hextent;
     }
 
-    if ( (vextent + y) > height)
+    if ((vextent + y) > height)
     {
       y = height - vextent;
     }
@@ -421,18 +689,23 @@ public class AlignmentPanel
 
     if (x < 0)
     {
+      System.err.println("x was " + x);
       x = 0;
     }
 
     av.setStartSeq(y);
 
     int endSeq = y + vextent;
-    if (endSeq > av.alignment.getHeight())
+    if (endSeq > av.getAlignment().getHeight())
     {
-      endSeq = av.alignment.getHeight();
+      endSeq = av.getAlignment().getHeight();
     }
 
     av.setEndSeq(endSeq);
+    av.setStartRes(x);
+    av.setEndRes((x + (seqPanel.seqCanvas.getSize().width / av
+            .getCharWidth())) - 1);
+
     hscroll.setValues(x, hextent, 0, width);
     vscroll.setValues(y, vextent, 0, height);
 
@@ -440,6 +713,7 @@ public class AlignmentPanel
     {
       overviewPanel.setBoxPosition();
     }
+    sendViewPosition();
 
   }
 
@@ -448,12 +722,21 @@ public class AlignmentPanel
     int oldX = av.getStartRes();
     int oldY = av.getStartSeq();
 
+    if (evt == null || evt.getSource() == apvscroll)
+    {
+      annotationPanel.setScrollOffset(apvscroll.getValue(), false);
+      alabels.setScrollOffset(apvscroll.getValue(), false);
+      // annotationPanel.image=null;
+      // alabels.image=null;
+      // alabels.repaint();
+      // annotationPanel.repaint();
+    }
     if (evt == null || evt.getSource() == hscroll)
     {
       int x = hscroll.getValue();
       av.setStartRes(x);
-      av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() -
-                   1);
+      av.setEndRes(x + seqPanel.seqCanvas.getSize().width
+              / av.getCharWidth() - 1);
     }
 
     if (evt == null || evt.getSource() == vscroll)
@@ -461,16 +744,16 @@ public class AlignmentPanel
       int offy = vscroll.getValue();
       if (av.getWrapAlignment())
       {
-        int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
-            seqCanvas.getSize().width);
+        int rowSize = seqPanel.seqCanvas
+                .getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);
         av.setStartRes(vscroll.getValue() * rowSize);
-        av.setEndRes( (vscroll.getValue() + 1) * rowSize);
+        av.setEndRes((vscroll.getValue() + 1) * rowSize);
       }
       else
       {
         av.setStartSeq(offy);
-        av.setEndSeq(offy +
-                     seqPanel.seqCanvas.getSize().height / av.getCharHeight());
+        av.setEndSeq(offy + seqPanel.seqCanvas.getSize().height
+                / av.getCharHeight());
       }
     }
 
@@ -500,26 +783,41 @@ public class AlignmentPanel
       }
 
       idPanel.idCanvas.fastPaint(scrollY);
-      seqPanel.seqCanvas.fastPaint(scrollX,
-                                   scrollY);
+      seqPanel.seqCanvas.fastPaint(scrollX, scrollY);
 
       scalePanel.repaint();
-      if (av.getShowAnnotation())
+      if (av.isShowAnnotation())
       {
         annotationPanel.fastPaint(av.getStartRes() - oldX);
       }
     }
+    sendViewPosition();
 
   }
 
+  private void sendViewPosition()
+  {
+    StructureSelectionManager.getStructureSelectionManager(av.applet)
+            .sendViewPosition(this, av.startRes, av.endRes, av.startSeq,
+                    av.endSeq);
+  }
+
+  /**
+   * Repaint the alignment and annotations, and, optionally, any overview window
+   */
   public void paintAlignment(boolean updateOverview)
   {
+    final AnnotationSorter sorter = new AnnotationSorter(getAlignment(),
+            av.isShowAutocalculatedAbove());
+    sorter.sort(getAlignment().getAlignmentAnnotation(),
+            av.getSortAnnotationsBy());
     repaint();
 
-    if(updateOverview)
+    if (updateOverview)
     {
-      jalview.structure.StructureSelectionManager.getStructureSelectionManager()
-          .sequenceColoursChanged(this);
+      jalview.structure.StructureSelectionManager
+              .getStructureSelectionManager(av.applet)
+              .sequenceColoursChanged(this);
 
       if (overviewPanel != null)
       {
@@ -538,27 +836,23 @@ public class AlignmentPanel
     invalidate();
     Dimension d = idPanel.idCanvas.getSize();
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);
-    annotationSpaceFillerHolder.setSize(d.width,
-                                        annotationPanel.getSize().height);
-
-    alabels.setSize(d.width, annotationPanel.getSize().height);
 
     if (av.getWrapAlignment())
     {
-      int maxwidth = av.alignment.getWidth();
+      int maxwidth = av.getAlignment().getWidth();
 
-      if (av.hasHiddenColumns)
+      if (av.hasHiddenColumns())
       {
         maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
       }
 
-      int canvasWidth = seqPanel.seqCanvas.getWrappedCanvasWidth
-          (seqPanel.seqCanvas.getSize().width);
+      int canvasWidth = seqPanel.seqCanvas
+              .getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);
 
       if (canvasWidth > 0)
       {
         int max = maxwidth / canvasWidth;
-        vscroll.setMaximum(max);
+        vscroll.setMaximum(1 + max);
         vscroll.setUnitIncrement(1);
         vscroll.setVisibleAmount(1);
       }
@@ -568,41 +862,70 @@ public class AlignmentPanel
       setScrollValues(av.getStartRes(), av.getStartSeq());
     }
 
-    alabels.repaint();
-
     seqPanel.seqCanvas.repaint();
-    scalePanel.repaint();
-    annotationPanel.repaint();
     idPanel.idCanvas.repaint();
+    if (!av.getWrapAlignment())
+    {
+      if (av.isShowAnnotation())
+      {
+        alabels.repaint();
+        annotationPanel.repaint();
+      }
+      scalePanel.repaint();
+    }
+
   }
 
   protected Panel sequenceHolderPanel = new Panel();
+
   protected Scrollbar vscroll = new Scrollbar();
+
   protected Scrollbar hscroll = new Scrollbar();
+
   protected Panel seqPanelHolder = new Panel();
+
   BorderLayout borderLayout1 = new BorderLayout();
+
   BorderLayout borderLayout3 = new BorderLayout();
+
   protected Panel scalePanelHolder = new Panel();
+
   protected Panel idPanelHolder = new Panel();
+
   BorderLayout borderLayout5 = new BorderLayout();
+
   protected Panel idSpaceFillerPanel1 = new Panel();
+
   public Panel annotationSpaceFillerHolder = new Panel();
+
   BorderLayout borderLayout6 = new BorderLayout();
+
   BorderLayout borderLayout7 = new BorderLayout();
+
   Panel hscrollHolder = new Panel();
+
   BorderLayout borderLayout10 = new BorderLayout();
+
   protected Panel hscrollFillerPanel = new Panel();
+
   BorderLayout borderLayout11 = new BorderLayout();
+
   BorderLayout borderLayout4 = new BorderLayout();
+
   BorderLayout borderLayout2 = new BorderLayout();
 
-  private void jbInit()
-      throws Exception
+  Panel annotationPanelHolder = new Panel();
+
+  protected Scrollbar apvscroll = new Scrollbar();
+
+  BorderLayout borderLayout12 = new BorderLayout();
+
+  private void jbInit() throws Exception
   {
-    //  idPanelHolder.setPreferredSize(new Dimension(70, 10));
+    // idPanelHolder.setPreferredSize(new Dimension(70, 10));
     this.setLayout(borderLayout7);
 
-    //   sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));
+    // sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));
     sequenceHolderPanel.setLayout(borderLayout3);
     seqPanelHolder.setLayout(borderLayout1);
     scalePanelHolder.setBackground(Color.white);
@@ -612,28 +935,34 @@ public class AlignmentPanel
     idPanelHolder.setLayout(borderLayout5);
     idSpaceFillerPanel1.setBackground(Color.white);
 
-    //  idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30));
+    // idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30));
     idSpaceFillerPanel1.setLayout(borderLayout11);
     annotationSpaceFillerHolder.setBackground(Color.white);
 
-    //  annotationSpaceFillerHolder.setPreferredSize(new Dimension(10, 80));
+    // annotationSpaceFillerHolder.setPreferredSize(new Dimension(10, 80));
     annotationSpaceFillerHolder.setLayout(borderLayout4);
     hscroll.setOrientation(Scrollbar.HORIZONTAL);
     hscrollHolder.setLayout(borderLayout10);
     hscrollFillerPanel.setBackground(Color.white);
-
-    //  hscrollFillerPanel.setPreferredSize(new Dimension(70, 10));
+    apvscroll.setOrientation(Scrollbar.VERTICAL);
+    apvscroll.setVisible(true);
+    apvscroll.addAdjustmentListener(this);
+
+    annotationPanelHolder.setBackground(Color.white);
+    annotationPanelHolder.setLayout(borderLayout12);
+    annotationPanelHolder.add(apvscroll, BorderLayout.EAST);
+    // hscrollFillerPanel.setPreferredSize(new Dimension(70, 10));
     hscrollHolder.setBackground(Color.white);
 
-    //    annotationScroller.setPreferredSize(new Dimension(10, 80));
-    //  this.setPreferredSize(new Dimension(220, 166));
+    // annotationScroller.setPreferredSize(new Dimension(10, 80));
+    // this.setPreferredSize(new Dimension(220, 166));
     seqPanelHolder.setBackground(Color.white);
     idPanelHolder.setBackground(Color.white);
     sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH);
     sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER);
     seqPanelHolder.add(vscroll, BorderLayout.EAST);
 
-    //  Panel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
+    // Panel3.add(secondaryPanelHolder, BorderLayout.SOUTH);
     this.add(idPanelHolder, BorderLayout.WEST);
     idPanelHolder.add(idSpaceFillerPanel1, BorderLayout.NORTH);
     idPanelHolder.add(annotationSpaceFillerHolder, BorderLayout.SOUTH);
@@ -643,4 +972,52 @@ public class AlignmentPanel
     this.add(sequenceHolderPanel, BorderLayout.CENTER);
   }
 
+  /**
+   * hides or shows dynamic annotation rows based on groups and av state flags
+   */
+  public void updateAnnotation()
+  {
+    updateAnnotation(false);
+  }
+
+  public void updateAnnotation(boolean applyGlobalSettings)
+  {
+    updateAnnotation(applyGlobalSettings, false);
+  }
+
+  public void updateAnnotation(boolean applyGlobalSettings,
+          boolean preserveNewGroupSettings)
+  {
+    av.updateGroupAnnotationSettings(applyGlobalSettings,
+            preserveNewGroupSettings);
+    adjustAnnotationHeight();
+  }
+
+  @Override
+  public AlignmentI getAlignment()
+  {
+    return av.getAlignment();
+  }
+
+  @Override
+  public String getViewName()
+  {
+    return getName();
+  }
+
+  @Override
+  public StructureSelectionManager getStructureSelectionManager()
+  {
+    return StructureSelectionManager
+            .getStructureSelectionManager(av.applet);
+  }
+
+  @Override
+  public void raiseOOMWarning(String string, OutOfMemoryError error)
+  {
+    // TODO: JAL-960
+    System.err.println("Out of memory whilst '" + string + "'");
+    error.printStackTrace();
+  }
+
 }