Changeset 7848 for trunk

Timestamp:

12/21/11 23:32:51 (8 years ago)

Author:

aivar

Message:

SLIMPlugin: shows colorized range of values using 254 color palette.

Location:

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

Files:

• fitting/AbstractBaseFittedImage.java (modified) (4 diffs)
• fitting/IFittedImage.java (modified) (2 diffs)
• histogram/HistogramData.java (modified) (4 diffs)
• histogram/HistogramTool.java (modified) (3 diffs)

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

@@ -16 +16 @@
 import imagej.slim.histogram.HistogramDataChannel;
 import imagej.slim.histogram.HistogramTool;
+import imagej.slim.histogram.PaletteFix;
 
 /**
@@ -37 +38 @@
         HistogramDataChannel histogramDataChannel = new HistogramDataChannel(_values);
         HistogramDataChannel[] histogramDataChannels = new HistogramDataChannel[] { histogramDataChannel };
-        _histogramData = new HistogramData(title, histogramDataChannels);
+        _histogramData = new HistogramData(this, title, histogramDataChannels);
         _image = new FloatProcessor(x, y);
         _image.setColorModel(imagej.slim.histogram.HistogramTool.getIndexColorModel());
@@ -103 +104 @@
     /**
      * Recalculates the image histogram and resets the palette.  Called
-     * periodically during the fit.
+     * periodically during the fit.  Redisplays the image.
      */
     public void recalcHistogram() {
@@ -109 +110 @@
 
         if (null != minMaxLUT) {
-            // update palette bounds
-            _image.setMinAndMax(minMaxLUT[0], minMaxLUT[1]);
-            System.out.println("min max " + minMaxLUT[0] + " " +  minMaxLUT[1]);
+            System.out.println("Internal redisplay " + minMaxLUT[0] + " " + minMaxLUT[1]);
+            //TODO horrible kludge here!!!  But why on earth would these be zero?
+            //TODO #2 wound up enabling this again, otherwise you don't get any images except current image
+            if (true) { // 0 != minMaxLUT[0] && 0 != minMaxLUT[1]) {
+                redisplay(minMaxLUT);
+            }
         }
         else System.out.println("min max null");
-//        System.out.println("min max " + minMax[0] + " " + minMax[1]);
-        // etc.
-        _imagePlus.setProcessor(_image.duplicate());
-        
         
         System.out.println("RECALC " + numInvalid(_values));
     }
-    
+
+    /**
+     * Called from the histogram tool.  Redisplays the image after LUT ranges
+     * have changed.
+     */
+    public void redisplay() {
+        System.out.println("public redisplay");
+        double[] minMaxLUT = _histogramData.getMinMaxLUT();
+        redisplay(minMaxLUT);
+    }
+
+    /*
+     * Redisplay the image with new LUT range.
+     */
+    private void redisplay(double[] minMaxLUT) {
+        minMaxLUT = PaletteFix.adjustMinMax(minMaxLUT[0], minMaxLUT[1]);
+        _image.setMinAndMax(minMaxLUT[0], minMaxLUT[1]);
+        System.out.println("SETTING MIN AND MAX LUT TO " + minMaxLUT[0] + " " + minMaxLUT[1]);
+        _imagePlus.setProcessor(_image.duplicate());
+    }
     
     private int numInvalid(double[][] values) {

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

@@ -12 +12 @@
 /**
  *
- * @author Sivar Grislis
+ * @author Aivar Grislis
  */
 public interface IFittedImage {
@@ -77 +77 @@
 
     /**
+     * Redisplays the image.
+     */
+    public void redisplay();
+
+    /**
      * Given the array of fitted parameters, get the value for this image.
      * 

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

@@ -4 +4 @@
  */
 package imagej.slim.histogram;
+
+import imagej.slim.fitting.IFittedImage;
 
 /**
@@ -12 +14 @@
  */
 public class HistogramData {
+    private IFittedImage _image;
     private String _title;
     private HistogramDataChannel[] _channel;
@@ -29 +32 @@
      * @param channel 
      */
-    public HistogramData(String title, HistogramDataChannel[] channel) {
+    public HistogramData(IFittedImage image, String title,
+            HistogramDataChannel[] channel) {
+        _image = image;
         _title = title;
         _channel = channel;
@@ -244 +249 @@
         return new double[] { minLUT, maxLUT };
     }
+
+    public void redisplay() {
+        _image.redisplay();
+    }
     
     public int[] binValues(int bins) {

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

@@ -193 +193 @@
             _histogramPanel.setBins(bins);
             _colorBarPanel.setMinMax(minView, maxView, minLUT, maxLUT);
+            //TODO changed is currently called from two places:
+            // i) the HistogramData listener will call it periodically during the
+            // fit.
+            // ii) if the user types in a new LUT range this gets called.
+            // iii) in the future more UI interactions will wind up here
+            //
+            _histogramData.redisplay();
         }
     }
@@ -204 +211 @@
         public void minMaxChanged(double minView, double maxView,
                 double minLUT, double maxLUT) {
+            System.out.println("CHANGED " + minView + " " + maxView + ", " + minLUT + " " + maxLUT);
             changed(minView, maxView, minLUT, maxLUT);
         }
@@ -336 +344 @@
                  _histogramData.setAutoRange(autoRange);
             }
-             // 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
+
+            if (autoRange) {
+                _histogramPanel.setCursors(null, null);
+                //TODO calculate new bounds
+            }
+            else {
+                //TODO if you are autoranging, not combining channels, but showing
+                // all channels, these cursors would need to be calculated
+                _histogramPanel.setCursors(INSET, INSET + WIDTH - 1); //TODO I was expecting INSET-1 here??
+            }
         }