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-3210 small tidies
[jalview.git]
/
src
/
jalview
/
appletgui
/
ScalePanel.java
diff --git
a/src/jalview/appletgui/ScalePanel.java
b/src/jalview/appletgui/ScalePanel.java
index
6b3349f
..
d3f4a69
100755
(executable)
--- a/
src/jalview/appletgui/ScalePanel.java
+++ b/
src/jalview/appletgui/ScalePanel.java
@@
-87,7
+87,7
@@
public class ScalePanel extends Panel
if (av.hasHiddenColumns())
{
if (av.hasHiddenColumns())
{
- res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(x);
+ res = av.getAlignment().getHiddenColumns().visibleToAbsoluteColumn(x);
}
else
{
}
else
{
@@
-96,8
+96,8
@@
public class ScalePanel extends Panel
min = res;
max = res;
min = res;
max = res;
- if ((evt.getModifiers()
- & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+ if ((evt.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
{
rightMouseButtonPressed(evt, res);
}
{
rightMouseButtonPressed(evt, res);
}
@@
-142,7
+142,7
@@
public class ScalePanel extends Panel
sg.setStartRes(min);
sg.setEndRes(max);
}
sg.setStartRes(min);
sg.setEndRes(max);
}
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
av.sendSelection();
}
av.sendSelection();
}
@@
-168,13
+168,13
@@
public class ScalePanel extends Panel
{
av.showColumn(reveal[0]);
reveal = null;
{
av.showColumn(reveal[0]);
reveal = null;
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
av.sendSelection();
}
});
pop.add(item);
av.sendSelection();
}
});
pop.add(item);
- if (av.getAlignment().getHiddenColumns().hasManyHiddenColumns())
+ if (av.getAlignment().getHiddenColumns().hasMultiHiddenColumnRegions())
{
item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
@@
-184,7
+184,7
@@
public class ScalePanel extends Panel
{
av.showAllHiddenColumns();
reveal = null;
{
av.showAllHiddenColumns();
reveal = null;
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
av.sendSelection();
}
});
av.sendSelection();
}
});
@@
-209,7
+209,7
@@
public class ScalePanel extends Panel
av.setSelectionGroup(null);
}
av.setSelectionGroup(null);
}
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
av.sendSelection();
}
});
av.sendSelection();
}
});
@@
-235,12
+235,12
@@
public class ScalePanel extends Panel
if (av.hasHiddenColumns())
{
res = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
res = av.getAlignment().getHiddenColumns()
- .adjustForHiddenColumns(res);
+ .visibleToAbsoluteColumn(res);
}
if (!stretchingGroup)
{
}
if (!stretchingGroup)
{
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
return;
}
return;
}
@@
-257,7
+257,7
@@
public class ScalePanel extends Panel
}
stretchingGroup = false;
}
stretchingGroup = false;
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
av.sendSelection();
}
av.sendSelection();
}
@@
-276,7
+276,7
@@
public class ScalePanel extends Panel
int res = (evt.getX() / av.getCharWidth())
+ av.getRanges().getStartRes();
res = Math.max(0, res);
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);
res = Math.min(res, av.getAlignment().getWidth() - 1);
min = Math.min(res, min);
max = Math.max(res, max);
@@
-286,7
+286,7
@@
public class ScalePanel extends Panel
{
stretchingGroup = true;
cs.stretchGroup(res, sg, min, max);
{
stretchingGroup = true;
cs.stretchGroup(res, sg, min, max);
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
}
}
}
}
@@
-378,7
+378,7
@@
public class ScalePanel extends Panel
{
if (hidden.isVisible(sel))
{
{
if (hidden.isVisible(sel))
{
- sel = hidden.findColumnPosition(sel);
+ sel = hidden.absoluteToVisibleColumn(sel);
}
else
{
}
else
{
@@
-437,7
+437,7
@@
public class ScalePanel extends Panel
if (av.getShowHiddenMarkers())
{
int widthx = 1 + endx - startx;
if (av.getShowHiddenMarkers())
{
int widthx = 1 + endx - startx;
- Iterator<Integer> it = hidden.getBoundedStartIterator(startx,
+ Iterator<Integer> it = hidden.getStartRegionIterator(startx,
startx + widthx + 1);
while (it.hasNext())
{
startx + widthx + 1);
while (it.hasNext())
{
@@
-462,7
+462,9
@@
public class ScalePanel extends Panel
// Here we only want to fastpaint on a scroll, with resize using a normal
// paint, so scroll events are identified as changes to the horizontal or
// vertical start value.
// Here we only want to fastpaint on a scroll, with resize using a normal
// paint, so scroll events are identified as changes to the horizontal or
// vertical start value.
- if (evt.getPropertyName().equals(ViewportRanges.STARTRES))
+ if (evt.getPropertyName().equals(ViewportRanges.STARTRES)
+ || evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ)
+ || evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
{
// scroll event, repaint panel
repaint();
{
// scroll event, repaint panel
repaint();