Changeset 7886 for trunk

Timestamp:

02/03/12 20:22:06 (8 years ago)

Author:

aivar

Message:

SLIMPlugin: Tidied up a bit. Fixed minor bugs in decay graph, histogram, and user interface panel.

Location:

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

Files:

• imagej/slim/Test.java (deleted)
• imagej/slim/TestFittingEngineConcepts.java (deleted)
• imagej/slim/histogram/HistogramPanel.java (modified) (1 diff)
• imagej/slim/histogram/HistogramTool.java (modified) (2 diffs)
• loci/slim/refactor/ui/charts/DecayGraph.java (modified) (1 diff)
• loci/slim/ui/UserInterfacePanel.java (modified) (6 diffs)

trunk/projects/slim-plugin/src/main/java/imagej/slim/histogram/HistogramPanel.java

@@ -216 +216 @@
      */
     public void setCursors(Integer minCursor, Integer maxCursor) {
+        System.out.println("setCursors(" + minCursor + "," + maxCursor);
         synchronized (_synchObject) {
             if (null == minCursor) {

trunk/projects/slim-plugin/src/main/java/imagej/slim/histogram/HistogramTool.java

@@ -155 +155 @@
         
         _histogramPanel.setBins(histogramData.binValues(WIDTH));
-        //_histogramPanel.setCursors(0.0, 0.0); set cursors if not autoranging
-
+        System.out.println("minMaxLUT is " + minMaxLUT[0] + " " + minMaxLUT[1]);
+        System.out.println("so cursosr are " + cursorPixelFromValue(false, minMaxLUT[0]) + " " + cursorPixelFromValue(false, minMaxLUT[1]));
+        _histogramPanel.setCursors(cursorPixelFromValue(false, minMaxLUT[0]), cursorPixelFromValue(false, minMaxLUT[1])); //TODO ARG true, maxLUT)); in this case adding 1 to max is too much!
+ 
         _uiPanel.setAutoRange(histogramData.getAutoRange());
         _uiPanel.setCombineChannels(histogramData.getCombineChannels());
@@ -463 +465 @@
                     // note that if you stretch the bounds on one side you need
                     // to adjust the position of the other side.
-                    _histogramPanel.setCursors(cursorPixelFromValue(false, minLUT), cursorPixelFromValue(true, maxLUT));
+                    _histogramPanel.setCursors(cursorPixelFromValue(false, minLUT), cursorPixelFromValue(false, maxLUT)); //TODO ARG true, maxLUT)); in this case adding 1 to max is too much!
                 }
             }

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

@@ -276 +276 @@
         decayRenderer.setSeriesLinesVisible(2, false);
         decayRenderer.setSeriesShape
-                (2, new Ellipse2D.Float(2.0f, 2.0f, 2.0f, 2.0f));
+                (2, new Ellipse2D.Float(-1.0f, -1.0f, 2.0f, 2.0f));
 
         decayRenderer.setSeriesPaint(0, IRF_COLOR);

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

@@ -86 +86 @@
     private static final Character SUB_3  = '\u2083';
     
-    private static final String SUM_REGION = "Sum All";
+    private static final String SUM_REGION = "Sum All Pixels";
     private static final String ROIS_REGION = "Sum Each ROI";
     private static final String PIXEL_REGION = "Single Pixel";
-    private static final String ALL_REGION = "Each Pixel";
+    private static final String ALL_REGION = "Image";
     
     private static final String JAOLHO_LMA_ALGORITHM = "Jaolho LMA";
@@ -111 +111 @@
     private static final String EXCITATION_FILE = "Load from File";
     private static final String EXCITATION_CREATE = "Use current X Y";
-    
-    private static final String MAKE_IMAGES = "Make Images";
+
+    private static final String FIT_IMAGE = "Fit Image";
+    private static final String FIT_PIXEL = "Fit Pixel";
+    private static final String FIT_SUMMED_PIXELS = "Fit Summed Pixels";
+    private static final String FIT_SUMMED_ROIS = "Fit Summed ROIs";
     private static final String CANCEL_IMAGES = "Cancel Images";
 
@@ -230 +233 @@
     JButton m_quitButton;
     JButton m_fitButton;
+    String m_fitButtonText = FIT_IMAGE;
 
     public UserInterfacePanel(boolean showTau, String[] analysisChoices, String[] binningChoices) {
@@ -280 +284 @@
         buttonPanel.add(m_quitButton);
         buttonPanel.add(Box.createRigidArea(new Dimension(10, 0)));
-        m_fitButton = new JButton(MAKE_IMAGES);
+        m_fitButton = new JButton(m_fitButtonText);
         m_fitButton.addActionListener(
             new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     String text = (String)e.getActionCommand();
-                    if (text.equals(MAKE_IMAGES)) {
+                    if (text.equals(m_fitButtonText)) {
                         enableAll(false);
                         setFitButtonState(false);
@@ -347 +351 @@
         m_regionComboBox = new JComboBox(REGION_ITEMS);
         m_regionComboBox.setSelectedItem(ALL_REGION);
+        m_regionComboBox.addItemListener(
+            new ItemListener() {
+                public void itemStateChanged(ItemEvent e) {
+                    if (e.getStateChange() == ItemEvent.SELECTED) {
+                        String item = (String) e.getItem();
+                        if (SUM_REGION == item) {
+                            m_fitButtonText = FIT_SUMMED_PIXELS;
+                        }
+                        else if (ROIS_REGION == item) {
+                            m_fitButtonText = FIT_SUMMED_ROIS;
+                        }
+                        else if (PIXEL_REGION == item) {
+                            m_fitButtonText = FIT_PIXEL;
+                        }
+                        else if (ALL_REGION == item) {
+                            m_fitButtonText = FIT_IMAGE;
+                        }
+                        m_fitButton.setText(m_fitButtonText);
+                    }
+                }
+            }
+        );
         fitPanel.add(m_regionComboBox);
 
@@ -913 +939 @@
     
     private void setFitButtonState(boolean on) {
-        m_fitButton.setText(on ? MAKE_IMAGES : CANCEL_IMAGES);
+        m_fitButton.setText(on ? m_fitButtonText : CANCEL_IMAGES);
     }
     
     private boolean getFitButtonState() {
-        return m_fitButton.getText().equals(MAKE_IMAGES);
+        return m_fitButton.getText().equals(m_fitButtonText);
     }