Changeset 7937

Timestamp:

03/29/12 17:47:00 (8 years ago)

Author:

aivar

Message:

SLIM Plugin: New "FitterEstimator" class was missing when fitting images; result was no images.

Location:

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

Files:

• SLIMProcessor.java (modified) (4 diffs)
• fitting/images/AbstractBaseColorizedImage.java (modified) (1 diff)

trunk/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

@@ -72 +72 @@
 import loci.slim.colorizer.DataColorizer;
 import loci.slim.colorizer.DataColorizer2;
+import loci.slim.fitting.cursor.FitterEstimator;
 import loci.slim.heuristics.CursorEstimator;
 import loci.slim.process.IProcessor;
@@ -914 +915 @@
         //TODO revisit all of these
         IGlobalFitParams globalFitParams = new GlobalFitParams();
+        globalFitParams.setEstimator(new FitterEstimator());
         globalFitParams.setFitAlgorithm(fitInfo.getAlgorithm());
         globalFitParams.setFitFunction(fitInfo.getFunction());
@@ -1311 +1313 @@
         ICurveFitData dataArray[] = curveFitDataList.toArray(new ICurveFitData[0]);
         getCurveFitter(uiPanel).fitData(dataArray);
-
+        
         // show decay graph for visible channel
         String title = "Pixel " + x + " " + y;
@@ -1640 +1642 @@
                 break;
         }
+        curveFitter.setEstimator(new FitterEstimator());
         curveFitter.setFitFunction(fitFunction);
         curveFitter.setNoiseModel(uiPanel.getNoiseModel());

trunk/projects/slim-plugin/src/main/java/loci/slim/fitting/images/AbstractBaseColorizedImage.java

@@ -165 +165 @@
     private void redisplay(double[] minMaxLUT) {
         minMaxLUT = PaletteFix.adjustMinMax(minMaxLUT[0], minMaxLUT[1]);
-        _imageProcessor.setMinAndMax(minMaxLUT[0], minMaxLUT[1]);
-        _imagePlus.setProcessor(_imageProcessor.duplicate()); //TODO ARG OUCH!  This ImagePlus holds an ImageStack - maybe update(ImageProcessor ip) Updates this stack so its attributes such as min max calibration table and color model, are the same as 'ip'
+        if (null != _imageProcessor) {
+            _imageProcessor.setMinAndMax(minMaxLUT[0], minMaxLUT[1]);
+            _imagePlus.setProcessor(_imageProcessor.duplicate()); //TODO ARG OUCH!  This ImagePlus holds an ImageStack - maybe update(ImageProcessor ip) Updates this stack so its attributes such as min max calibration table and color model, are the same as 'ip'
+        }
     }