X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=c91449ffec53d7f3b34e1b48528361e32a959fe5;hb=d02383d48c137a8d2de0b0c36d96474dd0468113;hp=4e448882022c7080a828a6e1b1f6cf66b37447d0;hpb=af4abf989c69bbfaa30a25eff93133867bbce6c8;p=jalview.git diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java index 4e44888..c91449f 100755 --- a/src/jalview/appletgui/ScalePanel.java +++ b/src/jalview/appletgui/ScalePanel.java @@ -87,7 +87,7 @@ public class ScalePanel extends Panel if (av.hasHiddenColumns()) { - res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(x); + res = av.getAlignment().getHiddenColumns().visibleToAbsoluteColumn(x); } else { @@ -235,7 +235,7 @@ public class ScalePanel extends Panel if (av.hasHiddenColumns()) { res = av.getAlignment().getHiddenColumns() - .adjustForHiddenColumns(res); + .visibleToAbsoluteColumn(res); } if (!stretchingGroup) @@ -276,7 +276,7 @@ public class ScalePanel extends Panel int res = (evt.getX() / av.getCharWidth()) + av.getRanges().getStartRes(); res = Math.max(0, res); - res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(res); + res = av.getAlignment().getHiddenColumns().visibleToAbsoluteColumn(res); res = Math.min(res, av.getAlignment().getWidth() - 1); min = Math.min(res, min); max = Math.max(res, max); @@ -378,7 +378,7 @@ public class ScalePanel extends Panel { if (hidden.isVisible(sel)) { - sel = hidden.findColumnPosition(sel); + sel = hidden.absoluteToVisibleColumn(sel); } else { @@ -437,7 +437,7 @@ public class ScalePanel extends Panel if (av.getShowHiddenMarkers()) { int widthx = 1 + endx - startx; - Iterator it = hidden.getBoundedStartIterator(startx, + Iterator it = hidden.getStartRegionIterator(startx, startx + widthx + 1); while (it.hasNext()) {