-1 from east scale, wrapped alignment

diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index f6ef577..c5b4324 100755 (executable)
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -141,7 +141,7 @@ public class SeqCanvas
           continue;\r
         }\r
 \r
-        value = av.alignment.getSequenceAt(i).findPosition(index);\r
+        value = seq.findPosition(index);\r
         break;\r
       }\r
       if (value != -1)\r
@@ -366,7 +366,7 @@ public class SeqCanvas
 \r
     while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
     {\r
-      endx = startRes + cWidth;\r
+      endx = startRes + cWidth -1;\r
 \r
       if (endx > al.getWidth())\r
       {\r
@@ -407,7 +407,7 @@ public class SeqCanvas
           if(annotations==null)\r
             annotations = new AnnotationPanel(av);\r
 \r
-          annotations.drawComponent( g, startRes, endx );\r
+          annotations.drawComponent( g, startRes, endx+1 );\r
           g.translate(0, -cHeight - ypos-4);\r
         }\r
         g.translate(-LABEL_WEST, 0);\r

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 99447a4..d9f7ebb 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -180,15 +180,14 @@ public class SeqCanvas extends JComponent
         if(av.hasHiddenColumns)\r
                 endx = av.getColumnSelection().adjustForHiddenColumns(endx);\r
 \r
+        SequenceI seq;\r
         // EAST SCALE\r
         for (int i = 0; i < av.alignment.getHeight(); i++)\r
         {\r
-            SequenceI seq = av.alignment.getSequenceAt(i);\r
+            seq = av.alignment.getSequenceAt(i);\r
             int index = endx;\r
             int value = -1;\r
 \r
-\r
-\r
             while (index > startx)\r
             {\r
                 if (jalview.util.Comparison.isGap(seq.getCharAt(index)))\r
@@ -198,7 +197,7 @@ public class SeqCanvas extends JComponent
                     continue;\r
                 }\r
 \r
-                value = av.alignment.getSequenceAt(i).findPosition(index);\r
+                value = seq.findPosition(index);\r
 \r
                 break;\r
             }\r
@@ -441,7 +440,7 @@ public class SeqCanvas extends JComponent
 \r
         while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))\r
         {\r
-          endx = startRes + cWidth;\r
+          endx = startRes + cWidth -1;\r
 \r
           if (endx > al.getWidth())\r
           {\r
@@ -492,7 +491,7 @@ public class SeqCanvas extends JComponent
               if(annotations==null)\r
                 annotations = new AnnotationPanel(av);\r
 \r
-              annotations.drawComponent( (Graphics2D) g, startRes, endx);\r
+              annotations.drawComponent( (Graphics2D) g, startRes, endx+1);\r
               g.translate(0, -cHeight - ypos);\r
             }\r
             g.setClip(clip);\r