Changeset 5544

Timestamp:

07/22/08 11:38:43 (3 months ago)

Author:

donald

Message:

fix to small bugs

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/measurement/view/IntensityResultsView.java (modified) (3 diffs)
• util/roi/figures/MeasureBezierFigure.java (modified) (5 diffs)

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

@@ -312 +312 @@
         public void displayAnalysisResults()
         {
-                //if(state==State.ANALYSING)
-                //      return;
-                //state = State.ANALYSING;
                 this.ROIStats = model.getAnalysisResults();
                 if (ROIStats == null || ROIStats.size() == 0) return;
@@ -388 +385 @@
         private void getResults(ROIShape shape)
         {
-        //      if(state==State.ANALYSING)
-        //              return;
                 Vector<Vector> rows = new Vector<Vector>();
                 
@@ -504 +499 @@
         private void addResults()
         {
+                Set<Figure> selectedFigures = view.getDrawingView().getSelectedFigures();
+                if(selectedFigures.size()==0)
+                        return;
                 if(state == State.ANALYSING)
                         return;
                 state = State.ANALYSING;
-                Set<Figure> selectedFigures = view.getDrawingView().getSelectedFigures(); 
                 ArrayList<ROIShape> shapeList = new ArrayList<ROIShape>();
                 Iterator<Figure> iterator =  selectedFigures.iterator();

trunk/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureBezierFigure.java

@@ -68 +68 @@
 {
 
+        
+        boolean c;
         /** The list of X coords of the nodes on the line. */
         private ArrayList<Double>                       pointArrayX;
@@ -93 +95 @@
         {
                 super("Text");
+                c = true;
                 shape = null;
                 roi = null;
@@ -107 +110 @@
         {
                 super("Text", closed);
+                c = closed;
                 pointArrayX = new ArrayList<Double>();
                 pointArrayY = new ArrayList<Double>();
@@ -119 +123 @@
         {
                 super(text, true);
+                c = true;
                 pointArrayX = new ArrayList<Double>();
                 pointArrayY = new ArrayList<Double>();
@@ -132 +137 @@
         {
                 super(text, closed);
+                c = closed;
                 pointArrayX = new ArrayList<Double>();
                 pointArrayY = new ArrayList<Double>();