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
If seq has a dataset, dont clear it
[jalview.git]
/
src
/
jalview
/
gui
/
ColumnSelection.java
diff --git
a/src/jalview/gui/ColumnSelection.java
b/src/jalview/gui/ColumnSelection.java
index
1032c5b
..
94e2642
100755
(executable)
--- a/
src/jalview/gui/ColumnSelection.java
+++ b/
src/jalview/gui/ColumnSelection.java
@@
-330,7
+330,8
@@
public class ColumnSelection
}
\r
\r
\r
}
\r
\r
\r
- public void hideColumns(int res, AlignViewport av)
\r
+
\r
+ public void hideColumns(int res)
\r
{
\r
if(hiddenColumns==null)
\r
hiddenColumns = new Vector();
\r
{
\r
if(hiddenColumns==null)
\r
hiddenColumns = new Vector();
\r
@@
-360,13
+361,21
@@
public class ColumnSelection
if(!added)
\r
hiddenColumns.addElement(new int[]{min, max});
\r
\r
if(!added)
\r
hiddenColumns.addElement(new int[]{min, max});
\r
\r
-
\r
- av.setSelectionGroup(null);
\r
- av.hasHiddenColumns = true;
\r
}
\r
\r
public void revealAllHiddenColumns(AlignViewport av)
\r
{
\r
}
\r
\r
public void revealAllHiddenColumns(AlignViewport av)
\r
{
\r
+ if(hiddenColumns!=null)
\r
+ {
\r
+ for (int i = 0; i < hiddenColumns.size(); i++)
\r
+ {
\r
+ int[] region = (int[]) hiddenColumns.elementAt(i);
\r
+ for (int j = region[0]; j < region[1]; j++)
\r
+ {
\r
+ addElement(j);
\r
+ }
\r
+ }
\r
+ }
\r
av.hasHiddenColumns = false;
\r
hiddenColumns = null;
\r
}
\r
av.hasHiddenColumns = false;
\r
hiddenColumns = null;
\r
}
\r
@@
-378,6
+387,11
@@
public class ColumnSelection
int [] region = (int[])hiddenColumns.elementAt(i);
\r
if( res == region[0])
\r
{
\r
int [] region = (int[])hiddenColumns.elementAt(i);
\r
if( res == region[0])
\r
{
\r
+ for (int j = region[0]; j < region[1]; j++)
\r
+ {
\r
+ addElement(j);
\r
+ }
\r
+
\r
hiddenColumns.remove(region);
\r
break;
\r
}
\r
hiddenColumns.remove(region);
\r
break;
\r
}
\r