Changeset 7937


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/slim-plugin/src/main/java/loci/slim/SLIMProcessor.java

    r7936 r7937  
    7272import loci.slim.colorizer.DataColorizer; 
    7373import loci.slim.colorizer.DataColorizer2; 
     74import loci.slim.fitting.cursor.FitterEstimator; 
    7475import loci.slim.heuristics.CursorEstimator; 
    7576import loci.slim.process.IProcessor; 
     
    914915        //TODO revisit all of these 
    915916        IGlobalFitParams globalFitParams = new GlobalFitParams(); 
     917        globalFitParams.setEstimator(new FitterEstimator()); 
    916918        globalFitParams.setFitAlgorithm(fitInfo.getAlgorithm()); 
    917919        globalFitParams.setFitFunction(fitInfo.getFunction()); 
     
    13111313        ICurveFitData dataArray[] = curveFitDataList.toArray(new ICurveFitData[0]); 
    13121314        getCurveFitter(uiPanel).fitData(dataArray); 
    1313  
     1315         
    13141316        // show decay graph for visible channel 
    13151317        String title = "Pixel " + x + " " + y; 
     
    16401642                break; 
    16411643        } 
     1644        curveFitter.setEstimator(new FitterEstimator()); 
    16421645        curveFitter.setFitFunction(fitFunction); 
    16431646        curveFitter.setNoiseModel(uiPanel.getNoiseModel()); 
  • trunk/projects/slim-plugin/src/main/java/loci/slim/fitting/images/AbstractBaseColorizedImage.java

    r7910 r7937  
    165165    private void redisplay(double[] minMaxLUT) { 
    166166        minMaxLUT = PaletteFix.adjustMinMax(minMaxLUT[0], minMaxLUT[1]); 
    167         _imageProcessor.setMinAndMax(minMaxLUT[0], minMaxLUT[1]); 
    168         _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' 
     167        if (null != _imageProcessor) { 
     168            _imageProcessor.setMinAndMax(minMaxLUT[0], minMaxLUT[1]); 
     169            _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' 
     170        } 
    169171    } 
    170172 
Note: See TracChangeset for help on using the changeset viewer.