Changeset 7845 for trunk/projects/slim-plugin

Timestamp:

12/20/11 23:56:21 (8 years ago)

Author:

aivar

Message:

Got 254 color palette working in histogram color bar.

Location:

trunk/projects/slim-plugin/src/main/java/imagej/slim

Files:

• fitting/AbstractBaseFittedImage.java (modified) (5 diffs)
• fitting/InvalidDouble.java (deleted)
• histogram/HistogramData.java (modified) (1 diff)
• histogram/HistogramDataChannel.java (modified) (4 diffs)
• histogram/HistogramTool.java (modified) (3 diffs)
• histogram/IUIPanelListener.java (added)
• histogram/UIPanel.java (modified) (3 diffs)

trunk/projects/slim-plugin/src/main/java/imagej/slim/fitting/AbstractBaseFittedImage.java

@@ -10 +10 @@
 import java.awt.image.IndexColorModel;
 
-//import ij.process.MyFloatProcessor; //TODO IJ hack; update to IJ2 ImgLib
 import ij.ImagePlus;
 import ij.process.FloatProcessor;
@@ -41 +40 @@
         _image = new FloatProcessor(x, y);
         _image.setColorModel(imagej.slim.histogram.HistogramTool.getIndexColorModel());
-        //TODO fill the image with a color that will be out of LUT range and paint black!:
-        _image.setValue(Float.NaN); //TODO
-        _image.fill(); //TODO
+        // fill the image with a value that will be out of LUT range and paint black.
+        _image.setValue(Float.NaN);
+        _image.fill();
         _imagePlus = new ImagePlus(title, _image);
         _imagePlus.show();
@@ -129 +128 @@
         for (int y = 0; y < values[0].length; ++y) {
             for (int x = 0; x < values.length; ++x) {
-                if (InvalidDouble.isValue(values[x][y])) {
+                if (Double.isNaN(values[x][y])) {
                     ++num;
                 }
@@ -138 +137 @@
         return num;
     }   
-    
-    
-    
     
     /**
@@ -188 +184 @@
         for (int y = 0; y < values[0].length; ++y) {
             for (int x = 0; x < values.length; ++x) {
-                values[x][y] = InvalidDouble.value();
+                values[x][y] = Double.NaN;
             }
         }

trunk/projects/slim-plugin/src/main/java/imagej/slim/histogram/HistogramData.java

@@ -224 +224 @@
 
         if (null != _listener) {
+            System.out.println("tell listener " + _minView + " " + _maxView + "," + _minLUT + " " + _maxLUT);
             _listener.minMaxChanged(_minView, _maxView, _minLUT, _maxLUT);
         }

trunk/projects/slim-plugin/src/main/java/imagej/slim/histogram/HistogramDataChannel.java

@@ -4 +4 @@
  */
 package imagej.slim.histogram;
-
-import imagej.slim.fitting.InvalidDouble;
 
 /**
@@ -15 +13 @@
 public class HistogramDataChannel {
     private double[][] _values;
-    private double _min;
-    private double _max;
     private double _minLUT;
     private double _maxLUT;
@@ -34 +30 @@
     public HistogramDataChannel(double[][] values) {
         _values = values;
-        _min = _max = 0.0f;
     }
 
@@ -66 +61 @@
      */
     public double[] findMinMax() {
-        _min = Double.MAX_VALUE;
-        _max = Double.MIN_VALUE;
+        double min = Double.MAX_VALUE;
+        double max = Double.MIN_VALUE;
         for (int i = 0; i < _values.length; ++i) {
             for (int j = 0; j < _values[0].length; ++j) {
-                if (InvalidDouble.isValue(_values[i][j])) {
-                    if (_values[i][j] < _min) {
-                        _min = _values[i][j];
+                if (!Double.isNaN(_values[i][j])) {
+                    if (_values[i][j] < min) {
+                        min = _values[i][j];
                     }
-                    if (_values[i][j] > _max) {
-                        _max = _values[i][j];
+                    if (_values[i][j] > max) {
+                        max = _values[i][j];
                     }
                 }
             }
         }
-        return new double[] { _min, _max };
+        return new double[] { min, max };
     }
     

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

@@ -65 +65 @@
         _colorBarPanel.setLUT(getLUT());
         _uiPanel = new UIPanel();
+        _uiPanel.setListener(new UIPanelListener());
 
         _frame = new JFrame("Histogram");
@@ -217 +218 @@
             double minLUT = pixelToValue(min);
             double maxLUT = pixelToValue(max);
+
+            // set min and max on UI panel
+            _uiPanel.setMinMaxLUT(minLUT, maxLUT);
 
             // redraw image and save
@@ -311 +315 @@
         }
     }
+
+    private class UIPanelListener implements IUIPanelListener {
+        //tOEOprivate UIPanelListener() { }
+        @Override
+        public void setAuto(boolean auto) {
+             // turn on/off the cursors
+            // they are usually at -1 & 255
+            // but if you are autoranging & showing all channels
+            // they need to be calculated
+            // autorange off, stuff shouldn't change right away
+            // autorange on, should calculate new bounds
+        }
+
+        @Override
+        public void setMinMaxLUT(double min, double max) {
+            // user has typed in some new values
+            // can't be autoranging
+            // adjust cursors and color bar and possibly histogram
+        }
+    }
 }

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

@@ -24 +24 @@
  */
 public class UIPanel extends JPanel {
+    IUIPanelListener _listener;
     JCheckBox m_autoCheckBox;
     JTextField m_startTextField;
@@ -46 +47 @@
 
         m_auto = true;
-        m_start = m_stop = m_min = m_max = 0.0;
+        m_start = m_stop = m_min = m_max = 0.0; //TODO gotta be a better way
 
         setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
@@ -96 +97 @@
     }
 
+    public void setListener(IUIPanelListener listener) {
+        _listener = listener;
+    }
+
+    public void setAuto(boolean auto) {
+
+    }
+
+    public void setMinMaxLUT(double min, double max) {
+        System.out.println("SetMinMaxLUT " + min + " " + max);
+        m_startTextField.setText("" + min);
+        m_stopTextField.setText("" + max);
+    }
+
+    // not
     /**
      * IColorizeRangeListener method.  Gets external changes to settings.