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-4290 new CommandsTest.headlessOrGuiImageOutputTest - uses CommandLineOperations...
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
4365845
..
4a42861
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-107,11
+107,7
@@
public class ScalePanel extends JPanel
@Override
public void mousePressed(MouseEvent evt)
{
@Override
public void mousePressed(MouseEvent evt)
{
- int res = ap.getSeqPanel().findColumn(evt);
-
- if (res==-1) {
- return;
- }
+ int res = ap.getSeqPanel().findAlignmentColumn(evt);
min = res;
max = res;
min = res;
max = res;
@@
-266,7
+262,7
@@
public class ScalePanel extends JPanel
}
av.setSelectionGroup(sg);
ap.paintAlignment(false, false);
}
av.setSelectionGroup(sg);
ap.paintAlignment(false, false);
- PaintRefresher.Refresh(this,av.getSequenceSetId());
+ PaintRefresher.Refresh(this, av.getSequenceSetId());
av.sendSelection();
}
av.sendSelection();
}
@@
-283,15
+279,10
@@
public class ScalePanel extends JPanel
mouseDragging = false;
ap.getSeqPanel().stopScrolling();
mouseDragging = false;
ap.getSeqPanel().stopScrolling();
- int res = ap.getSeqPanel().findColumn(evt);
-
+ int res = ap.getSeqPanel().findAlignmentColumn(evt);
+
if (!stretchingGroup)
{
if (!stretchingGroup)
{
- if (res==-1)
- {
- return;
- }
-
if (evt.isPopupTrigger()) // Windows: mouseReleased
{
rightMouseButtonPressed(evt, res);
if (evt.isPopupTrigger()) // Windows: mouseReleased
{
rightMouseButtonPressed(evt, res);
@@
-305,7
+296,7
@@
public class ScalePanel extends JPanel
SequenceGroup sg = av.getSelectionGroup();
SequenceGroup sg = av.getSelectionGroup();
- if (res != -1 && sg != null)
+ if (sg != null)
{
if (res > sg.getStartRes())
{
{
if (res > sg.getStartRes())
{
@@
-342,15
+333,14
@@
public class ScalePanel extends JPanel
@Override
public void mouseDragged(MouseEvent evt)
{
@Override
public void mouseDragged(MouseEvent evt)
{
-
- int res = ap.getSeqPanel().findColumn(evt);
- if (res==-1) {
- return;
- }
mouseDragging = true;
mouseDragging = true;
+ int res = ap.getSeqPanel().findAlignmentColumn(evt);
+
ColumnSelection cs = av.getColumnSelection();
ColumnSelection cs = av.getColumnSelection();
+
min = Math.min(res, min);
max = Math.max(res, max);
min = Math.min(res, min);
max = Math.max(res, max);
+
SequenceGroup sg = av.getSelectionGroup();
if (sg != null)
{
SequenceGroup sg = av.getSelectionGroup();
if (sg != null)
{
@@
-399,19
+389,20
@@
public class ScalePanel extends JPanel
{
this.setToolTipText(null);
reveal = null;
{
this.setToolTipText(null);
reveal = null;
- final int res = ap.getSeqPanel().findColumn(evt);
-
- if (res==-1)
+ final int res = ap.getSeqPanel().findAlignmentColumn(evt);
+
+ highlightAllStructPos(res);
+ if (!av.hasHiddenColumns())
{
return;
}
{
return;
}
-
- highlightAllStructPos(res);
- if (!av.hasHiddenColumns()) {
+ reveal = av.getAlignment().getHiddenColumns()
+ .getRegionWithEdgeAtRes(av.getAlignment().getHiddenColumns()
+ .absoluteToVisibleColumn(res));
+ if (reveal == null)
+ {
return;
}
return;
}
- reveal = av.getAlignment().getHiddenColumns()
- .getRegionWithEdgeAtRes(res);
ToolTipManager.sharedInstance().registerComponent(this);
this.setToolTipText(
MessageManager.getString("label.reveal_hidden_columns"));
ToolTipManager.sharedInstance().registerComponent(this);
this.setToolTipText(
MessageManager.getString("label.reveal_hidden_columns"));