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
formatting
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
7ed0146
..
32283ce
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-119,7
+119,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
{
\r
av.hideColumns(res, res);
\r
if(av.getSelectionGroup()!=null
\r
{
\r
av.hideColumns(res, res);
\r
if(av.getSelectionGroup()!=null
\r
- && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())
\r
+ && av.getSelectionGroup().getSize()==av.alignment.getHeight())
\r
av.setSelectionGroup(null);
\r
\r
ap.repaint();
\r
av.setSelectionGroup(null);
\r
\r
ap.repaint();
\r
@@
-196,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