This constructor is never called

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

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 8c93599..39e9d03 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -40,7 +40,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   // this value is set false when selection area being dragged\r
   boolean fastPaint = true;\r
 \r
-  boolean MAC = false;\r
+\r
 \r
   public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
   {\r
@@ -53,8 +53,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       e.printStackTrace();\r
     }\r
 \r
-    if(System.getProperty("os.name").startsWith("Mac"))\r
-      MAC = true;\r
 \r
     alignFrame = af;\r
     this.av = av;\r
@@ -101,9 +99,37 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
                                         annotationPanel.getSize().height);\r
     alabels.setSize(d.width, annotationPanel.getSize().height);\r
 \r
+    final AlignmentPanel ap = this;\r
+    av.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
+    {\r
+      public void propertyChange(java.beans.PropertyChangeEvent evt)\r
+      {\r
+        if (evt.getPropertyName().equals("alignment"))\r
+        {\r
+          PaintRefresher.Refresh(ap,\r
+                                 av.getSequenceSetId(),\r
+                                 true,\r
+                                 true);\r
+          alignmentChanged();\r
+        }\r
+      }\r
+    });\r
+\r
   }\r
 \r
 \r
+  public void alignmentChanged()\r
+  {\r
+    av.alignmentChanged(this);\r
+\r
+    if (overviewPanel != null)\r
+      overviewPanel.updateOverviewImage();\r
+\r
+    alignFrame.updateEditMenuBar();\r
+\r
+    repaint();\r
+  }\r
+\r
   public void fontChanged()\r
   {\r
     // set idCanvas bufferedImage to null\r
@@ -261,6 +287,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   public void setWrapAlignment(boolean wrap)\r
   {\r
     av.startSeq = 0;\r
+    av.startRes = 0;\r
     scalePanelHolder.setVisible(!wrap);\r
 \r
 \r
@@ -348,8 +375,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
      width = av.getColumnSelection().findColumnPosition(width);\r
 \r
     av.setStartRes(x);\r
-    av.setStartSeq(y);\r
-\r
     av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) -1);\r
 \r
     hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;\r
@@ -385,6 +410,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       x = 0;\r
     }\r
 \r
+    av.setStartSeq(y);\r
+\r
     int endSeq = y + vextent;\r
     if (endSeq > av.alignment.getHeight())\r
     {\r
@@ -392,8 +419,8 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     }\r
 \r
     av.setEndSeq(endSeq);\r
-    hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth());\r
-    vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());\r
+    hscroll.setValues(x, hextent, 0, width);\r
+    vscroll.setValues(y, vextent, 0, height);\r
 \r
     if(overviewPanel!=null)\r
           overviewPanel.setBoxPosition();\r
@@ -441,7 +468,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     int scrollX = av.startRes - oldX;\r
     int scrollY = av.startSeq - oldY;\r
 \r
-    if (av.getWrapAlignment() || !fastPaint || MAC)\r
+    if (av.getWrapAlignment() || !fastPaint || av.MAC)\r
     {\r
       repaint();\r
     }\r
@@ -491,13 +518,16 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       if (av.hasHiddenColumns)\r
         maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;\r
 \r
-      int max = maxwidth /\r
-          seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +\r
-          1;\r
+      int canvasWidth = seqPanel.seqCanvas.getWrappedCanvasWidth\r
+          (seqPanel.seqCanvas.getSize().width);\r
 \r
-      vscroll.setMaximum(max);\r
-      vscroll.setUnitIncrement(1);\r
-      vscroll.setVisibleAmount(1);\r
+      if(canvasWidth>0)\r
+      {\r
+        int max = maxwidth / canvasWidth;\r
+        vscroll.setMaximum(max);\r
+        vscroll.setUnitIncrement(1);\r
+        vscroll.setVisibleAmount(1);\r
+      }\r
     }\r
     else\r
     {\r