continue;\r
}\r
\r
- value = av.alignment.getSequenceAt(i).findPosition(index);\r
+ value = seq.findPosition(index);\r
break;\r
}\r
if (value != -1)\r
\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
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
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
continue;\r
}\r
\r
- value = av.alignment.getSequenceAt(i).findPosition(index);\r
+ value = seq.findPosition(index);\r
\r
break;\r
}\r
\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
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