Changeset 7195

Timestamp:

11/12/10 21:04:17 (9 years ago)

Author:

aivar

Message:

Dynamically sets minimum, as well as maximum. TIdied up code & added comments.

File:

• branches/maven/projects/slim-plugin/src/main/java/loci/slim/ui/UserInterfacePanel.java (modified) (11 diffs)

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

@@ -63 +63 @@
 import loci.slim.SLIMProcessor.FitFunction;
 import loci.slim.SLIMProcessor.FitRegion;
+import loci.slim.analysis.SLIMAnalysis;
 
 /**
@@ -113 +114 @@
     public IUserInterfacePanelListener m_listener;
 
-    int m_fittedComponents = 0;
+    int m_fittedParameterCount = 0;
 
     // UI panel
@@ -123 +124 @@
     JComboBox m_algorithmComboBox;
     JComboBox m_functionComboBox;
+    JComboBox m_analysisComboBox;
+    JCheckBox m_fitAllChannels;
 
     // fit settings
@@ -192 +195 @@
     JButton m_fitButton;
 
-    public UserInterfacePanel(boolean showTau) {
+    public UserInterfacePanel(boolean showTau, SLIMAnalysis analysis) {
         String lifetimeLabel = "" + (showTau ? TAU : LAMBDA);
         
         m_frame = new JFrame("SLIM Plugin");
-        m_frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        //m_frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         // create outer panel
@@ -206 +209 @@
         innerPanel.setLayout(new BoxLayout(innerPanel, BoxLayout.X_AXIS));
 
-        JPanel fitPanel = createFitPanel();
+        JPanel fitPanel = createFitPanel(analysis);
         fitPanel.setBorder(border("Fit"));
         innerPanel.add(fitPanel);
@@ -297 +300 @@
     }
 
-    private JPanel createFitPanel() {
+    private JPanel createFitPanel(SLIMAnalysis analysis) {
         JPanel fitPanel = new JPanel();
         fitPanel.setBorder(new EmptyBorder(0, 0, 8, 8));
@@ -331 +334 @@
         fitPanel.add(m_functionComboBox);
 
+        JLabel analysisLabel = new JLabel("Analysis");
+        analysisLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+        fitPanel.add(analysisLabel);
+        m_analysisComboBox = new JComboBox(analysis.getNames());
+        fitPanel.add(m_analysisComboBox);
+
         // rows, cols, initX, initY, xPad, yPad
-        SpringUtilities.makeCompactGrid(fitPanel, 3, 2, 4, 4, 4, 4);
+        SpringUtilities.makeCompactGrid(fitPanel, 4, 2, 4, 4, 4, 4);
 
         JPanel panel = new JPanel(new BorderLayout());
         panel.add("North", fitPanel);
 
+        m_fitAllChannels = new JCheckBox("Fit all channels");
+        m_fitAllChannels.setSelected(true);
+
+        panel.add("South", m_fitAllChannels);
         return panel;
     }
@@ -758 +771 @@
      */
     private void enableAll(boolean enable) {
+        // fit algorithm settings
         m_regionComboBox.setEnabled(enable);
         m_algorithmComboBox.setEnabled(enable);
         m_functionComboBox.setEnabled(enable);
-
-        // fit settings
+        m_analysisComboBox.setEnabled(enable);
+        m_fitAllChannels.setEnabled(enable);
+
+        // fit control settings
         m_xField.setEditable(enable);
         m_yField.setEditable(enable);
@@ -877 +893 @@
     }
 
+    public String getAnalysis() {
+        String selected = (String) m_analysisComboBox.getSelectedItem();
+        return selected;
+    }
+
+    public boolean getFitAllChannels() {
+        return m_fitAllChannels.isSelected();
+    }
+
     public int getX() {
         return parseInt(m_xField);
@@ -917 +942 @@
     }
 
-    public int getComponents() {
-        int components = 0;
+    public int getParameterCount() {
+        int count = 0;
         String function = (String) m_functionComboBox.getSelectedItem();
         if (function.equals(SINGLE_EXPONENTIAL)) {
-            components = 3;
+            count = 3;
         }
         else if (function.equals(DOUBLE_EXPONENTIAL)) {
-            components = 5;
+            count = 5;
         }
         else if (function.equals(TRIPLE_EXPONENTIAL)) {
-            components = 7;
+            count = 7;
         }
         else if (function.equals(STRETCHED_EXPONENTIAL)) {
-            components = 4;
-        }
-        return components;
-    }
-
-    public void setFittedComponents(int components) {
-        m_fittedComponents = components;
+            count = 4;
+        }
+        return count;
+    }
+
+    public void setFittedParameterCount(int count) {
+        m_fittedParameterCount = count;
     }
 
@@ -1122 +1147 @@
     }
 
-    void reconcileStartParam() {
-        boolean enable = (m_fittedComponents == getComponents());
+    /**
+     * This decides whether the existing parameters could be used as the
+     * initial values for another fit.
+     */
+    private void reconcileStartParam() {
+        // parameter counts happen to be unique for each fit function
+        boolean enable = (m_fittedParameterCount == getParameterCount());
         m_startParam1.setEnabled(enable);
         m_startParam2.setEnabled(enable);