Changeset 5677

Timestamp:

10/10/08 12:34:45 (6 weeks ago)

Author:

donald

Message:

Updated Graph and Intensity views to only update ROI information when mouse released on (z,t)sliders.

Location:

trunk/SRC/org/openmicroscopy/shoola/agents/measurement/view

Files:

• GraphPane.java (modified) (7 diffs)
• IntensityView.java (modified) (4 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/measurement/view/GraphPane.java

@@ -27 +27 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38 +40 @@
 import javax.swing.JPanel;
 import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 //Third-party libraries
 
@@ -73 +73 @@
 class GraphPane
         extends JPanel 
-        implements TabPaneInterface, ChangeListener
+        implements TabPaneInterface
 {
         /** Ready state. */
@@ -199 +199 @@
         }
         
+        /**
+         * The slider has changed value and the mouse button released. 
+         */
+        private void handleSliderReleased()
+        {
+                if(zSlider == null || tSlider == null )
+                        return;
+                if(coord==null)
+                        return;
+                if(state==ANALYSING)
+                        return;
+                Coord3D thisCoord = new Coord3D(zSlider.getValue()-1, tSlider.getValue()-1);
+                if(coord.equals(thisCoord))
+                        return;
+                state = ANALYSING;
+                this.buildGraphsAndDisplay();
+                state=READY;
+                if(shape!=null)
+                        view.selectFigure(shape.getFigure());
+        }
+        
         /** Initializes the component composing the display. */
         private void initComponents()
@@ -207 +228 @@
                 zSlider.setPaintLabels(false);
                 zSlider.setMajorTickSpacing(1);
-                zSlider.addChangeListener(this);
+                zSlider.addMouseListener(new MouseAdapter()
+                {
+                        public void mouseReleased(MouseEvent e)
+                        {
+                                handleSliderReleased();
+                        }
+                });
                 zSlider.setShowArrows(true);
                 zSlider.setVisible(false);
@@ -219 +246 @@
                 tSlider.setMajorTickSpacing(1);
                 tSlider.setSnapToTicks(true);
-                tSlider.addChangeListener(this);
+                tSlider.addMouseListener(new MouseAdapter()
+                {
+                        public void mouseReleased(MouseEvent e)
+                        {
+                                handleSliderReleased();
+                        }
+                });
                 tSlider.setShowArrows(true);
                 tSlider.setVisible(false);
@@ -476 +509 @@
                 return plot;
         }
-
-        /* (non-Javadoc)
-         * @see javax.swing.event.ChangeListener#stateChanged(javax.swing.event.ChangeEvent)
-         */
-        public void stateChanged(ChangeEvent e)
-        {
-                if(zSlider == null || tSlider == null )
-                        return;
-                if(coord==null)
-                        return;
-                if(state==ANALYSING)
-                        return;
-                Coord3D thisCoord = new Coord3D(zSlider.getValue()-1, tSlider.getValue()-1);
-                if(coord.equals(thisCoord))
-                        return;
-                state = ANALYSING;
-                this.buildGraphsAndDisplay();
-                state=READY;
-                if(shape!=null)
-                        view.selectFigure(shape.getFigure());
-        }
         
 }

trunk/SRC/org/openmicroscopy/shoola/agents/measurement/view/IntensityView.java

@@ -31 +31 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -259 +261 @@
         public int getIndex() {return INDEX; }
         
+        /**
+         * The slider has changed value and the mouse button released. 
+         */
+        private void handleSliderReleased()
+        {
+                stateChanged(null);
+        }
+        
         /** Initializes the component composing the display. */
         private void initComponents()
@@ -290 +300 @@
                 zSlider.setPaintLabels(false);
                 zSlider.setMajorTickSpacing(1);
-                zSlider.addChangeListener(this);
+                zSlider.addMouseListener(new MouseAdapter()
+                {
+                        public void mouseReleased(MouseEvent e)
+                        {
+                                handleSliderReleased();
+                        }
+                });
                 zSlider.setShowArrows(true);
                 zSlider.setVisible(false);
@@ -301 +317 @@
                 tSlider.setMajorTickSpacing(1);
                 tSlider.setSnapToTicks(true);
-                tSlider.addChangeListener(this);
+                tSlider.addMouseListener(new MouseAdapter()
+                {
+                        public void mouseReleased(MouseEvent e)
+                        {
+                                handleSliderReleased();
+                        }
+                });
                 tSlider.setShowArrows(true);
                 tSlider.setVisible(false);