JAL-2600 fast painting on resize

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

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index d7f2679..e8f9c5b 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -21,6 +21,7 @@
 package jalview.gui;
 
 import jalview.datamodel.AlignmentI;
+import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.SearchResultsI;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
@@ -169,14 +170,17 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
     if (av.hasHiddenColumns())
     {
-      startx = av.getColumnSelection().adjustForHiddenColumns(startx);
-      endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+      startx = av.getAlignment().getHiddenColumns()
+              .adjustForHiddenColumns(startx);
+      endx = av.getAlignment().getHiddenColumns()
+              .adjustForHiddenColumns(endx);
     }
 
     int maxwidth = av.getAlignment().getWidth();
     if (av.hasHiddenColumns())
     {
-      maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+      maxwidth = av.getAlignment().getHiddenColumns()
+              .findColumnPosition(maxwidth) - 1;
     }
 
     // WEST SCALE
@@ -228,7 +232,8 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
     if (av.hasHiddenColumns())
     {
-      endx = av.getColumnSelection().adjustForHiddenColumns(endx);
+      endx = av.getAlignment().getHiddenColumns()
+              .adjustForHiddenColumns(endx);
     }
 
     SequenceI seq;
@@ -272,7 +277,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    * @param vertical
    *          shift up or down in repaint
    */
-  public void fastPaint(int horizontal, int vertical)
+  public void fastPaint(int horizontal, int vertical, boolean isresize)
   {
     if (fastpainting || gg == null)
     {
@@ -281,8 +286,6 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     fastpainting = true;
     fastPaint = true;
     updateViewport();
-    gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
-            imgHeight, -horizontal * charWidth, -vertical * charHeight);
 
     ViewportRanges ranges = av.getRanges();
     int sr = ranges.getStartRes();
@@ -292,36 +295,60 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     int transX = 0;
     int transY = 0;
 
-    if (horizontal > 0) // scrollbar pulled right, image to the left
+    if (isresize)
     {
-      er++;
-      transX = (er - sr - horizontal) * charWidth;
-      sr = er - horizontal;
-    }
-    else if (horizontal < 0)
-    {
-      er = sr - horizontal - 1;
+      imgWidth = getWidth();
+      imgHeight = getHeight();
+
+      imgWidth -= (imgWidth % charWidth);
+      imgHeight -= (imgHeight % charHeight);
+
+      BufferedImage newimg = new BufferedImage(imgWidth, imgHeight,
+              BufferedImage.TYPE_INT_ARGB);
+
+      gg = (Graphics2D) newimg.getGraphics();
+      gg.setFont(av.getFont());
+      gg.drawImage(img, null, 0, 0);
+      img = newimg;
+
+      transX = (er - horizontal - sr) * charWidth;
+      sr = er - horizontal - sr;
     }
-    else if (vertical > 0) // scroll down
+    else
     {
-      ss = es - vertical;
+      gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
+              imgHeight, -horizontal * charWidth, -vertical * charHeight);
 
-      if (ss < ranges.getStartSeq())
-      { // ie scrolling too fast, more than a page at a time
-        ss = ranges.getStartSeq();
+      if (horizontal > 0) // scrollbar pulled right, image to the left
+      {
+        transX = (er - sr - horizontal) * charWidth;
+        sr = er - horizontal;
       }
-      else
+      else if (horizontal < 0)
       {
-        transY = imgHeight - ((vertical + 1) * charHeight);
+        er = sr - horizontal;
       }
-    }
-    else if (vertical < 0)
-    {
-      es = ss - vertical;
+      else if (vertical > 0) // scroll down
+      {
+        ss = es - vertical;
 
-      if (es > ranges.getEndSeq())
+        if (ss < ranges.getStartSeq())
+        { // ie scrolling too fast, more than a page at a time
+          ss = ranges.getStartSeq();
+        }
+        else
+        {
+          transY = imgHeight - ((vertical + 1) * charHeight);
+        }
+      }
+      else if (vertical < 0)
       {
-        es = ranges.getEndSeq();
+        es = ss - vertical;
+
+        if (es > ranges.getEndSeq())
+        {
+          es = ranges.getEndSeq();
+        }
       }
     }
 
@@ -519,7 +546,8 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
     if (av.hasHiddenColumns())
     {
-      maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+      maxwidth = av.getAlignment().getHiddenColumns()
+              .findColumnPosition(maxwidth) - 1;
     }
 
     while ((ypos <= canvasHeight) && (startRes < maxwidth))
@@ -557,11 +585,11 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
       {
         g.setColor(Color.blue);
         int res;
-        for (int i = 0; i < av.getColumnSelection().getHiddenColumns()
-                .size(); i++)
+        HiddenColumns hidden = av.getAlignment().getHiddenColumns();
+        List<Integer> positions = hidden.findHiddenRegionPositions();
+        for (int pos : positions)
         {
-          res = av.getColumnSelection().findHiddenRegionPosition(i)
-                  - startRes;
+          res = pos - startRes;
 
           if (res < 0 || res > endx - startRes)
           {
@@ -658,13 +686,12 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     }
     else
     {
-      List<int[]> regions = av.getColumnSelection().getHiddenColumns();
-
       int screenY = 0;
       int blockStart = startRes;
       int blockEnd = endRes;
 
-      for (int[] region : regions)
+      for (int[] region : av.getAlignment().getHiddenColumns()
+              .getHiddenColumnsCopy())
       {
         int hideStart = region[0];
         int hideEnd = region[1];
@@ -983,15 +1010,12 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
   @Override
   public void propertyChange(PropertyChangeEvent evt)
   {
-    if (av.getWrapAlignment())
+    if (!av.getWrapAlignment())
     {
-
-    }
-    else
-    {
-      if (evt.getPropertyName().equals("startres")
-              || evt.getPropertyName().equals("endres"))
+      if (evt.getPropertyName().equals("startres"))
       {
+        // scroll - startres and endres both change
+
         // Make sure we're not trying to draw a panel
         // larger than the visible window
         ViewportRanges vpRanges = av.getRanges();
@@ -1004,12 +1028,22 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
         {
           scrollX = vpRanges.getStartRes() - vpRanges.getEndRes();
         }
-        fastPaint(scrollX, 0);
+        fastPaint(scrollX, 0, false);
+      }
+      else if (evt.getPropertyName().equals("endres"))
+      {
+        // resize - only endres changes
+        int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+        fastPaint(scrollX, 0, true);
+      }
+      else if (evt.getPropertyName().equals("startseq"))
+      {
+        // scroll
+        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(), false);
       }
-      else if (evt.getPropertyName() == "startseq"
-              || evt.getPropertyName() == "endseq")
+      else if (evt.getPropertyName().equals("endseq"))
       {
-        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue());
+        // resize
       }
     }
   }