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
Merge branch 'releases/Release_2_10_4_Branch_merged_JAL-2759' into releases/Release_2...
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
68b1998
..
f5634d2
100644
(file)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-419,8
+419,8
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (av.hasHiddenColumns())
{
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
if (av.hasHiddenColumns())
{
HiddenColumns hidden = av.getAlignment().getHiddenColumns();
- start = hidden.findColumnPosition(start);
- end = hidden.findColumnPosition(end);
+ start = hidden.absoluteToVisibleColumn(start);
+ end = hidden.absoluteToVisibleColumn(end);
if (start == end)
{
if (!hidden.isVisible(r[0]))
if (start == end)
{
if (!hidden.isVisible(r[0]))
@@
-678,7
+678,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
{
// reset the width to exclude hidden columns
width = av.getAlignment().getHiddenColumns()
{
// reset the width to exclude hidden columns
width = av.getAlignment().getHiddenColumns()
- .findColumnPosition(width);
+ .absoluteToVisibleColumn(width);
}
hextent = getSeqPanel().seqCanvas.getWidth() / av.getCharWidth();
}
hextent = getSeqPanel().seqCanvas.getWidth() / av.getCharWidth();
@@
-1176,7
+1176,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
- .findColumnPosition(maxwidth) - 1;
+ .absoluteToVisibleColumn(maxwidth) - 1;
}
int resWidth = getSeqPanel().seqCanvas
}
int resWidth = getSeqPanel().seqCanvas
@@
-1368,7
+1368,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
- .findColumnPosition(maxwidth);
+ .absoluteToVisibleColumn(maxwidth);
}
int height = ((av.getAlignment().getHeight() + 1) * av.getCharHeight())
}
int height = ((av.getAlignment().getHeight() + 1) * av.getCharHeight())
@@
-1586,7
+1586,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
maxwidth = av.getAlignment().getHiddenColumns()
- .findColumnPosition(maxwidth) - 1;
+ .absoluteToVisibleColumn(maxwidth) - 1;
}
int height = ((maxwidth / chunkWidth) + 1) * cHeight;
}
int height = ((maxwidth / chunkWidth) + 1) * cHeight;