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
v2
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
a4f6546
..
c70f3c1
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-70,14
+70,14
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
x = av.getColumnSelection().adjustForHiddenColumns(x);
}
{
x = av.getColumnSelection().adjustForHiddenColumns(x);
}
- if (x >= av.alignment.getWidth())
+ if (x >= av.getAlignment().getWidth())
{
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
else
{
}
else
{
@@
-137,7
+137,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
{
av.hideColumns(res, res);
if (av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() == av.alignment
+ && av.getSelectionGroup().getSize() == av.getAlignment()
.getHeight())
{
av.setSelectionGroup(null);
.getHeight())
{
av.setSelectionGroup(null);
@@
-165,7
+165,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
// try to be as quick as possible
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
// try to be as quick as possible
- SequenceI[] iVec = av.alignment.getSequencesArray();
+ SequenceI[] iVec = av.getAlignment().getSequencesArray();
for (int i = 0; i < iVec.length; i++)
{
sg.addSequence(iVec[i], false);
for (int i = 0; i < iVec.length; i++)
{
sg.addSequence(iVec[i], false);
@@
-205,14
+205,14
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (res >= av.alignment.getWidth())
+ if (res >= av.getAlignment().getWidth())
{
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
if (!stretchingGroup)
}
if (!stretchingGroup)
@@
-256,14
+256,14
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
res = 0;
}
res = 0;
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
- if (res >= av.alignment.getWidth())
+ if (res >= av.getAlignment().getWidth())
{
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
if (res < min)
}
if (res < min)
@@
-337,7
+337,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
public void mouseMoved(MouseEvent evt)
{
public void mouseMoved(MouseEvent evt)
{
- if (!av.hasHiddenColumns)
+ if (!av.hasHiddenColumns())
{
return;
}
{
return;
}
@@
-409,7
+409,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
if (cs.isVisible(sel))
{
{
if (cs.isVisible(sel))
{
@@
-473,7
+473,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener,
}
}
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
gg.setColor(Color.blue);
int res;
{
gg.setColor(Color.blue);
int res;