Faster painting

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index bece508..d7411fa 100755 (executable)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -424,20 +424,29 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       overviewPanel.setBoxPosition();\r
     }\r
 \r
+    int scrollX = av.startRes - oldX;\r
+    int scrollY = av.startSeq - oldY;\r
+\r
     if (av.getWrapAlignment() || !fastPaint || MAC)\r
     {\r
       repaint();\r
     }\r
-    else\r
+    else if(!seqPanel.seqCanvas.fastPaint)\r
     {\r
-      idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY);\r
-      seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX,\r
-                                   av.getStartSeq() - oldY);\r
+      // Make sure we're not trying to draw a panel\r
+      // larger than the visible window\r
+      if(scrollX>av.endRes-av.startRes)\r
+        scrollX = av.endRes-av.startRes;\r
+      else if(scrollX<av.startRes-av.endRes)\r
+        scrollX = av.startRes - av.endRes;\r
+\r
+      idPanel.idCanvas.fastPaint(scrollY);\r
+      seqPanel.seqCanvas.fastPaint(scrollX,\r
+                                   scrollY);\r
 \r
       scalePanel.repaint();\r
       if (av.getShowAnnotation())\r
       {\r
-\r
         annotationPanel.fastPaint(av.getStartRes() - oldX);\r
       }\r
     }\r

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index fe8122a..8d95574 100755 (executable)
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -155,11 +155,13 @@ public class SeqCanvas
 \r
   public void fastPaint(int horizontal, int vertical)\r
   {\r
-    if (gg == null)\r
+    if (fastPaint || gg == null)\r
     {\r
+      repaint();\r
       return;\r
     }\r
 \r
+    fastPaint = true;\r
     gg.copyArea(horizontal * av.charWidth,\r
                 vertical * av.charHeight,\r
                 imgWidth,\r
@@ -169,6 +171,7 @@ public class SeqCanvas
 \r
     int sr = av.startRes, er = av.endRes, ss = av.startSeq, es = av.endSeq,\r
         transX = 0, transY = 0;\r
+\r
     if (horizontal > 0) // scrollbar pulled right, image to the left\r
     {\r
       transX = (er - sr - horizontal) * av.charWidth;\r
@@ -202,12 +205,9 @@ public class SeqCanvas
 \r
     gg.translate(transX, transY);\r
 \r
-    gg.setColor(Color.white);\r
-    gg.fillRect(0, 0, (er - sr + 1) * av.charWidth, (es - ss) * av.charHeight);\r
     drawPanel(gg, sr, er, ss, es, sr, ss, 0);\r
     gg.translate( -transX, -transY);\r
 \r
-    fastPaint = true;\r
     repaint();\r
 \r
   }\r
@@ -229,7 +229,6 @@ public class SeqCanvas
 \r
   public void paint(Graphics g)\r
   {\r
-    sr.renderGaps(av.renderGaps);\r
 \r
     if (fastPaint)\r
     {\r
@@ -449,7 +448,7 @@ public class SeqCanvas
 \r
     if (av.showSequenceFeatures)\r
     {\r
-      fr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), x1, x2,\r
+      fr.drawSequence(g, nextSeq, x1, x2,\r
                       (x1 - startx) * av.charWidth,\r
                       offset +\r
                       (i - starty) * av.charHeight,\r

diff --git a/src/jalview/appletgui/SequenceRenderer.java b/src/jalview/appletgui/SequenceRenderer.java
index c68e85c..889df36 100755 (executable)
--- a/src/jalview/appletgui/SequenceRenderer.java
+++ b/src/jalview/appletgui/SequenceRenderer.java
@@ -75,7 +75,6 @@ public class SequenceRenderer
     }\r
   }\r
 \r
-  Image offscreen;\r
   public Color findSequenceColour(SequenceI seq, int i)\r
   {\r
     allGroups = av.alignment.findAllGroups(seq);\r
@@ -155,22 +154,22 @@ public class SequenceRenderer
   public void drawText(SequenceI seq, int start, int end, int x1, int y1,\r
                        int width, int height)\r
   {\r
-    int pady = height / 5;\r
-    int charOffset = 0;\r
-    char s=' ';\r
-    // Need to find the sequence position here.\r
 \r
-    String sequence = seq.getSequence();\r
+    y1 += height - height / 5;  // height/5 replaces pady\r
+\r
+    int charOffset = 0;\r
 \r
+    // Need to find the sequence position here.\r
     if(end+1>=seq.getLength())\r
           end = seq.getLength()-1;\r
 \r
+    char s = ' ';\r
+\r
     for (int i = start; i <= end; i++)\r
     {\r
       graphics.setColor(Color.black);\r
 \r
-      s = sequence.charAt(i);\r
-\r
+      s = seq.getCharAt(i);\r
       if (!renderGaps && jalview.util.Comparison.isGap(s))\r
       {\r
         continue;\r
@@ -212,8 +211,8 @@ public class SequenceRenderer
 \r
       charOffset = (width - fm.charWidth(s)) / 2;\r
       graphics.drawString(String.valueOf(s),\r
-                          charOffset + x1 + width * (i - start),\r
-                          y1 + height - pady);\r
+                         charOffset + x1 + width * (i - start),\r
+                        y1 );\r
     }\r
 \r
   }\r