X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationColumnChooser.java;h=0b1ad93e49cf9373b3938d47499d0a5faa4deb4d;hb=85db53418616e3a36252b9b12fcdee4d0259c431;hp=804690298be03fd6f6fca9fb0e095bcadbfe7835;hpb=577b0bf651763fe609eb6d6343754662023b3eac;p=jalview.git

diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 8046902..0b1ad93 100644
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -21,12 +21,6 @@
 
 package jalview.gui;
 
-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;
@@ -48,6 +42,13 @@ import javax.swing.JPanel;
 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")
@@ -88,11 +89,9 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
   private HiddenColumns oldHiddenColumns;
 
-  // J2SHIDDENCODE
-  protected static int MIN_WIDTH = (/** @j2sNative 370||*/420);
+  protected static int MIN_WIDTH = (Platform.isJS() ? 370 : 420);
 
-  // J2SHIDDENCODE
-  protected static int MIN_HEIGHT = (/** @j2sNative 370||*/430);
+  protected static int MIN_HEIGHT = (Platform.isJS() ? 370 : 430);
 
   public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
   {
@@ -101,9 +100,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
     Desktop.addInternalFrame(frame,
-            MessageManager.getString("label.select_by_annotation"), 0,
-            0);
-    // BH note: MIGLayout ignores this completely, 
+            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));
 
@@ -159,7 +157,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
             MessageManager.getString("label.threshold_filter")));
     thresholdPanel.setBackground(Color.white);
     thresholdPanel.setFont(JvSwingUtils.getLabelFont());
-    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]") );
+    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]"));
 
     percentThreshold.setBackground(Color.white);
     percentThreshold.setFont(JvSwingUtils.getLabelFont());
@@ -257,7 +255,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
   {
     if (slider.isEnabled())
     {
-      getCurrentAnnotation().threshold.value = slider.getValue() / 1000f;
+      getCurrentAnnotation().threshold.value = getSliderValue();
       updateView();
       propagateSeqAssociatedThreshold(updateAllAnnotation,
               getCurrentAnnotation());
@@ -287,6 +285,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     thresholdValue.setEnabled(true);
     percentThreshold.setEnabled(true);
 
+    final AlignmentAnnotation currentAnnotation = getCurrentAnnotation();
     if (selectedThresholdItem == AnnotationColourGradient.NO_THRESHOLD)
     {
       slider.setEnabled(false);
@@ -297,26 +296,21 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     }
     else if (selectedThresholdItem != AnnotationColourGradient.NO_THRESHOLD)
     {
-      if (getCurrentAnnotation().threshold == null)
+      if (currentAnnotation.threshold == null)
       {
-        getCurrentAnnotation().setThreshold(new jalview.datamodel.GraphLine(
-                (getCurrentAnnotation().graphMax
-                        - getCurrentAnnotation().graphMin) / 2f,
+        currentAnnotation.setThreshold(new jalview.datamodel.GraphLine(
+                (currentAnnotation.graphMax - currentAnnotation.graphMin)
+                        / 2f,
                 "Threshold", Color.black));
       }
 
       adjusting = true;
-      float range = getCurrentAnnotation().graphMax * 1000
-              - getCurrentAnnotation().graphMin * 1000;
 
-      slider.setMinimum((int) (getCurrentAnnotation().graphMin * 1000));
-      slider.setMaximum((int) (getCurrentAnnotation().graphMax * 1000));
-      slider.setValue(
-              (int) (getCurrentAnnotation().threshold.value * 1000));
+      setSliderModel(currentAnnotation.graphMin, currentAnnotation.graphMax,
+              currentAnnotation.threshold.value);
 
       setThresholdValueText();
 
-      slider.setMajorTickSpacing((int) (range / 10f));
       slider.setEnabled(true);
       thresholdValue.setEnabled(true);
       adjusting = false;
@@ -324,10 +318,9 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
       // build filter params
       filterParams.setThresholdType(
               AnnotationFilterParameter.ThresholdType.NO_THRESHOLD);
-      if (getCurrentAnnotation().isQuantitative())
+      if (currentAnnotation.isQuantitative())
       {
-        filterParams
-                .setThresholdValue(getCurrentAnnotation().threshold.value);
+        filterParams.setThresholdValue(currentAnnotation.threshold.value);
 
         if (selectedThresholdItem == AnnotationColourGradient.ABOVE_THRESHOLD)
         {
@@ -382,8 +375,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     // 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(currentAnnotation,
+            filterParams);
 
     boolean hideCols = getActionOption() == ACTION_OPTION_HIDE;
     if (hideCols)
@@ -499,7 +492,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
     CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel
             .getLayout();
-    	switchableViewsLayout.show(switchableViewsPanel, currentView);
+    switchableViewsLayout.show(switchableViewsPanel, currentView);
     updateView();
   }
 
@@ -723,7 +716,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     private static final String FILTER_BY_ANN_CACHE_KEY = "CACHE.SELECT_FILTER_BY_ANNOT";
 
     public JvCacheableInputBox<String> searchBox = new JvCacheableInputBox<>(
-            FILTER_BY_ANN_CACHE_KEY);
+            FILTER_BY_ANN_CACHE_KEY, 23);
 
     public SearchPanel(AnnotationColumnChooser aColChooser)
     {
@@ -733,21 +726,20 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
       this.setBorder(new TitledBorder(
               MessageManager.getString("label.search_filter")));
 
-      searchBox.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXX");
       searchBox.getComponent().setToolTipText(
               MessageManager.getString("info.enter_search_text_here"));
       searchBox.addKeyListener(new java.awt.event.KeyAdapter()
-              {
-                @Override
-                public void keyPressed(KeyEvent e)
-                {
-                  if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                  {
-                    e.consume();
-                    searchStringAction();
-                  }
-                }
-              });
+      {
+        @Override
+        public void keyPressed(KeyEvent e)
+        {
+          if (e.getKeyCode() == KeyEvent.VK_ENTER)
+          {
+            e.consume();
+            searchStringAction();
+          }
+        }
+      });
       searchBox.addFocusListener(new FocusAdapter()
       {
         @Override