Changeset 5673

Timestamp:

10/10/08 11:46:07 (6 weeks ago)

Author:

jburel

Message:

Improved code so that we don't have the OOM exception

Location:

branches/Beta3.1/SRC/org/openmicroscopy/shoola

Files:

• agents/measurement/view/MeasurementViewer.java (modified) (1 diff)
• agents/measurement/view/MeasurementViewerComponent.java (modified) (2 diffs)
• agents/measurement/view/MeasurementViewerControl.java (modified) (8 diffs)
• agents/measurement/view/MeasurementViewerModel.java (modified) (1 diff)
• env/rnd/roi/PointIterator.java (modified) (3 diffs)
• env/rnd/roi/ROIAnalyser.java (modified) (3 diffs)
• util/roi/figures/MeasureBezierFigure.java (modified) (2 diffs)
• util/roi/figures/MeasureEllipseFigure.java (modified) (2 diffs)
• util/roi/figures/MeasureLineConnectionFigure.java (modified) (2 diffs)
• util/roi/figures/MeasureLineFigure.java (modified) (2 diffs)
• util/roi/figures/MeasurePointFigure.java (modified) (2 diffs)
• util/roi/figures/MeasureRectangleFigure.java (modified) (2 diffs)
• util/roi/figures/MeasureTextFigure.java (modified) (3 diffs)
• util/roi/figures/ROIFigure.java (modified) (2 diffs)

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewer.java

@@ -241 +241 @@
          * @param shape The list of ROIShapes to analyse. Mustn't be <code>null</code>.
          */
-        public void analyseShapeList(ArrayList<ROIShape> shape);
+        public void analyseShapeList(List<ROIShape> shape);
 
         

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerComponent.java

@@ -650 +650 @@
          * @see MeasurementViewer#analyseShapeList(ArrayList)
          */
-        public void analyseShapeList(ArrayList<ROIShape> shapeList)
+        public void analyseShapeList(List<ROIShape> shapeList)
         {
                 if (shapeList == null)
@@ -664 +664 @@
                                 
                         case ANALYSE_SHAPE:
-                                model.cancel();
-                                break;
+                                //model.cancel();
+                                //break;
+                                return;
                 }
                 if (model.getActiveChannels().size() == 0) return;

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerControl.java

@@ -28 +28 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -37 +39 @@
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -62 +65 @@
 import org.openmicroscopy.shoola.agents.measurement.actions.ShowROIAssistant;
 import org.openmicroscopy.shoola.agents.measurement.actions.UnitsAction;
+import org.openmicroscopy.shoola.util.roi.figures.MeasureLineFigure;
+import org.openmicroscopy.shoola.util.roi.figures.MeasurePointFigure;
 import org.openmicroscopy.shoola.util.roi.figures.MeasureTextFigure;
 import org.openmicroscopy.shoola.util.roi.figures.ROIFigure;
@@ -161 +166 @@
 
     /**
+     * Sets the status of the currently selected Region of Interest.
+     * 
+     * @param status The value to set.
+     */
+    private void setROIFigureStatus(int status)
+    {
+        Collection<Figure> selectedFigures = 
+                                view.getDrawingView().getSelectedFigures(); 
+        if (selectedFigures.size() != 1) return;
+        Iterator<Figure> i = selectedFigures.iterator();
+        Figure fig;
+        ROIFigure roiFigure;
+        while (i.hasNext()) {
+                fig =  i.next();
+                if (fig instanceof ROIFigure) {
+                        roiFigure = (ROIFigure) fig;
+                        roiFigure.setStatus(status);
+                        handleFigureChange(roiFigure);
+                }
+        }
+    }
+    
+    /**
+     * Handles the selection of new Region of Interest.
+     * 
+     * @param figure The value to handle.
+     */
+    private void handleFigureChange(ROIFigure figure)
+        {
+        //TODO clean that code
+        if ((figure instanceof MeasureLineFigure) || 
+                                (figure instanceof MeasurePointFigure)) {
+                figure.calculateMeasurements();
+                view.refreshResultsTable();
+                model.setDataChanged();
+                if (!view.inDataView()) return;
+                ROIShape shape = figure.getROIShape();
+                List<ROIShape> shapeList = new ArrayList<ROIShape>();
+                ROI roi = shape.getROI();
+                TreeMap<Coord3D, ROIShape> shapeMap = roi.getShapes();
+                Iterator<Coord3D> shapeIterator = shapeMap.keySet().iterator();
+                while (shapeIterator.hasNext())
+                        shapeList.add(shapeMap.get(shapeIterator.next()));
+                
+                if (shapeList.size() != 0)
+                        model.analyseShapeList(shapeList);
+                return;
+                }
+        
+                if (figure.getStatus() != ROIFigure.IDLE) return;
+                figure.calculateMeasurements();
+                view.refreshResultsTable();
+                model.setDataChanged();
+                if (!view.inDataView()) return;
+                ROIShape shape = figure.getROIShape();
+                List<ROIShape> shapeList = new ArrayList<ROIShape>();
+                ROI roi = shape.getROI();
+                TreeMap<Coord3D, ROIShape> shapeMap = roi.getShapes();
+                Iterator<Coord3D> shapeIterator = shapeMap.keySet().iterator();
+                while (shapeIterator.hasNext())
+                        shapeList.add(shapeMap.get(shapeIterator.next()));
+                
+                if (shapeList.size() != 0)
+                        model.analyseShapeList(shapeList);
+        }
+    
+    /**
      * Creates a new instance.
      * The {@link #initialize(MeasurementViewer, MeasurementViewerUI) initialize} 
@@ -205 +277 @@
                  view.addWindowFocusListener(this); }
          });
+         view.getDrawingView().addMouseListener(new MouseAdapter() {
+                        
+                        public void mouseReleased(MouseEvent e)
+                        {
+                                setROIFigureStatus(ROIFigure.IDLE);
+                        }
+                
+                        public void mousePressed(MouseEvent e)
+                        {
+                                setROIFigureStatus(ROIFigure.MOVING);
+                        }
+                
+                });
+         
     }
     
@@ -319 +405 @@
                 Figure f = e.getFigure();
                 if (!(f instanceof ROIFigure)) return;
+
                 ROIFigure roiFigure = (ROIFigure) f;
+                roiFigure.setStatus(ROIFigure.MOVING);
                 view.addROI(roiFigure);
                 roiFigure.addFigureListener(this);
@@ -325 +413 @@
                 if (!view.inDataView()) return;
                 ROIShape shape = roiFigure.getROIShape();
-                if (view.inDataView())
-                {
-                        ArrayList<ROIShape> shapeList = new ArrayList<ROIShape>();
-                        ROI roi = shape.getROI();
-                        TreeMap<Coord3D, ROIShape> shapeMap = roi.getShapes();
-                        Iterator<Coord3D> shapeIterator = shapeMap.keySet().iterator();
-                        while (shapeIterator.hasNext())
-                                shapeList.add(shapeMap.get(shapeIterator.next()));
-                        if (shapeList.size() != 0) model.analyseShapeList(shapeList);
+                List<ROIShape> shapeList = new ArrayList<ROIShape>();
+                ROI roi = shape.getROI();
+                TreeMap<Coord3D, ROIShape> shapeMap = roi.getShapes();
+                Iterator<Coord3D> shapeIterator = shapeMap.keySet().iterator();
+                while (shapeIterator.hasNext())
+                        shapeList.add(shapeMap.get(shapeIterator.next()));
+                if (shapeList.size() == 0) return;
+                if ((f instanceof MeasureLineFigure) || 
+                                (f instanceof MeasurePointFigure)) {
+                        roiFigure.setStatus(ROIFigure.IDLE);
+                        model.analyseShapeList(shapeList);
                 }
         }
@@ -401 +491 @@
                 if (f instanceof ROIFigure) {
                         ROIFigure roiFigure = (ROIFigure) f;
-                        roiFigure.calculateMeasurements();
-                        view.refreshResultsTable();
-                        model.setDataChanged();
-                        if (view.inDataView()) {
-                                
-                                ROIShape shape = roiFigure.getROIShape();
-                                ArrayList<ROIShape> shapeList = new ArrayList<ROIShape>();
-                                ROI roi = shape.getROI();
-                                TreeMap<Coord3D, ROIShape> shapeMap = roi.getShapes();
-                                Iterator<Coord3D> shapeIterator = shapeMap.keySet().iterator();
-                                while (shapeIterator.hasNext())
-                                        shapeList.add(shapeMap.get(shapeIterator.next()));
-                                
-                                if (shapeList.size() != 0)
-                                        model.analyseShapeList(shapeList);
-                        }
+                        handleFigureChange(roiFigure);
                 }
         }

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/measurement/view/MeasurementViewerModel.java

@@ -810 +810 @@
          * @param shapeList The shapelist to analyse. Mustn't be <code>null</code>.
          */
-        void fireAnalyzeShape(ArrayList<ROIShape> shapeList)
-        {
-                if(getState() == MeasurementViewer.ANALYSE_SHAPE)
-                        return;
+        void fireAnalyzeShape(List<ROIShape> shapeList)
+        {
                 state = MeasurementViewer.ANALYSE_SHAPE;
                 List channels = new ArrayList(activeChannels.size());

branches/Beta3.1/SRC/org/openmicroscopy/shoola/env/rnd/roi/PointIterator.java

@@ -270 +270 @@
      * 
      * @param shape     The shape to analyse. Mustn't be <code>null</code>.
+     * @param points    The points contained within the Region of Interest.
      * @param w                 The selected channel. 
      * @throws DataSourceException  If an error occurs while retrieving plane
      *                              data from the pixels source.
      */
-    public void iterate(ROIShape shape, int w) 
+    public void iterate(ROIShape shape,  PlanePoint2D[] points, int w) 
         throws DataSourceException
     {
@@ -280 +281 @@
         if (w < 0 || w >= sizeC) 
                 throw new NullPointerException("Channel not valid.");
-        ROIFigure selection2D;
-        PlanePoint2D[] points;
         notifyIterationStart();
         try {  //Iterate in ZWT order and notify observers.
@@ -287 +286 @@
                 int t = shape.getT();
                 if (z >= 0 && z < sizeZ && t >= 0 && t < sizeT) {
-                        selection2D = shape.getFigure();
-                        points = selection2D.getPoints();
                         notifyPlaneStart(z, w, t, points.length);
                         Plane2D data = source.getPlane(z, t, w);

branches/Beta3.1/SRC/org/openmicroscopy/shoola/env/rnd/roi/ROIAnalyser.java

@@ -35 +35 @@
 import org.openmicroscopy.shoola.env.rnd.data.DataSink;
 import org.openmicroscopy.shoola.env.rnd.data.DataSourceException;
+import org.openmicroscopy.shoola.util.math.geom2D.PlanePoint2D;
 import org.openmicroscopy.shoola.util.roi.model.ROIShape;
 
@@ -152 +153 @@
                 stats = new HashMap<Integer, ROIShapeStats>(n);
                 j = channels.iterator();
+                PlanePoint2D[] points = shape.getFigure().getPoints();
                 while (j.hasNext()) {
                                 w = (Integer) j.next();
@@ -157 +159 @@
                                 computer =  new ROIShapeStats();
                                 runner.register(computer);
-                                runner.iterate(shape, w.intValue());
+                                runner.iterate(shape, points, w.intValue());
                                 runner.remove(computer);
                                 stats.put(w, computer);

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureBezierFigure.java

@@ -96 +96 @@
         private MeasurementUnits                units;
                 
+        private int                                     status;
+        
         /** Create an instance of the bezier figure. */
         public MeasureBezierFigure()
@@ -534 +536 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureEllipseFigure.java

@@ -78 +78 @@
         private MeasurementUnits        units;
         
+        private int                             status;
+        
         /** Creates a new instance. */
         public MeasureEllipseFigure()
@@ -507 +509 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
+        
 }

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureLineConnectionFigure.java

@@ -87 +87 @@
         /** The Measurement units, and values of the image. */
         private MeasurementUnits                units;
+        
+        private int                                     status;
         
         /**
@@ -489 +491 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureLineFigure.java

@@ -92 +92 @@
         /** The Measurement units, and values of the image. */
         private MeasurementUnits                units;
+        
+        private int                                     status;
         
         /**
@@ -504 +506 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasurePointFigure.java

@@ -75 +75 @@
         /** The Measurement units, and values of the image. */
         private MeasurementUnits                units;
+        
+        private int                                     status;
         
           /** 
@@ -341 +343 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureRectangleFigure.java

@@ -79 +79 @@
         private MeasurementUnits                units;
            
+        private int                                     status;
+        
     /** Creates a new instance. */
     public MeasureRectangleFigure() 
@@ -375 +377 @@
         }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureTextFigure.java

@@ -65 +65 @@
         private MeasurementUnits        units;
         
+        private int                             status;
+        
     /** Creates a new instance. Default value <code>(0, 0) </code>.*/
     public MeasureTextFigure() 
@@ -85 +87 @@
         shape = null;
                 roi = null;
+                status = IDLE;
     }
 
@@ -140 +143 @@
         public PlanePoint2D[] getPoints() {  return null; }
         
+        public void setStatus(int status) { this.status = status; }
+        
+        public int getStatus() { return status; }
+        
 }
 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/roi/figures/ROIFigure.java

@@ -52 +52 @@
 {
                 
+        /** Identified the <code>IDLE</code> status. */
+        public static final int IDLE = 0;
+        
+        /** Identified the <code>MOVING</code> status. */
+        public static final int MOVING = 1;
+        
         /** 
          * Sets the measurement units of the ROIFigure. 
@@ -109 +115 @@
     public PlanePoint2D[] getPoints();
     
+        /**
+         * Sets the status of the figure.
+         * 
+         * @param status The value to set.
+         */
+        public void setStatus(int status);
+        
+        /**
+         * Returns the status of the figure.
+         * 
+         * @return See above.
+         */
+        public int getStatus();
+        
 }