Set startSeq 0 if wrap alignment

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 12c1cbd..ae61383 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -18,8 +18,6 @@
  */\r
 package jalview.gui;\r
 \r
-import jalview.analysis.*;\r
-\r
 import jalview.datamodel.*;\r
 \r
 import jalview.jbgui.*;\r
@@ -151,12 +149,30 @@ public class AlignmentPanel extends GAlignmentPanel
                 av.charHeight + fm.getDescent()));\r
 \r
         idPanel.idCanvas.gg = null;\r
+        seqPanel.seqCanvas.img = null;\r
         annotationPanel.adjustPanelHeight();\r
 \r
         Dimension d = calculateIdWidth();\r
         d.setSize(d.width + 4, d.height);\r
         idPanel.idCanvas.setPreferredSize(d);\r
         hscrollFillerPanel.setPreferredSize(d);\r
+\r
+        if (av.getWrapAlignment())\r
+        {\r
+          int max = av.alignment.getWidth() /\r
+              seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+          vscroll.setMaximum(max);\r
+          vscroll.setUnitIncrement(1);\r
+          vscroll.setVisibleAmount(1);\r
+        }\r
+        else\r
+        {\r
+          setScrollValues(av.getStartRes(), av.getStartSeq());\r
+        }\r
+\r
+        if(overviewPanel!=null)\r
+          overviewPanel.updateOverviewImage();\r
+\r
         repaint();\r
     }\r
 \r
@@ -283,6 +299,7 @@ public class AlignmentPanel extends GAlignmentPanel
      */\r
     public void setWrapAlignment(boolean wrap)\r
     {\r
+        av.startSeq = 0;\r
         scalePanelHolder.setVisible(!wrap);\r
         hscroll.setVisible(!wrap);\r
         idwidthAdjuster.setVisible(!wrap);\r
@@ -408,14 +425,6 @@ public class AlignmentPanel extends GAlignmentPanel
         vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());\r
     }\r
 \r
-    public void this_mouseWheelMoved(MouseWheelEvent e)\r
-    {\r
-      if(e.getWheelRotation()>0)\r
-        scrollUp(false);\r
-      else\r
-        scrollUp(true);\r
-    }\r
-\r
 \r
     /**\r
      * DOCUMENT ME!\r