JAL-2600 Abandoned fastpaint for resize; now full repaint, single call

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

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index f1b473c..448dc6d 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -277,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, boolean isresize)
+  public void fastPaint(int horizontal, int vertical)
   {
     if (fastpainting || gg == null)
     {
@@ -295,71 +295,38 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     int transX = 0;
     int transY = 0;
 
-    if (isresize)
-    {
-      imgWidth = getWidth();
-      imgHeight = getHeight();
-
-      imgWidth -= (imgWidth % charWidth);
-      imgHeight -= (imgHeight % charHeight);
-
-      if ((imgWidth > 0) && (imgHeight > 0))
-      {
-        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;
+    gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
+            imgHeight, -horizontal * charWidth, -vertical * charHeight);
 
-        if (horizontal != 0)
-        {
-          transX = (er - horizontal - sr) * charWidth;
-          sr = er - horizontal - sr;
-        }
-        else if (vertical != 0)
-        {
-          transY = imgHeight - ((vertical + 1) * charHeight);
-          ss = es - vertical - ss;
-        }
-      }
+    if (horizontal > 0) // scrollbar pulled right, image to the left
+    {
+      transX = (er - sr - horizontal) * charWidth;
+      sr = er - horizontal;
     }
-    else
+    else if (horizontal < 0)
+    {
+      er = sr - horizontal;
+    }
+    else if (vertical > 0) // scroll down
     {
-      gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
-              imgHeight, -horizontal * charWidth, -vertical * charHeight);
+      ss = es - vertical;
 
-      if (horizontal > 0) // scrollbar pulled right, image to the left
-      {
-        transX = (er - sr - horizontal) * charWidth;
-        sr = er - horizontal;
+      if (ss < ranges.getStartSeq())
+      { // ie scrolling too fast, more than a page at a time
+        ss = ranges.getStartSeq();
       }
-      else if (horizontal < 0)
+      else
       {
-        er = sr - horizontal;
+        transY = imgHeight - ((vertical + 1) * charHeight);
       }
-      else if (vertical > 0) // scroll down
-      {
-        ss = es - vertical;
+    }
+    else if (vertical < 0)
+    {
+      es = ss - vertical;
 
-        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)
+      if (es > ranges.getEndSeq())
       {
-        es = ss - vertical;
-
-        if (es > ranges.getEndSeq())
-        {
-          es = ranges.getEndSeq();
-        }
+        es = ranges.getEndSeq();
       }
     }
 
@@ -1023,14 +990,14 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
   {
     if (!av.getWrapAlignment())
     {
-      if (evt.getPropertyName().equals("startres"))
+      int scrollX = 0;
+      if ((evt.getPropertyName().equals("startres"))
+              || (evt.getPropertyName().equals("endres")))
       {
-        // 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();
-        int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+        scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
         if (scrollX > vpRanges.getEndRes() - vpRanges.getStartRes())
         {
           scrollX = vpRanges.getEndRes() - vpRanges.getStartRes();
@@ -1039,24 +1006,27 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
         {
           scrollX = vpRanges.getStartRes() - vpRanges.getEndRes();
         }
-        fastPaint(scrollX, 0, false);
+      }
+
+      if (evt.getPropertyName().equals("startres"))
+      {
+        // scroll - startres and endres both change
+        fastPaint(scrollX, 0);
       }
       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);
+        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue());
       }
       else if (evt.getPropertyName().equals("endseq"))
       {
         // resize
-        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(),
-                true);
+
       }
     }
   }