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
JAL-3633 Help documentation updated
[jalview.git]
/
src
/
jalview
/
appletgui
/
SeqCanvas.java
diff --git
a/src/jalview/appletgui/SeqCanvas.java
b/src/jalview/appletgui/SeqCanvas.java
index
6f078ea
..
96eb6b9
100755
(executable)
--- a/
src/jalview/appletgui/SeqCanvas.java
+++ b/
src/jalview/appletgui/SeqCanvas.java
@@
-136,13
+136,6
@@
public class SeqCanvas extends Panel implements ViewportListenerI
.visibleToAbsoluteColumn(endx);
}
.visibleToAbsoluteColumn(endx);
}
- int maxwidth = av.getAlignment().getWidth();
- if (av.hasHiddenColumns())
- {
- maxwidth = av.getAlignment().getHiddenColumns()
- .absoluteToVisibleColumn(maxwidth) - 1;
- }
-
// WEST SCALE
for (int i = 0; i < av.getAlignment().getHeight(); i++)
{
// WEST SCALE
for (int i = 0; i < av.getAlignment().getHeight(); i++)
{
@@
-450,13
+443,7
@@
public class SeqCanvas extends Panel implements ViewportListenerI
int endx;
int ypos = hgap;
int endx;
int ypos = hgap;
- int maxwidth = av.getAlignment().getWidth();
-
- if (av.hasHiddenColumns())
- {
- maxwidth = av.getAlignment().getHiddenColumns()
- .absoluteToVisibleColumn(maxwidth);
- }
+ int maxwidth = av.getAlignment().getVisibleWidth();
while ((ypos <= canvasHeight) && (startRes < maxwidth))
{
while ((ypos <= canvasHeight) && (startRes < maxwidth))
{
@@
-492,7
+479,7
@@
public class SeqCanvas extends Panel implements ViewportListenerI
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
g.setColor(Color.blue);
int res;
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
g.setColor(Color.blue);
int res;
- Iterator<Integer> it = hidden.getBoundedStartIterator(startRes,
+ Iterator<Integer> it = hidden.getStartRegionIterator(startRes,
endx + 1);
while (it.hasNext())
{
endx + 1);
while (it.hasNext())
{
@@
-565,7
+552,7
@@
public class SeqCanvas extends Panel implements ViewportListenerI
int blockEnd;
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
int blockEnd;
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
- VisibleContigsIterator regions = (VisibleContigsIterator) hidden
+ VisibleContigsIterator regions = hidden
.getVisContigsIterator(startRes, endRes + 1, true);
while (regions.hasNext())
.getVisContigsIterator(startRes, endRes + 1, true);
while (regions.hasNext())