Changeset 6980


Ignore:
Timestamp:
09/23/10 20:14:22 (9 years ago)
Author:
curtis
Message:

Fix slim-plugin compile errors in Eclipse.

File:
1 edited

Legend:

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

    r6966 r6980  
    3535package loci; 
    3636 
    37 import loci.colorizer.DataColorizer; 
    38  
    39 //TODO ARG need to add fiji-lib.jar to maven repository, import fiji.util.gui.GenericDialogPlus; 
    40  
    41 import ij.*; 
    42 import ij.gui.*; 
     37//TODO need to add fiji-lib.jar to maven repository: 
     38//import fiji.util.gui.GenericDialogPlus; 
     39 
     40import ij.IJ; 
     41import ij.ImagePlus; 
    4342import ij.gui.GenericDialog; 
    4443import ij.gui.NonBlockingGenericDialog; 
    45 import ij.gui.ProgressBar; 
    4644import ij.gui.Roi; 
    47 import ij.plugin.PlugIn; 
    4845import ij.plugin.frame.RoiManager; 
    49 import ij.process.*; 
    50  
    51  
    52 import java.awt.AWTEvent; 
     46import ij.process.ByteProcessor; 
     47import ij.process.ColorProcessor; 
     48import ij.process.ImageProcessor; 
     49 
    5350import java.awt.Color; 
    5451import java.awt.Rectangle; 
    55 import java.awt.event.ActionEvent; 
    56  
    57 import java.io.File; 
    58 import java.io.FileNotFoundException; 
    59 import java.io.FileOutputStream; 
    60 import java.io.PrintStream; 
    6152import java.util.ArrayList; 
    62 import java.util.prefs.*; 
     53import java.util.prefs.Preferences; 
    6354 
    6455import javax.swing.JComponent; 
    6556import javax.swing.JFrame; 
    66 import javax.swing.JPanel; 
    67  
     57 
     58import loci.colorizer.DataColorizer; 
    6859import loci.common.DataTools; 
    69 import loci.curvefitter.*; 
     60import loci.curvefitter.CurveFitData; 
     61import loci.curvefitter.GrayCurveFitter; 
     62import loci.curvefitter.GrayNRCurveFitter; 
     63import loci.curvefitter.ICurveFitData; 
     64import loci.curvefitter.ICurveFitter; 
     65import loci.curvefitter.JaolhoCurveFitter; 
     66import loci.curvefitter.MarkwardtCurveFitter; 
    7067import loci.formats.ChannelSeparator; 
    7168import loci.formats.FormatException; 
     
    225222    private boolean showFileDialog(String defaultFile) { 
    226223        //TODO shouldn't UI be in separate class? 
    227         //TODO need to include fiji-lib.jar in repository, GenericDialogPlus dialog = new GenericDialogPlus("Load Data"); 
     224        //TODO need to include fiji-lib.jar in repository: 
     225        //GenericDialogPlus dialog = new GenericDialogPlus("Load Data"); 
    228226        GenericDialog dialog = new GenericDialog("Load Data"); 
    229227        //TODO works with GenericDialogPlus, dialog.addFileField("File:", defaultFile, 24); 
     
    834832                curveFitter = new GrayNRCurveFitter(1); 
    835833                break; 
    836             case SLIMCURVE_RLD: 
    837                 curveFitter = new SLIMCurveFitter(0); 
    838                 break; 
    839             case SLIMCURVE_LMA: 
    840                 curveFitter = new SLIMCurveFitter(1); 
    841                 break; 
     834//            case SLIMCURVE_RLD: 
     835//                curveFitter = new SLIMCurveFitter(0); 
     836//                break; 
     837//            case SLIMCURVE_LMA: 
     838//                curveFitter = new SLIMCurveFitter(1); 
     839//                break; 
    842840        } 
    843841        curveFitter.setXInc(m_timeRange); 
     
    10251023 
    10261024        ChunkyPixelEffectIterator pixelIterator = new ChunkyPixelEffectIterator(new ChunkyPixelTableImpl(), m_width, m_height); 
    1027          
     1025 
    10281026        int pixelCount = 0; 
    10291027        int pixelsToProcessCount = 0; 
     
    10981096                curveFitter = new GrayNRCurveFitter(1); 
    10991097                break; 
    1100             case SLIMCURVE_RLD: 
    1101                 curveFitter = new SLIMCurveFitter(0); 
    1102                 break; 
    1103             case SLIMCURVE_LMA: 
    1104                 curveFitter = new SLIMCurveFitter(1); 
    1105                 break; 
     1098//            case SLIMCURVE_RLD: 
     1099//                curveFitter = new SLIMCurveFitter(0); 
     1100//                break; 
     1101//            case SLIMCURVE_LMA: 
     1102//                curveFitter = new SLIMCurveFitter(1); 
     1103//                break; 
    11061104        } 
    11071105        curveFitter.setXInc(m_timeRange); 
     
    12741272       } 
    12751273    } 
    1276      
     1274 
    12771275   /* private class MyDialogListener implements DialogListener { 
    12781276        public boolean dialogItemChanged(GenericDialog dialog, AWTEvent e) { 
     
    12881286            } 
    12891287            else { 
    1290                  
    12911288                System.out.println("!Event " + e); 
    12921289                System.out.println(dialog.getChoices().get(0)); 
Note: See TracChangeset for help on using the changeset viewer.