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-2388 Comment typo
[jalview.git]
/
src
/
jalview
/
appletgui
/
ScalePanel.java
diff --git
a/src/jalview/appletgui/ScalePanel.java
b/src/jalview/appletgui/ScalePanel.java
index
ed07b63
..
15d82a5
100755
(executable)
--- a/
src/jalview/appletgui/ScalePanel.java
+++ b/
src/jalview/appletgui/ScalePanel.java
@@
-76,7
+76,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
@Override
public void mousePressed(MouseEvent evt)
{
@Override
public void mousePressed(MouseEvent evt)
{
- int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+ int x = (evt.getX() / av.getCharWidth()) + av.getRanges().getStartRes();
final int res;
if (av.hasHiddenColumns())
final int res;
if (av.hasHiddenColumns())
@@
-229,7
+229,8
@@
public class ScalePanel extends Panel implements MouseMotionListener,
{
mouseDragging = false;
{
mouseDragging = false;
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+ int res = (evt.getX() / av.getCharWidth())
+ + av.getRanges().getStartRes();
if (res > av.getAlignment().getWidth())
{
if (res > av.getAlignment().getWidth())
{
@@
-276,7
+277,8
@@
public class ScalePanel extends Panel implements MouseMotionListener,
mouseDragging = true;
ColumnSelection cs = av.getColumnSelection();
mouseDragging = true;
ColumnSelection cs = av.getColumnSelection();
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+ int res = (evt.getX() / av.getCharWidth())
+ + av.getRanges().getStartRes();
res = Math.max(0, res);
res = cs.adjustForHiddenColumns(res);
res = Math.min(res, av.getAlignment().getWidth() - 1);
res = Math.max(0, res);
res = cs.adjustForHiddenColumns(res);
res = Math.min(res, av.getAlignment().getWidth() - 1);
@@
-324,7
+326,8
@@
public class ScalePanel extends Panel implements MouseMotionListener,
return;
}
return;
}
- int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+ int res = (evt.getX() / av.getCharWidth())
+ + av.getRanges().getStartRes();
res = av.getColumnSelection().adjustForHiddenColumns(res);
res = av.getColumnSelection().adjustForHiddenColumns(res);
@@
-350,7
+353,8
@@
public class ScalePanel extends Panel implements MouseMotionListener,
@Override
public void paint(Graphics g)
{
@Override
public void paint(Graphics g)
{
- drawScale(g, av.getStartRes(), av.getEndRes(), getSize().width,
+ drawScale(g, av.getRanges().getStartRes(), av.getRanges().getEndRes(),
+ getSize().width,
getSize().height);
}
getSize().height);
}