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-2349 JAL-3855 experimenting with filtering columns based on mean of contact map...
[jalview.git]
/
src
/
jalview
/
appletgui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/appletgui/AnnotationColumnChooser.java
b/src/jalview/appletgui/AnnotationColumnChooser.java
index
206b132
..
37b45f9
100644
(file)
--- a/
src/jalview/appletgui/AnnotationColumnChooser.java
+++ b/
src/jalview/appletgui/AnnotationColumnChooser.java
@@
-20,12
+20,6
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.HiddenColumns;
-import jalview.schemes.AnnotationColourGradient;
-import jalview.util.MessageManager;
-import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
-
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Checkbox;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Checkbox;
@@
-48,6
+42,12
@@
import java.awt.event.TextEvent;
import java.awt.event.TextListener;
import java.util.Vector;
import java.awt.event.TextListener;
import java.util.Vector;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.HiddenColumns;
+import jalview.schemes.AnnotationColourGradient;
+import jalview.util.MessageManager;
+import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
+
//import javax.swing.JPanel;
//import net.miginfocom.swing.MigLayout;
//import javax.swing.JPanel;
//import net.miginfocom.swing.MigLayout;
@@
-492,8
+492,8
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
// filterAnnotations, because showing hidden columns has the side effect of
// adding them to the selection
av.showAllHiddenColumns();
// filterAnnotations, because showing hidden columns has the side effect of
// adding them to the selection
av.showAllHiddenColumns();
- av.getColumnSelection().filterAnnotations(
- getCurrentAnnotation().annotations, filterParams);
+ av.getColumnSelection().filterAnnotations(getCurrentAnnotation(),
+ filterParams);
if (getActionOption() == ACTION_OPTION_HIDE)
{
if (getActionOption() == ACTION_OPTION_HIDE)
{