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
ensure lastSeq is refreshed if new feature added
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
8b53b46
..
99b8620
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-118,6
+118,10
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
public void actionPerformed(ActionEvent e)
\r
{
\r
av.hideColumns(res, res);
\r
public void actionPerformed(ActionEvent e)
\r
{
\r
av.hideColumns(res, res);
\r
+ if(av.getSelectionGroup()!=null
\r
+ && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())
\r
+ av.setSelectionGroup(null);
\r
+
\r
ap.repaint();
\r
if (ap.overviewPanel != null)
\r
ap.overviewPanel.updateOverviewImage();
\r
ap.repaint();
\r
if (ap.overviewPanel != null)
\r
ap.overviewPanel.updateOverviewImage();
\r
@@
-192,15
+196,16
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
- if (res > sg.getStartRes())
\r
- {
\r
+ if(sg!=null){
\r
+ if (res > sg.getStartRes())
\r
+ {
\r
sg.setEndRes(res);
\r
sg.setEndRes(res);
\r
- }
\r
- else if (res < sg.getStartRes())
\r
- {
\r
+ }
\r
+ else if (res < sg.getStartRes())
\r
+ {
\r
sg.setStartRes(res);
\r
sg.setStartRes(res);
\r
+ }
\r
}
\r
}
\r
-
\r
stretchingGroup = false;
\r
ap.repaint();
\r
}
\r
stretchingGroup = false;
\r
ap.repaint();
\r
}
\r