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

Timestamp:

11/11/11 15:21:12 (8 years ago)

Author:

aivar

Message:

Don't pop up multiple DecayGraphs

Location:

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

Files:

• SLIMProcessor.java (modified) (7 diffs)
• refactor/ui/charts/DecayGraph.java (modified) (27 diffs)
• refactor/ui/charts/IDecayGraph.java (added)
• ui/IUserInterfacePanel.java (modified) (2 diffs)
• ui/IUserInterfacePanelListener.java (modified) (1 diff)
• ui/UserInterfacePanel.java (modified) (2 diffs)
• ui/histogram (added)
• ui/histogram/HistogramData.java (added)

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

@@ -249 +249 @@
         uiPanel.setX(0);
         uiPanel.setY(0);
-        uiPanel.setStart(m_timeBins / 2); //TODO hokey
-        uiPanel.setStop(m_timeBins - 1);
+        uiPanel.setStart(m_timeBins / 2, false); //TODO hokey
+        uiPanel.setStop(m_timeBins - 1, false);
         uiPanel.setThreshold(100);
         uiPanel.setFunctionParameters(0, DEFAULT_SINGLE_EXP_PARAMS);
@@ -272 +272 @@
                     m_cancel = true;
                 }
+                
+                /**
+                 * Triggers refit of current pixel.
+                 */
+                public void doPixelFit() {
+                    // ordinarily these fits take place in the thread at the end 
+                    // of this method.
+                    // this is a hack until I refactor out a FittingEngine.
+                    fitPixel(uiPanel);
+                }
+                
                 /**
                  * Quits running plugin.
@@ -342 +353 @@
                             getFitSettings(m_grayScaleImage, uiPanel);
                             // fit on the pixel clicked
-                            fitPixel(uiPanel, x, y);
+                            fitPixel(uiPanel);
                         }
                     }
@@ -405 +416 @@
 
         int[] results = CursorHelper.estimateDecayCursors(m_timeRange, decay);
-        uiPanel.setStart(results[0]);
-        uiPanel.setStop(results[1]);
+        uiPanel.setStart(results[0], false);
+        uiPanel.setStop(results[1], false);
     }
 
@@ -438 +449 @@
             excitation.setBase(results[2]);
 
-            uiPanel.setStart((int) results[3]);
-            uiPanel.setStop((int) results[4]);
+            uiPanel.setStart((int) results[3], false);
+            uiPanel.setStop((int) results[4], false);
 
             m_excitationPanel = new ExcitationPanel(excitation);
@@ -837 +848 @@
         setFittedParamsFromData(resultsCursor, dataArray);
         return fittedPixels;
+    }
+
+    // added kludge to make moving cursors in DecayGraph do a refit.
+    private Image<DoubleType> fitPixel(IUserInterfacePanel uiPanel) {
+        int x = uiPanel.getX();
+        int y = uiPanel.getY();
+        m_startBin = uiPanel.getStart();
+        m_stopBin = uiPanel.getStop();
+        return fitPixel(uiPanel, x, y);
     }
 
@@ -1552 +1572 @@
      * @param data fitted data
      */
-    private void showDecayGraph(String title, final IUserInterfacePanel uiPanel, double irf[], ICurveFitData data) {
-        DecayGraph decayGraph = new DecayGraph(title, m_startBin, m_stopBin, m_timeBins, m_timeRange, irf, data);
+    private void showDecayGraph(final String title, final IUserInterfacePanel uiPanel, final double irf[], final ICurveFitData data) {
+        loci.slim.refactor.ui.charts.IDecayGraph decayGraph = loci.slim.refactor.ui.charts.DecayGraph.getInstance();
+        JFrame frame = decayGraph.init(uiPanel.getFrame(), m_timeBins, m_timeRange);
+        decayGraph.setTitle(title);
+        int start = uiPanel.getStart();
+        int stop = uiPanel.getStop();
+        decayGraph.setStartStop(start, stop);
+        decayGraph.setData(irf, data);
         decayGraph.setStartStopListener(
             new IStartStopListener() {
                 public void setStartStop(int start, int stop) {
-                    uiPanel.setStart(start);
-                    uiPanel.setStop(stop);
+                    uiPanel.setStart(start, false);
+                    uiPanel.setStop(stop, true); // do a refit
                 }
             }
         );
-        JFrame frame = decayGraph.getFrame();
-        frame.setLocationRelativeTo(uiPanel.getFrame());
-        frame.setVisible(true);
-        //TODO focus listener could show fit parameters in UI as you click on decay graph
-        /*frame.addFocusListener(
-            new FocusListener() {
-                public void focusGained(FocusEvent e) {
-                    //System.out.println("focus gained " + e);
-                }
-                public void focusLost(FocusEvent e) {
-                }
-        });*/
     }
 }

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

@@ -69 +69 @@
  * @author Aivar Grislis
  */
-public class DecayGraph implements /*IDecayGraph,*/ IStartStopProportionListener {
+public class DecayGraph implements IDecayGraph, IStartStopProportionListener {
     static final Dimension SIZE = new Dimension(500, 270);
+    static final Dimension FRAME_SIZE = new Dimension(450, 450);
     static final String PHOTON_AXIS_LABEL = "Photons";
     static final String TIME_AXIS_LABEL = "Time";
@@ -89 +90 @@
     IStartStopListener _startStopListener;
 
-
     private StartStopDraggingUI<JComponent> _startStopDraggingUI;
     private double _timeInc;
@@ -95 +95 @@
     private Integer _start;
     private Integer _stop;
-
-
     private boolean _logarithmic = true;
 
-
-
-
-
-    //boolean _headless = false;
     XYPlot _decaySubPlot;
     XYSeriesCollection _decayDataset;
     XYSeriesCollection _residualDataset;
-    //static ChartPanel _panel;
 
     JFreeChart m_decayChart;
@@ -116 +108 @@
      */
     public DecayGraph() {
+        _frame = null;
     }
 
@@ -123 +116 @@
      * @return singleton instance
      */
-    public synchronized DecayGraph getInstance() {
+    public static synchronized DecayGraph getInstance() {
         if (null == _instance) {
             _instance = new DecayGraph();
@@ -129 +122 @@
         return _instance;
     }
+    
+    /**
+     * Sets up a listener to listen for start/stop changes.
+     * 
+     * @param startStopListener
+     */
+    public void setStartStopListener(IStartStopListener startStopListener) {
+        _startStopListener = startStopListener;
+    }
 
     /**
      * Initialize the graph and returns the containing JFrame.
      *
-     * @param title
      * @param bins
      * @param timeInc
      * @return frame
      */
-    public JFrame init(final String title, final int bins, final double timeInc) {
-        _bins = bins;
-        _timeInc = timeInc;
-
-        // create the combined chart
-        JFreeChart chart = createCombinedChart(bins, timeInc);
-        ChartPanel panel = new ChartPanel(chart, true, true, true, false, true);
-        panel.setDomainZoomable(false);
-        panel.setRangeZoomable(false);
-        panel.setPreferredSize(SIZE);
-
-        // add start/stop vertical bar handling
-        _start = _stop = null;
-        JXLayer<JComponent> layer = new JXLayer<JComponent>(panel);
-        _startStopDraggingUI =
-                new StartStopDraggingUI<JComponent>(panel, _decaySubPlot, this);
-        layer.setUI(_startStopDraggingUI);
-
-        // create a frame for the chart
-        _frame = new JFrame(title);
-        _frame.getContentPane().add(layer);
-        _frame.setSize(450, 450);
-        _frame.pack();
-
+    public JFrame init(final JFrame frame, final int bins, final double timeInc) {
+        boolean create = false;
+        if (null == _frame
+                || !_frame.isVisible()
+                || _bins != bins
+                || _timeInc != timeInc)
+        {
+            // save incoming parameters
+            _bins = bins;
+            _timeInc = timeInc;
+            
+            if (null != _frame) {
+                // delete existing frame
+                _frame.setVisible(false);
+                _frame.dispose();
+            }
+            
+             // create the combined chart
+            JFreeChart chart = createCombinedChart(bins, timeInc);
+            ChartPanel panel = new ChartPanel
+                    (chart, true, true, true, false, true);
+            panel.setDomainZoomable(false);
+            panel.setRangeZoomable(false);
+            panel.setPreferredSize(SIZE);
+
+            // add start/stop vertical bar handling
+            _start = _stop = null;
+            JXLayer<JComponent> layer = new JXLayer<JComponent>(panel);
+            _startStopDraggingUI =
+                    new StartStopDraggingUI<JComponent>
+                            (panel, _decaySubPlot, this);
+            layer.setUI(_startStopDraggingUI);
+
+            // create a frame for the chart
+            _frame = new JFrame();
+            _frame.getContentPane().add(layer);
+            _frame.setSize(FRAME_SIZE);
+            _frame.pack();
+            _frame.setLocationRelativeTo(frame);
+            _frame.setVisible(true);            
+        }
         return _frame;
+    }
+    
+    public void setTitle(final String title) {
+        _frame.setTitle(title);
     }
 
@@ -172 +194 @@
      */
     public void setData(final double[] irf, ICurveFitData data) {
+        createDatasets(10, 200, _bins, _timeInc, irf, data);
 
     }
@@ -187 +210 @@
             double stopValue = stop * _timeInc;
             double maxValue = _bins * _timeInc;
-            _startStopDraggingUI.setStartStopValues(startValue, stopValue, maxValue); //TODO Get maxValue out of here
+            _startStopDraggingUI.setStartStopValues
+                    (startValue, stopValue, maxValue);
         }
 
@@ -203 +227 @@
      * @param stopProportion
      */
-    public void setStartStopProportion(double startProportion, double stopProportion) {
+    public void setStartStopProportion
+            (double startProportion, double stopProportion)
+    {
         // calculate new start and stop
         int start = (int) (startProportion * _bins + 0.5);
@@ -249 +275 @@
         decayRenderer.setSeriesShapesVisible(1, false);
         decayRenderer.setSeriesLinesVisible(2, false);
-        decayRenderer.setSeriesShape(2, new Ellipse2D.Float(2.0f, 2.0f, 2.0f, 2.0f));
+        decayRenderer.setSeriesShape
+                (2, new Ellipse2D.Float(2.0f, 2.0f, 2.0f, 2.0f));
 
         decayRenderer.setSeriesPaint(0, IRF_COLOR);
@@ -255 +282 @@
         decayRenderer.setSeriesPaint(2, DECAY_COLOR);
 
-        _decaySubPlot = new XYPlot(_decayDataset, null, photonAxis, decayRenderer);
+        _decaySubPlot = new XYPlot
+                (_decayDataset, null, photonAxis, decayRenderer);
         _decaySubPlot.setDomainCrosshairVisible(true);
         _decaySubPlot.setRangeCrosshairVisible(true);
@@ -267 +295 @@
         residualRenderer.setSeriesShapesVisible(0, false);
         residualRenderer.setSeriesPaint(0, RESIDUAL_COLOR);
-        XYPlot residualSubPlot = new XYPlot(_residualDataset, null, residualAxis, residualRenderer);
+        XYPlot residualSubPlot = new XYPlot
+                (_residualDataset, null, residualAxis, residualRenderer);
         residualSubPlot.setDomainCrosshairVisible(true);
         residualSubPlot.setRangeCrosshairVisible(true);
@@ -276 +305 @@
 
         // now make the top level JFreeChart
-        JFreeChart chart = new JFreeChart(null, JFreeChart.DEFAULT_TITLE_FONT, parent, true);
+        JFreeChart chart = new JFreeChart
+                (null, JFreeChart.DEFAULT_TITLE_FONT, parent, true);
         chart.removeLegend();
 
@@ -291 +321 @@
      * @param data from the fit
      */
-    private void createDatasets(int start, int stop, int bins, double timeInc, double[] irf, ICurveFitData data) {
-
+    private void createDatasets(int start, int stop, int bins, double timeInc,
+            double[] irf, ICurveFitData data)
+    {
         XYSeries series1 = new XYSeries("IRF");
         double xCurrent = 0;
@@ -319 +350 @@
             series3.add(xCurrent, (yData > 0.0 ? yData : null));
             // are we in fitted region?
-            if (start <= i && i <= stop) {
+            if (_start <= i && i <= _stop) {
                 // yes, show fitted curve and residuals
                 yFitted = data.getYFitted()[i];
@@ -339 +370 @@
         }
 
+        _decayDataset.removeAllSeries();
         _decayDataset.addSeries(series1);
         _decayDataset.addSeries(series2);
         _decayDataset.addSeries(series3);
 
+        _residualDataset.removeAllSeries();
         _residualDataset.addSeries(series4);
     }
@@ -352 +385 @@
      * @param <V> component
      */
-    static class StartStopDraggingUI<V extends JComponent> extends AbstractLayerUI<V> {
+    static class StartStopDraggingUI<V extends JComponent>
+            extends AbstractLayerUI<V>
+    {
         private static final int CLOSE_ENOUGH = 4; // pizels
         private ChartPanel _panel;
@@ -359 +394 @@
         boolean _draggingStartMarker = false;
         boolean _draggingStopMarker = false;
-        private double _startMarkerProportion = 0.25;
-        private double _stopMarkerProportion = 0.75;
+        private Double _startMarkerProportion;
+        private Double _stopMarkerProportion;
         private int _y0;
         private int _y1;
@@ -373 +408 @@
          * @param listener to be notified when user drags start/stop vertical bars
          */
-        StartStopDraggingUI(ChartPanel panel, XYPlot plot, IStartStopProportionListener listener) {
+        StartStopDraggingUI(ChartPanel panel, XYPlot plot,
+                IStartStopProportionListener listener)
+        {
             _panel    = panel;
             _plot     = plot;
             _listener = listener;
-        }
-
-        void setStartStopValues(double startValue, double stopValue, double maxValue) {
+            _startMarkerProportion = null;
+            _stopMarkerProportion = null;
+        }
+
+        void setStartStopValues
+                (double startValue, double stopValue, double maxValue)
+        {
             Rectangle2D area = getDataArea();
             double x = area.getX();
@@ -390 +431 @@
                 double minRepresentedValue = screenToValue((int) x);
                 double maxRepresentedValue = screenToValue((int) (x + width));
-                _startMarkerProportion = (float) (startValue - minRepresentedValue) / (maxRepresentedValue - minRepresentedValue);
-                _stopMarkerProportion = (float) (stopValue - minRepresentedValue) / (maxRepresentedValue - minRepresentedValue);
+                _startMarkerProportion =
+                        (float) (startValue - minRepresentedValue) /
+                            (maxRepresentedValue - minRepresentedValue);
+                _stopMarkerProportion =
+                        (float) (stopValue - minRepresentedValue) /
+                            (maxRepresentedValue - minRepresentedValue);
             }
         }
@@ -407 +452 @@
             // this paints layer as is
             super.paintLayer(g2D, layer);
-
-            // adjust to current size
-            Rectangle2D area = getDataArea();
-            double x = area.getX();
-            _y0 = (int) area.getY();
-            _y1 = (int) (area.getY() + area.getHeight());
-            double width = area.getWidth();
-            _xStart = (int) Math.round(x + width * _startMarkerProportion) + HORZ_TWEAK;
-            _xStop = (int) Math.round(x + width * _stopMarkerProportion) + HORZ_TWEAK;
-
-            // custom painting is here
-            g2D.setStroke(new BasicStroke(2f));
-            g2D.setXORMode(XORvalue(START_COLOR));
-            g2D.drawLine(_xStart, _y0, _xStart, _y1);
-            g2D.setXORMode(XORvalue(STOP_COLOR));
-            g2D.drawLine(_xStop, _y0, _xStop, _y1);
+            
+            if (null != _startMarkerProportion && null != _stopMarkerProportion) {
+                // adjust to current size
+                Rectangle2D area = getDataArea();
+                double x = area.getX();
+                _y0 = (int) area.getY();
+                _y1 = (int) (area.getY() + area.getHeight());
+                double width = area.getWidth();
+                _xStart = (int) Math.round(x + width * _startMarkerProportion)
+                        + HORZ_TWEAK;
+                _xStop = (int) Math.round(x + width * _stopMarkerProportion)
+                        + HORZ_TWEAK;
+
+                // custom painting is here
+                g2D.setStroke(new BasicStroke(2f));
+                g2D.setXORMode(XORvalue(START_COLOR));
+                g2D.drawLine(_xStart, _y0, _xStart, _y1);
+                g2D.setXORMode(XORvalue(STOP_COLOR));
+                g2D.drawLine(_xStop, _y0, _xStop, _y1);    
+            }
         }
 
@@ -431 +480 @@
          * @param layer
          */
-        protected void processMouseMotionEvent(MouseEvent event, JXLayer<? extends V> layer) {
+        protected void processMouseMotionEvent
+                (MouseEvent event, JXLayer<? extends V> layer)
+        {
             super.processMouseMotionEvent(event, layer);
             if (event.getID() == MouseEvent.MOUSE_DRAGGED) {
@@ -466 +517 @@
          */
         private double getDraggedProportion(MouseEvent e) {
-            Rectangle2D dataArea = _panel.getChartRenderingInfo().getPlotInfo().getDataArea();
+            Rectangle2D dataArea =
+                    _panel.getChartRenderingInfo().getPlotInfo().getDataArea();
             Rectangle2D area = getDataArea();
             double proportion = (e.getX() - area.getX()) / area.getWidth();
@@ -485 +537 @@
         protected void processMouseEvent(MouseEvent e, JXLayer<? extends V> l) {
             super.processMouseEvent(e, l);
-            if (e.getID() == MouseEvent.MOUSE_PRESSED) {
-                int x = e.getX();
-                int y = e.getY();
-                if (y > _y0 - CLOSE_ENOUGH && y < _y1 + CLOSE_ENOUGH) {
-                    if (Math.abs(x - _xStart) < CLOSE_ENOUGH) {
-                        // start dragging start line
-                        _draggingStartMarker = true;
-
-                    }
-                    else if (Math.abs(x - _xStop) < CLOSE_ENOUGH) {
-                        // start dragging stop line
-                        _draggingStopMarker = true;
+            if (null != _startMarkerProportion && null != _stopMarkerProportion) {
+                if (e.getID() == MouseEvent.MOUSE_PRESSED) {
+                    int x = e.getX();
+                    int y = e.getY();
+                    if (y > _y0 - CLOSE_ENOUGH && y < _y1 + CLOSE_ENOUGH) {
+                        if (Math.abs(x - _xStart) < CLOSE_ENOUGH) {
+                            // start dragging start line
+                            _draggingStartMarker = true;
+
+                        }
+                        else if (Math.abs(x - _xStop) < CLOSE_ENOUGH) {
+                            // start dragging stop line
+                            _draggingStopMarker = true;
+                        }
                     }
                 }
-            }
-            if (e.getID() == MouseEvent.MOUSE_RELEASED) {
-                _draggingStartMarker = _draggingStopMarker = false;
-                SwingUtilities.invokeLater(
-                        new Runnable() {
-                            public void run() {
-                                _listener.setStartStopProportion(_startMarkerProportion, _stopMarkerProportion);
-                            }
-                });
+                if (e.getID() == MouseEvent.MOUSE_RELEASED) {
+                    _draggingStartMarker = _draggingStopMarker = false;
+                    SwingUtilities.invokeLater(
+                            new Runnable() {
+                                public void run() {
+                                    if (null != _listener) {
+                                        _listener.setStartStopProportion
+                                                (_startMarkerProportion,
+                                                 _stopMarkerProportion);
+                                    }
+                                }
+                    });
+                }  
             }
         }
@@ -517 +575 @@
          */
         private Rectangle2D getDataArea() {
-            Rectangle2D dataArea = _panel.getChartRenderingInfo().getPlotInfo().getDataArea();
+            Rectangle2D dataArea =
+                    _panel.getChartRenderingInfo().getPlotInfo().getDataArea();
             return dataArea;
         }
@@ -529 +588 @@
 
         private double screenToValue(int x) {
-            return _plot.getDomainAxis().java2DToValue((double) x, getDataArea(), RectangleEdge.TOP);
+            return _plot.getDomainAxis().java2DToValue(
+                    (double) x, getDataArea(), RectangleEdge.TOP);
         }
     }
@@ -540 +600 @@
  */
 interface IStartStopProportionListener {
-    public void setStartStopProportion(double startProportion, double stopProportion);
+    public void setStartStopProportion
+            (double startProportion, double stopProportion);
 }

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

@@ -123 +123 @@
      *
      * @param bin
-     */
-    public void setStart(int bin);
+     * @param refit
+     */
+    public void setStart(int bin, boolean refit);
 
     /**
@@ -137 +138 @@
      *
      * @param bin
-     */
-    public void setStop(int bin);
+     * @param refit
+     */
+    public void setStop(int bin, boolean refit); 
+    
 
     /**

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

@@ -51 +51 @@
      */
     public void cancelFit();
+    
+    /**
+     * Triggers a refit of current pixel.
+     */
+    public void doPixelFit();
 
     /**

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

@@ -998 +998 @@
     }
 
-    public void setStart(int start) {
+    public void setStart(int start, boolean refit) {
         m_startField.setText("" + start);
+        if (refit && null != m_listener) {
+            m_listener.doPixelFit();
+        }
     }
 
@@ -1006 +1009 @@
     }
 
-    public void setStop(int stop) {
+    public void setStop(int stop, boolean refit) {
         m_stopField.setText("" + stop);
+        if (refit && null != m_listener) {
+            m_listener.doPixelFit();
+        }
     }