Changeset 6942


Ignore:
Timestamp:
09/14/10 20:34:21 (9 years ago)
Author:
aivar
Message:

Added m_free, describes which parameters are free vs. fixed.
Commented out use of GenericDialogPlus, until fiji-lib.jar is added to Maven repository.

File:
1 edited

Legend:

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

    r6932 r6942  
    3737import loci.colorizer.DataColorizer; 
    3838 
    39 import fiji.util.gui.GenericDialogPlus; 
     39//TODO ARG need to add fiji-lib.jar to maven repository, import fiji.util.gui.GenericDialogPlus; 
    4040 
    4141import ij.*; 
     
    166166    private boolean m_fitT3fixed; 
    167167    private boolean m_fitCfixed; 
     168    private boolean m_free[] = { true, true, true, true, true, true, true }; 
    168169 
    169170    private int m_startBin; 
     
    213214    private boolean showFileDialog(String defaultFile) { 
    214215        //TODO shouldn't UI be in separate class? 
    215         GenericDialogPlus dialog = new GenericDialogPlus("Load Data"); 
    216         dialog.addFileField("File:", defaultFile, 24); 
     216        //TODO need to include fiji-lib.jar in repository, GenericDialogPlus dialog = new GenericDialogPlus("Load Data"); 
     217        GenericDialog dialog = new GenericDialog("Load Data"); 
     218        //TODO works with GenericDialogPlus, dialog.addFileField("File:", defaultFile, 24); 
     219        dialog.addStringField("File", defaultFile); 
    217220        dialog.addCheckbox("Fake data", m_fakeData); 
    218221        dialog.showDialog(); 
     
    761764        } 
    762765        curveFitter.setXInc(m_timeRange); 
     766        curveFitter.setFree(m_free); 
    763767        int startBin = m_startBin + (256 * m_startX); 
    764768        curveFitter.fitData(dataArray, startBin, m_stopBin); 
     
    9971001        } 
    9981002        curveFitter.setXInc(m_timeRange); 
     1003        curveFitter.setFree(m_free); 
    9991004        int startBin = m_startBin + (256 * m_startX); 
    10001005        curveFitter.fitData(data, startBin, m_stopBin); 
Note: See TracChangeset for help on using the changeset viewer.