git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1 too many
[jalview.git]
/
src
/
jalview
/
appletgui
/
SeqCanvas.java
diff --git
a/src/jalview/appletgui/SeqCanvas.java
b/src/jalview/appletgui/SeqCanvas.java
index
5afbe23
..
465dd38
100755
(executable)
--- a/
src/jalview/appletgui/SeqCanvas.java
+++ b/
src/jalview/appletgui/SeqCanvas.java
@@
-359,12
+359,19
@@
public class SeqCanvas
av.endRes = av.startRes + cWidth;
\r
\r
\r
av.endRes = av.startRes + cWidth;
\r
\r
\r
- int endx = (startRes + cWidth) - 1;
\r
+ int endx;
\r
int ypos = hgap;
\r
\r
\r
while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))
\r
{
\r
int ypos = hgap;
\r
\r
\r
while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth()))
\r
{
\r
+ endx = startRes + cWidth;
\r
+
\r
+ if (endx > al.getWidth())
\r
+ {
\r
+ endx = al.getWidth();
\r
+ }
\r
+
\r
g.setColor(Color.black);
\r
\r
if (av.scaleLeftWrapped)
\r
g.setColor(Color.black);
\r
\r
if (av.scaleLeftWrapped)
\r
@@
-386,13
+393,6
@@
public class SeqCanvas
drawNorthScale(g, startRes, endx, ypos);
\r
}
\r
\r
drawNorthScale(g, startRes, endx, ypos);
\r
}
\r
\r
-
\r
- if (av.vconsensus!=null && av.alignment.getWidth() >= av.vconsensus.size())
\r
- {
\r
- endx = av.vconsensus.size() - 2;
\r
- }
\r
-
\r
-
\r
if(g.getClip()==null)
\r
g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);
\r
\r
if(g.getClip()==null)
\r
g.setClip(0, 0, cWidth * av.charWidth, canvasHeight);
\r
\r
@@
-406,7
+406,7
@@
public class SeqCanvas
if(annotations==null)
\r
annotations = new AnnotationPanel(av);
\r
\r
if(annotations==null)
\r
annotations = new AnnotationPanel(av);
\r
\r
- annotations.drawComponent( g, startRes, endx + 1);
\r
+ annotations.drawComponent( g, startRes, endx );
\r
g.translate(0, -cHeight - ypos-4);
\r
}
\r
g.translate(-LABEL_WEST, 0);
\r
g.translate(0, -cHeight - ypos-4);
\r
}
\r
g.translate(-LABEL_WEST, 0);
\r
@@
-415,12
+415,6
@@
public class SeqCanvas
\r
\r
startRes += cWidth;
\r
\r
\r
startRes += cWidth;
\r
- endx = (startRes + cWidth) - 1;
\r
-
\r
- if (endx > al.getWidth())
\r
- {
\r
- endx = al.getWidth();
\r
- }
\r
}
\r
\r
}
\r
}
\r
\r
}
\r