Changeset 7962

Timestamp:

04/12/12 17:28:55 (8 years ago)

Author:

aivar

Message:

SLIM Plugin: Masking UI. Trac #689 #690.

Location:

trunk/projects/slim-plugin/src/main/java/loci/slim/histogram

Files:

• HistogramTool.java (modified) (1 diff)
• IUIPanelListener.java (modified) (1 diff)
• UIPanel.java (modified) (10 diffs)

trunk/projects/slim-plugin/src/main/java/loci/slim/histogram/HistogramTool.java

@@ -433 +433 @@
         
         @Override
+        public void setExcludePixels(boolean excludePixels) {
+            synchronized (_synchObject) {
+                //TODO ARG
+                System.out.println("set exclude pixels " + excludePixels);
+            }
+        }
+        
+        @Override
         public void setCombineChannels(boolean combineChannels) {
             synchronized (_synchObject) {

trunk/projects/slim-plugin/src/main/java/loci/slim/histogram/IUIPanelListener.java

@@ -20 +20 @@
     
     /**
+     * User has clicked the exclude pixels checkbox.
+     * 
+     * @param excludePixels
+     */
+    public void setExcludePixels(boolean excludePixels);
+    
+    /**
      * User has clicked the combine channels checkbox.
      */

trunk/projects/slim-plugin/src/main/java/loci/slim/histogram/UIPanel.java

@@ -25 +25 @@
  */
 public class UIPanel extends JPanel {
+    private static final String AUTO_RANGING = "Adjust range to min/max values";
+    private static final String EXCLUDE_PIXELS = "Hide pixels outside range";
+    private static final String DISPLAY_CHANNELS = "Display all channels";
+    private static final String COMBINE_CHANNELS = "Combine all channels";
+    
     private static final int DIGITS = 5;
     IUIPanelListener _listener;
     JCheckBox _autoRangeCheckBox;
+    JCheckBox _excludePixelsCheckBox;
     JCheckBox _combineChannelsCheckBox;
     JCheckBox _displayChannelsCheckBox;
@@ -33 +39 @@
     JTextField _maxTextField;
     boolean _autoRange;
+    boolean _excludePixels;
     boolean _combineChannels;
     boolean _displayChannels;
@@ -47 +54 @@
 
         // initial state
-        _autoRange = true;
+        _autoRange        = true;
+        _excludePixels    = false;
+        _combineChannels  = false;
+        _displayChannels  = false;
         _minLUT = _maxLUT = 0.0;
 
@@ -95 +105 @@
         add(readOutPanel);
  
-        _autoRangeCheckBox = new JCheckBox("Automatic Ranging", _autoRange);
+        _autoRangeCheckBox = new JCheckBox(AUTO_RANGING, _autoRange);
         _autoRangeCheckBox.addItemListener(
             new ItemListener() {
                 public void itemStateChanged(ItemEvent e) {
                     _autoRange = _autoRangeCheckBox.isSelected();
-                    enableTextFields(_autoRange);
+                    enableUI(_autoRange);
                     if (null != _listener) {
                         _listener.setAutoRange(_autoRange);
@@ -109 +119 @@
         add(_autoRangeCheckBox);
         
+        _excludePixelsCheckBox = new JCheckBox(EXCLUDE_PIXELS, _excludePixels);
+        _excludePixelsCheckBox.addItemListener(
+            new ItemListener() {
+                public void itemStateChanged(ItemEvent e) {
+                    _excludePixels = _excludePixelsCheckBox.isSelected();
+                    if (null != _listener) {
+                        _listener.setExcludePixels(_excludePixels);
+                    }
+                }
+            }
+        );
+        add(_excludePixelsCheckBox);
+        
         _combineChannelsCheckBox =
-            new JCheckBox("Combine Channels", _combineChannels);
+            new JCheckBox(COMBINE_CHANNELS, _combineChannels);
         _combineChannelsCheckBox.addItemListener(
             new ItemListener() {
@@ -121 +144 @@
             }
         );
+        
         /**
          * IJ1 uses the same LUT for the entire stack.  It might be possible for
@@ -136 +160 @@
 
         _displayChannelsCheckBox =
-            new JCheckBox("Display All Channels", _displayChannels);
+            new JCheckBox(DISPLAY_CHANNELS, _displayChannels);
         _displayChannelsCheckBox.addItemListener(
             new ItemListener() {
@@ -157 +181 @@
         }
 
-        enableTextFields(_autoRange);
+        enableUI(_autoRange);
     }
 
@@ -172 +196 @@
         _autoRange = autoRange;
         _autoRangeCheckBox.setSelected(autoRange);
-        enableTextFields(autoRange);
+        enableUI(autoRange);
     }
     
@@ -214 +238 @@
 
     /**
-     * Enable/disable min/max text fields as appropriate.
-     */
-    private void enableTextFields(boolean auto) {
+     * Enable/disable UI elements as appropriate.
+     */
+    private void enableUI(boolean auto) {
         _minTextField.setEnabled(!auto);
         _maxTextField.setEnabled(!auto);
+        _excludePixelsCheckBox.setEnabled(!auto);
     }