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
Merge branch 'bug/JAL-3158selectionBroadcasts' into merge/JAL-3158
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/gui/AnnotationColumnChooser.java
b/src/jalview/gui/AnnotationColumnChooser.java
index
8dd988e
..
6924b63
100644
(file)
--- a/
src/jalview/gui/AnnotationColumnChooser.java
+++ b/
src/jalview/gui/AnnotationColumnChooser.java
@@
-243,7
+243,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
av.getAlignment().setHiddenColumns(oldHidden);
}
av.sendSelection();
av.getAlignment().setHiddenColumns(oldHidden);
}
av.sendSelection();
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
}
}
}
}
@@
-256,7
+256,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
updateView();
propagateSeqAssociatedThreshold(updateAllAnnotation,
getCurrentAnnotation());
updateView();
propagateSeqAssociatedThreshold(updateAllAnnotation,
getCurrentAnnotation());
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
}
}
}
}
@@
-380,7
+380,8
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
av.getColumnSelection().filterAnnotations(
getCurrentAnnotation().annotations, filterParams);
av.getColumnSelection().filterAnnotations(
getCurrentAnnotation().annotations, filterParams);
- if (getActionOption() == ACTION_OPTION_HIDE)
+ boolean hideCols = getActionOption() == ACTION_OPTION_HIDE;
+ if (hideCols)
{
av.hideSelectedColumns();
}
{
av.hideSelectedColumns();
}
@@
-388,7
+389,8
@@
public class AnnotationColumnChooser extends AnnotationRowFilter
filterParams = null;
av.setAnnotationColumnSelectionState(this);
filterParams = null;
av.setAnnotationColumnSelectionState(this);
- ap.paintAlignment(true);
+ // only update overview and structures if columns were hidden
+ ap.paintAlignment(hideCols, hideCols);
}
public HiddenColumns getOldHiddenColumns()
}
public HiddenColumns getOldHiddenColumns()