package jalview.gui;
-import jalview.datamodel.AlignmentAnnotation;
-import jalview.datamodel.HiddenColumns;
-import jalview.io.cache.JvCacheableInputBox;
-import jalview.schemes.AnnotationColourGradient;
-import jalview.util.MessageManager;
-import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
-
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Color;
import javax.swing.JRadioButton;
import javax.swing.border.TitledBorder;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.HiddenColumns;
+import jalview.io.cache.JvCacheableInputBox;
+import jalview.schemes.AnnotationColourGradient;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
import net.miginfocom.swing.MigLayout;
@SuppressWarnings("serial")
private HiddenColumns oldHiddenColumns;
- protected int MIN_WIDTH = 420;
+ protected static int MIN_WIDTH = (Platform.isJS() ? 370 : 420);
- protected int MIN_HEIGHT = 430;
+ protected static int MIN_HEIGHT = (Platform.isJS() ? 370 : 430);
public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
{
frame.setContentPane(this);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
Desktop.addInternalFrame(frame,
- MessageManager.getString("label.select_by_annotation"), 520,
- 215);
+ MessageManager.getString("label.select_by_annotation"), 0, 0);
+ // BH note: MIGLayout ignores this completely,
+ // possibly creating a frame smaller than specified:
frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
addSliderChangeListener();
AnnotationColumnChooser.NO_GRAPH_VIEW);
switchableViewsPanel.add(graphFilterView,
AnnotationColumnChooser.GRAPH_VIEW);
-
this.setLayout(new BorderLayout());
this.add(annotationComboBoxPanel, java.awt.BorderLayout.PAGE_START);
this.add(switchableViewsPanel, java.awt.BorderLayout.CENTER);
if (currentAnnotation.threshold == null)
{
currentAnnotation.setThreshold(new jalview.datamodel.GraphLine(
- (currentAnnotation.graphMax
- - currentAnnotation.graphMin) / 2f,
+ (currentAnnotation.graphMax - currentAnnotation.graphMin)
+ / 2f,
"Threshold", Color.black));
}
adjusting = true;
- setSliderModel(currentAnnotation.graphMin,
- currentAnnotation.graphMax,
+ setSliderModel(currentAnnotation.graphMin, currentAnnotation.graphMax,
currentAnnotation.threshold.value);
setThresholdValueText();
AnnotationFilterParameter.ThresholdType.NO_THRESHOLD);
if (currentAnnotation.isQuantitative())
{
- filterParams
- .setThresholdValue(currentAnnotation.threshold.value);
+ filterParams.setThresholdValue(currentAnnotation.threshold.value);
if (selectedThresholdItem == AnnotationColourGradient.ABOVE_THRESHOLD)
{
// filterAnnotations, because showing hidden columns has the side effect of
// adding them to the selection
av.showAllHiddenColumns();
- av.getColumnSelection().filterAnnotations(
- currentAnnotation.annotations, filterParams);
+ av.getColumnSelection().filterAnnotations(currentAnnotation,
+ filterParams);
boolean hideCols = getActionOption() == ACTION_OPTION_HIDE;
if (hideCols)
this.setBorder(new TitledBorder(
MessageManager.getString("label.search_filter")));
- searchBox.setToolTipText(
+ searchBox.getComponent().setToolTipText(
MessageManager.getString("info.enter_search_text_here"));
- searchBox.getEditor().getEditorComponent()
- .addKeyListener(new java.awt.event.KeyAdapter()
- {
- @Override
- public void keyPressed(KeyEvent e)
- {
- if (e.getKeyCode() == KeyEvent.VK_ENTER)
- {
- e.consume();
- searchStringAction();
- }
- }
- });
- searchBox.getEditor().getEditorComponent()
- .addFocusListener(new FocusAdapter()
+ searchBox.addKeyListener(new java.awt.event.KeyAdapter()
+ {
+ @Override
+ public void keyPressed(KeyEvent e)
+ {
+ if (e.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ e.consume();
+ searchStringAction();
+ }
+ }
+ });
+ searchBox.addFocusListener(new FocusAdapter()
{
@Override
public void focusLost(FocusEvent e)
});
syncState();
- this.add(searchBox);
+ this.add(searchBox.getComponent());
this.add(displayName);
this.add(description);
}