Changeset 7671 for trunk/projects/slim-plugin/src

Timestamp:

03/23/11 20:28:55 (9 years ago)

Author:

aivar

Message:

Moved loading an Excitation and setting up the ExcitationPanel to SLIMProcessor.

Location:

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

Files:

• CursorHelper.java (modified) (10 diffs)
• DecayGraph.java (modified) (1 diff)
• Excitation.java (modified) (2 diffs)
• ExcitationFileHandler.java (modified) (3 diffs)
• SLIMProcessor.java (modified) (9 diffs)
• ui/ExcitationGraph.java (modified) (4 diffs)
• ui/IUserInterfacePanelListener.java (modified) (2 diffs)
• ui/UserInterfacePanel.java (modified) (4 diffs)

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

@@ -53 +53 @@
     public static float[] estimateExcitationCursors(float[] excitation) {
         float baseline;
+        float maxval;
+        int index;
         int startp = 0;
         int endp = 0;
+        int i;
         float[] diffed = new float[excitation.length];
         int steepp;
 
         // "Estimate prompt baseline; very rough and ready"
-        int index = findMax(excitation);
-        float maxval = excitation[index];
+        index = findMax(excitation);
+        maxval = excitation[index];
 
         if (index > excitation.length * 3 /4) { // "integer arithmetic"
@@ -68 +71 @@
             baseline = 0.0f;
             int index2 = (index + excitation.length) / 2;
-            for (int i = index2; i < excitation.length; ++i) {
+            for (i = index2; i < excitation.length; ++i) {
                 baseline += excitation[i];
             }
@@ -76 +79 @@
         // "Where does the prompt first drop to (peak amplitude - baseline) / 10?
         // This could be silly if the baseline is silly; caveat emptor!"
-        for (int i = index; i > 0; --i) {
+        for (i = index; i > 0; --i) {
             if ((excitation[i] - baseline) < 0.1 * (maxval - baseline)) {
-                startp = i; // "First estimate"
                 break;
             }
         }
+        startp = i; // "First estimate"
 
         // "And first drop away again?"
-        for (int i = index; i < excitation.length - 1; ++i) {
+        for (i = index; i < excitation.length - 1; ++i) {
             if ((excitation[i] - baseline) < 0.1 * (maxval - baseline)) {
-                endp = i;
                 break;
             }
         }
+        endp = i;
 
         // "Differentiate"
-        for (int i = 0; i < index; ++i) {
+        for (i = 0; i < index; ++i) {
             diffed[i] = excitation[i + 1] - excitation[i];
         }
@@ -119 +122 @@
     }
 
-    public static float[] estimateCursors(float[] prompt, double[] decay) {
+    public static float[] estimateCursors(float xInc, float[] prompt, double[] decay) {
         float[] returnValue = new float[5];
         float baseline;
+        float maxval; // TRCursors.c has "unsigned short maxsval, maxval; float maxfval, *diffed;"
+        int index;
         int startp = 0;
         int startt = 0;
         int endp = 0;
         int endt = 0;
+        int i;
         float[] diffed = new float[prompt.length];
         int steepp;
         int steept;
+        // "For Marquardt fitting"
+        double param[] = new double[4];
+        boolean free[] = new boolean[] { true, true, true };
+        double[] yFitted = new double[decay.length];
+        double[] chiSqTable = new double[2 * ATTEMPTS + 1];
+        int transStartIndex;
+        int transFitStartIndex;
+        int transEndIndex;
 
         // "Estimate prompt baseline; very rough and ready"
-        int index = findMax(prompt);
-        float maxval = prompt[index];
+        index = findMax(prompt);
+        maxval = prompt[index];
 
         if (index > prompt.length * 3 /4) { // "integer arithmetic"
@@ -140 +154 @@
             baseline = 0.0f;
             int index2 = (index + prompt.length) / 2;
-            for (int i = index2; i < prompt.length; ++i) {
+            for (i = index2; i < prompt.length; ++i) {
                 baseline += prompt[i];
             }
@@ -148 +162 @@
         // "Where does the prompt first drop to (peak amplitude - baseline) / 10?
         // This could be silly if the baseline is silly; caveat emptor!"
-        for (int i = index; i > 0; --i) {
+        for (i = index; i > 0; --i) {
             if ((prompt[i] - baseline) < 0.1 * (maxval - baseline)) {
-                startp = i; // "First estimate"
                 break;
             }
         }
+        startp = i; // "First estimate"
 
         // "And first drop away again?"
-        for (int i = index; i < prompt.length - 1; ++i) {
+        for (i = index; i < prompt.length - 1; ++i) {
             if ((prompt[i] - baseline) < 0.1 * (maxval - baseline)) {
-                endp = i;
                 break;
             }
         }
+        endp = i;
 
         // "Differentiate"
-        for (int i = 0; i < index; ++i) {
+        for (i = 0; i < index; ++i) {
             diffed[i] = prompt[i + 1] - prompt[i];
         }
@@ -188 +202 @@
 
         // "Differentiate"
-        double[] diffedd = new double[decay.length];
-        for (int i = 0; i < index; ++i) {
+        double[] diffedd = new double[decay.length]; //TODO double vs float issues
+        for (i = 0; i < index; ++i) {
             diffedd[i] = decay[i + 1] - decay[i];
         }
@@ -202 +216 @@
         }
 
-        // save estimates
-        returnValue[0] = startp;
-        returnValue[1] = endp;
-        returnValue[2] = baseline;
-        returnValue[3] = startt;
-        returnValue[4] = endt; //TODO ITS JUST ZERO HERE!!
+            // save estimates //TODO not in original
+            returnValue[0] = startp;
+            returnValue[1] = endp;
+            returnValue[2] = baseline;
+            returnValue[3] = startt;
+            returnValue[4] = endt; //TODO ITS JUST ZERO HERE!!
 
         // "Now we've got estimates we can do some Marquardt fitting to fine-tune
         // the estimates"
 
-        int gTransStartIndex = startt - ATTEMPTS;
-        if (gTransStartIndex < 0) {
-            gTransStartIndex = 0;
-        }
-        int gTransEndIndex = 9 * decay.length / 10; // "90% of transient"
-        if (gTransEndIndex <= gTransStartIndex + 2 * ATTEMPTS) { // "oops"
-            return returnValue;
-        }
-
-        double[] param = new double[3];
-        boolean[] free = new boolean[] { true, true, true };
-        double[] yFitted = new double[decay.length];
-        double[] chiSqTable = new double[2 * ATTEMPTS + 1];
-        for (int i = 0; i < 2 * ATTEMPTS + 1; ++i, ++gTransStartIndex) {
-            int fit_start = 0; // gTransFitStartIndex - gTransStartIndex;
-            int fit_end = gTransEndIndex - gTransStartIndex;
-
-            //int gTransFitStartIndex = gTransStartIndex;
+        transStartIndex = startt - ATTEMPTS;
+        if (transStartIndex < 0) {
+            transStartIndex = 0;
+        }
+        transEndIndex = 9 * decay.length / 10; // "90% of transient"
+        if (transEndIndex <= transStartIndex + 2 * ATTEMPTS) { // "oops"
+            System.out.println("oops return");
+            return returnValue; //TODO "do_estimate_resets; do_estimate_frees; "
+        }
+
+        for (i = 0; i < 2 * ATTEMPTS + 1; ++i, ++transStartIndex) {
+
+            transFitStartIndex = transStartIndex;
+
+            int fitStart = transFitStartIndex - transStartIndex;
+            int fitStop = transEndIndex - transStartIndex;
+            int nData = transEndIndex - transStartIndex;
+            System.out.println("fitStart " + fitStart + " fitStop " + fitStop + " nData " + nData);
 
             CurveFitData curveFitData = new CurveFitData();
-            curveFitData.setParams(param);
-            curveFitData.setFree(free);
+            curveFitData.setParams(param); //TODO param has random values!!
             curveFitData.setYCount(decay);
             curveFitData.setSig(null);
@@ -240 +253 @@
 
             SLIMCurveFitter curveFitter = new SLIMCurveFitter(SLIMCurveFitter.AlgorithmType.RLD_LMA);
-            int ret = 0; //curveFitter.fitData(data, fitStart, fitStop);
+            curveFitter.setXInc(xInc);
+            curveFitter.setFree(free);
+
+            int ret = curveFitter.fitData(data, fitStart, fitStop);
 
             if (ret >= 0) {
-                //System.out.println("for start " + fitStart + " stop " + fitStop + " chiSq is " + data[0].getChiSquare());
+                System.out.println("for start " + fitStart + " stop " + fitStop + " chiSq is " + data[0].getChiSquare());
                 chiSqTable[i] = data[0].getChiSquare();
             }
             else {
+                System.out.println("ret from fitData is " + ret);
                 chiSqTable[i] = 1e10f; // "silly value"
             }
@@ -253 +270 @@
         // "Find the minimum chisq in this range"
         index = findMin(chiSqTable, 2 * ATTEMPTS + 1);
-        if (chiSqTable[index] > 9e9f) {
+        if (chiSqTable[index] > 9e9f) {  // "no luck here..."
+            System.out.println("no luck here return");
+            for (double chiSq : chiSqTable) {
+                System.out.println("chiSq is " + chiSq);
+            }
+            System.out.println("index is " + index);
             return null; //TODO do estimate resets/frees???
         }
+
+        // "Then we're rolling!"
+        transStartIndex = startt - ATTEMPTS;
+        if (transStartIndex < 0) {
+            transStartIndex = 0;
+        }
+        transStartIndex += index;
+        transFitStartIndex = transStartIndex + (transEndIndex - transStartIndex) / 20;
 
         returnValue[0] = startp;
         returnValue[1] = endp;
         returnValue[2] = baseline;
-        returnValue[3] = startt;
-        returnValue[4] = endt; //TODO it's still zero!!
+        returnValue[3] = transStartIndex;
+        returnValue[4] = transFitStartIndex;
+        returnValue[5] = transEndIndex;
         return returnValue;
     }

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

@@ -214 +214 @@
         decayRenderer.setSeriesPaint(0, Color.green);
         decayRenderer.setSeriesPaint(1, Color.red);
-        decayRenderer.setSeriesPaint(2, Color.blue);
+        decayRenderer.setSeriesPaint(2, Color.darkGray);
 
         m_decaySubPlot = new XYPlot(m_decayDataset, null, photonAxis, decayRenderer);

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

@@ -36 +36 @@
 
 /**
- * TODO
- *
- * <dl><dt><b>Source code:</b></dt>
- * <dd><a href="http://dev.loci.wisc.edu/trac/software/browser/trunk/projects/slim-plugin/src/main/java/loci/slim/Excitation.java">Trac</a>,
- * <a href="http://dev.loci.wisc.edu/svn/software/trunk/projects/slim-plugin/src/main/java/loci/slim/Excitation.java">SVN</a></dd></dl>
+ * This class is a container for values for the instrument response function,
+ * aka excitation, aka prompt, aka lamp function.
  *
  * @author Aivar Grislis
@@ -51 +48 @@
     private float m_base;
 
+    /**
+     * Creates an excitation with given filename and values.
+     *
+     * @param fileName
+     * @param values
+     */
     public Excitation(String fileName, float[] values) {
         m_fileName = fileName;
         m_values = values;
-        float[] cursors = CursorHelper.estimateExcitationCursors(values);
-        System.out.println("start " + cursors[0] + " stop " + cursors[1] + " base " + cursors[2]);
-        m_start = (int) cursors[0];
-        m_stop  = (int) cursors[1];
-        m_base  = cursors[2];
     }
 
+    /**
+     * Gets the file name.
+     *
+     * @return
+     */
     public String getFileName() {
         return m_fileName;
     }
 
+    /**
+     * Gets the values of the excitation curve.
+     *
+     * @return
+     */
     public float[] getValues() {
         return m_values;
     }
 
+    /**
+     * Sets start cursor.
+     *
+     * @param start
+     */
+    public void setStart(int start) {
+        m_start = start;
+    }
+
+    /**
+     * Gets start cursor.
+     *
+     * @return
+     */
     public int getStart() {
         return m_start;
     }
 
+    /**
+     * Sets the stop cursor.
+     * 
+     * @param stop
+     */
+    public void setStop(int stop) {
+        m_stop = stop;
+    }
+
+    /**
+     * Gets the stop cursor.
+     *
+     * @return
+     */
     public int getStop() {
         return m_stop;
     }
 
+    /**
+     * Sets the base cursor.
+     *
+     * @param base
+     */
+    public void setBase(float base) {
+        m_base = base;
+    }
+
+    /**
+     * Gets the base cursor.
+     *
+     * @return
+     */
     public float getBase() {
         return m_base;

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

@@ -118 +118 @@
         try {
             icsReader.setId(fileName);
-            System.out.println(" is single file " + icsReader.isSingleFile(fileName));
+            //System.out.println(" is single file " + icsReader.isSingleFile(fileName));
             String domains[] = icsReader.getDomains();
             int lengths[] = icsReader.getChannelDimLengths();
-            System.out.print("lengths");
-            for (int i : lengths) {
-                System.out.print(" " + i);
-            }
-            System.out.println();
+            //System.out.print("lengths");
+            //for (int i : lengths) {
+            //    System.out.print(" " + i);
+            //}
+            //System.out.println();
             String types[] = icsReader.getChannelDimTypes();
             int sizeX = icsReader.getSizeX();
@@ -137 +137 @@
             int effSizeC = icsReader.getEffectiveSizeC();
             boolean littleEndian = icsReader.isLittleEndian();
-            System.out.println("size X Y Z T C " + sizeX + " " + sizeY + " " + sizeZ + " " + sizeT + " " + sizeC + " ");
-            System.out.println("bpp " + bpp + " dim order " + dimOrder + " pixelTYpe + " + pixelType + " effsizec " + effSizeC + " littleendian " + littleEndian);
+            //System.out.println("size X Y Z T C " + sizeX + " " + sizeY + " " + sizeZ + " " + sizeT + " " + sizeC + " ");
+            //System.out.println("bpp " + bpp + " dim order " + dimOrder + " pixelTYpe + " + pixelType + " effsizec " + effSizeC + " littleendian " + littleEndian);
 
             System.out.println(icsReader.getFormat());
@@ -146 +146 @@
             for (int bin = 0; bin < bins; ++bin) {
                 bytes = icsReader.openBytes(bin);
-                for (byte b : bytes) {
-                    System.out.print(" " + b);
-                }
-                System.out.println();
+                //for (byte b : bytes) {
+                //    System.out.print(" " + b);
+                //}
+                //System.out.println();
                 results[bin] = convertBytesToFloat(bytes);
             }

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

@@ -67 +67 @@
 import loci.slim.binning.SLIMBinning;
 import loci.slim.colorizer.DataColorizer;
+import loci.slim.ui.ExcitationPanel;
 import loci.slim.ui.IStartStopListener;
 import loci.slim.ui.IUserInterfacePanel;
@@ -131 +132 @@
     private volatile boolean m_fitted;
 
-    //TODO total kludge; just to get started
-    private boolean m_fakeData = false;
-
     private static final String FILE_KEY = "file";
     private String m_file;
@@ -173 +171 @@
     private SLIMBinning m_binning;
 
+    private ExcitationPanel m_excitationPanel = null;
     private IGrayScaleImage m_grayScaleImage;
     // user sets these from the grayScalePanel
@@ -222 +221 @@
         boolean success = false;
         if (showFileDialog(getFileFromPreferences())) {
-            if (m_fakeData) {
-                fakeData();
+            m_image = loadImage(m_file);
+            if (getImageInfo(m_image)) {
+                saveFileInPreferences(m_file);
                 success = true;
-            }
-            else {
-                m_image = loadImage(m_file);
-                if (getImageInfo(m_image)) {
-                    saveFileInPreferences(m_file);
-                    success = true;
-                }
             }
         }
@@ -265 +258 @@
         uiPanel.setListener(
             new IUserInterfacePanelListener() {
+                /**
+                 * Triggers a fit.
+                 */
                 public void doFit() {
                     m_cancel = false;
@@ -270 +266 @@
                 }
 
+                /**
+                 * Cancels ongoing fit.
+                 */
                 public void cancelFit() {
                     m_cancel = true;
                 }
-
+                /**
+                 * Quits running plugin.
+                 */
                 public void quit() {
                     m_quit = true;
                 }
 
+                /**
+                 * Loads an excitation curve from file.
+                 *
+                 * @param fileName
+                 * @return whether successful
+                 */
+                public boolean loadExcitation(String fileName) {
+                    Excitation excitation = ExcitationFileHandler.getInstance().loadExcitation(fileName);
+                    return updateExcitation(uiPanel, excitation);
+                }
+
+                /**
+                 * Creates an excitation curve from currrent X, Y and saves to file.
+                 *
+                 * @param fileName
+                 * @return whether successful
+                 */
+                public boolean createExcitation(String fileName) {
+                    int channel = m_grayScaleImage.getChannel();
+                    int x = uiPanel.getX();
+                    int y = uiPanel.getY();
+                    float[] values = new float[m_timeBins];
+                    for (int b = 0; b < m_timeBins; ++b) {
+                        values[b] = (float) getData(m_cursor, channel, x, y, b);
+                    }
+                    Excitation excitation = ExcitationFileHandler.getInstance().createExcitation(fileName, values);
+                    return updateExcitation(uiPanel, excitation);
+                }
+
+                /**
+                 * Cancels the current excitation curve, if any.
+                 *
+                 */
+                public void cancelExcitation() {
+                    if (null != m_excitationPanel) {
+                        m_excitationPanel.quit();
+                        m_excitationPanel = null;
+                        //TODO redo stop/start cursors on decay curve?
+                    }
+                }
             }
         );
@@ -332 +373 @@
     }
 
+    private boolean updateExcitation(IUserInterfacePanel uiPanel, Excitation excitation) {
+        boolean success = false;
+        if (null != excitation) {
+            if (null != m_excitationPanel) {
+                m_excitationPanel.quit();
+            }
+
+            // sum selected channel
+            double[] decay = new double[m_timeBins];
+            for (int i = 0; i < decay.length; ++i) {
+                decay[i] = 0.0;
+            }
+            for (int y = 0; y < m_height; ++y) {
+                for (int x = 0; x < m_width; ++x) {
+                    for (int b = 0; b < m_timeBins; ++b) {
+                        decay[b] += getData(m_cursor, m_channel, x, y, b);
+                    }
+                }
+            }
+
+            float[] results = CursorHelper.estimateCursors(m_timeRange, excitation.getValues(), decay);
+            excitation.setStart((int) results[0]);
+            excitation.setStop((int) results[1]);
+            excitation.setBase(results[2]);
+
+            uiPanel.setStart(22);
+            uiPanel.setStop(33);
+
+            m_excitationPanel = new ExcitationPanel(excitation);
+
+            success = true;
+        }
+        return success;
+    }
+
     private void getFitSettings(IGrayScaleImage grayScalePanel, IUserInterfacePanel uiPanel) {
         m_channel        = grayScalePanel.getChannel();
@@ -363 +439 @@
         //TODO works with GenericDialogPlus, dialog.addFileField("File:", defaultFile, 24);
         dialog.addStringField("File", defaultFile);
-        dialog.addCheckbox("Fake data", m_fakeData);
         dialog.showDialog();
         if (dialog.wasCanceled()) {
             return false;
         }
-
         m_file = dialog.getNextString();
-        m_fakeData = dialog.getNextBoolean();
-
         return true;
     }
@@ -474 +546 @@
     }
 
-    private boolean fakeData() {
-        return true;
-    }
     /**
      * This routine creates an artificial set of data that is useful to test fitting.

trunk/projects/slim-plugin/src/main/java/loci/slim/ui/ExcitationGraph.java

@@ -125 +125 @@
 
         // create the chart
-        JFreeChart chart = createChart(start, stop, bins, timeInc, values);
+        JFreeChart chart = createChart(bins, timeInc, values);
         ChartPanel chartPanel = new ChartPanel(chart, true, true, true, false, true);
         chartPanel.setDomainZoomable(false);
@@ -190 +190 @@
      * Creates the chart
      *
-     * @param start time bin
-     * @param stop time bin
      * @param bins number of bins
      * @param timeInc time increment per bin
@@ -197 +195 @@
      * @return the chart
      */
-    JFreeChart createChart(int start, int stop, int bins, double timeInc, float[] values) {
+    JFreeChart createChart(int bins, double timeInc, float[] values) {
 
         // create chart data
-        createDataset(start, stop, bins, timeInc, values);
+        createDataset(bins, timeInc, values);
 
         // make a horizontal axis
@@ -235 +233 @@
      * Creates the data set for the chart
      *
-     * @param start time bin
-     * @param stop time bin
      * @param bins number of time bins
      * @param timeInc time increment per time bin
      * @param data from the fit
      */
-    private void createDataset(int start, int stop, int bins, double timeInc, float[] values) {
+    private void createDataset(int bins, double timeInc, float[] values) {
         XYSeries series = new XYSeries("Data");
         double yData, yFitted;

trunk/projects/slim-plugin/src/main/java/loci/slim/ui/IUserInterfacePanelListener.java

@@ -36 +36 @@
 
 /**
- * TODO
- *
- * <dl><dt><b>Source code:</b></dt>
- * <dd><a href="http://dev.loci.wisc.edu/trac/software/browser/trunk/projects/slim-plugin/src/main/java/loci/slim/ui/IUserInterfacePanelListener.java">Trac</a>,
- * <a href="http://dev.loci.wisc.edu/svn/software/trunk/projects/slim-plugin/src/main/java/loci/slim/ui/IUserInterfacePanelListener.java">SVN</a></dd></dl>
+ * Listens for user input that triggers changes external to the ui panel.
  *
  * @author Aivar Grislis grislis at wisc.edu
@@ -60 +56 @@
      */
     public void quit();
+
+    /**
+     * Loads an excitation curve from file.
+     *
+     * @param fileName
+     * @return whether successful
+     */
+    public boolean loadExcitation(String fileName);
+
+    /**
+     * Creates an excitation curve from currrent X, Y and saves to file.
+     *
+     * @param fileName
+     * @return whether successful
+     */
+    public boolean createExcitation(String fileName);
+
+    /**
+     * Cancels the current excitation curve, if any.
+     *
+     */
+    public void cancelExcitation();
 }

trunk/projects/slim-plugin/src/main/java/loci/slim/ui/UserInterfacePanel.java

@@ -64 +64 @@
 import ij.gui.GenericDialog;
 
-import loci.slim.Excitation;
-import loci.slim.ExcitationFileHandler;
 import loci.slim.ui.IUserInterfacePanel.FitAlgorithm;
 import loci.slim.ui.IUserInterfacePanel.FitFunction;
 import loci.slim.ui.IUserInterfacePanel.FitRegion;
-import loci.slim.analysis.SLIMAnalysis;
-import loci.slim.binning.SLIMBinning;
 
 /**
- * TODO
- *
- * <dl><dt><b>Source code:</b></dt>
- * <dd><a href="http://dev.loci.wisc.edu/trac/software/browser/trunk/projects/slim-plugin/src/main/java/loci/slim/ui/UserInterfacePanel.java">Trac</a>,
- * <a href="http://dev.loci.wisc.edu/svn/software/trunk/projects/slim-plugin/src/main/java/loci/slim/ui/UserInterfacePanel.java">SVN</a></dd></dl>
+ * Main user interface panel for the fit.
  *
  * @author Aivar Grislis grislis at wisc.edu
@@ -127 +119 @@
     
     public IUserInterfacePanelListener m_listener;
-
-    private ExcitationPanel m_excitationPanel;
 
     int m_fittedParameterCount = 0;
@@ -381 +371 @@
     }
 
-    float[] m_values = null;
-
     /*
      * Creates a panel that has some settings that control the fit.
@@ -434 +422 @@
             new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
-                    Excitation excitation = null;
-
                     String selectedItem = (String) m_excitationComboBox.getSelectedItem();
-                    System.out.println("selected " + selectedItem);
+                    boolean isExcitationLoaded = false;
                     if (EXCITATION_NONE.equals(selectedItem)) {
-                        if (null != m_excitationPanel) {
-                            m_excitationPanel.quit();
-                            m_excitationPanel = null;
+                        if (null != m_listener) {
+                            m_listener.cancelExcitation();
                         }
                     }
                     else if (EXCITATION_FILE.equals(selectedItem)) {
                         String fileName = getFileName("Load Excitation File", "");
-                        if (null != fileName) {
-                            excitation = ExcitationFileHandler.getInstance().loadExcitation(fileName);
-                        }
-                        if (null != excitation) {
-                            m_values = excitation.getValues();
+                        if (null != fileName && null != m_listener) {
+                            isExcitationLoaded = m_listener.loadExcitation(fileName);
                         }
                     }
                     else if (EXCITATION_CREATE.equals(selectedItem)) {
                         String fileName = getFileName("Save Excitation File", "");
-                        if (null != fileName) {
-                            if (null != m_values) {
-                                excitation = ExcitationFileHandler.getInstance().createExcitation(fileName, m_values);
-                            }
+                        if (null != fileName && null != m_listener) {
+                            isExcitationLoaded = m_listener.createExcitation(fileName);
                         }
                     }
 
-                    if (null == excitation) {
-                        m_excitationComboBox.setSelectedItem(EXCITATION_NONE);
+                    if (isExcitationLoaded) {
+                        m_excitationComboBox.setSelectedItem(EXCITATION_FILE);
                     }
                     else {
-                        m_excitationComboBox.setSelectedItem(EXCITATION_FILE);
-                        m_excitationPanel = new ExcitationPanel(excitation);
+                        m_excitationComboBox.setSelectedItem(EXCITATION_NONE);
                     }
                 }