Changeset 5545

Timestamp:

07/22/08 14:00:27 (3 months ago)

Author:

donald

Message:

Fixed bug in displaying polyline text.

Files:

• trunk/SRC/org/openmicroscopy/shoola/util/roi/figures/MeasureBezierFigure.java (modified) (7 diffs)

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

@@ -34 +34 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -40 +42 @@
 
 //Application-internal dependencies
+import org.jhotdraw.draw.AttributeKey;
+import org.jhotdraw.draw.BezierFigure;
+import org.jhotdraw.geom.BezierPath;
 import org.openmicroscopy.shoola.util.math.geom2D.PlanePoint2D;
 import org.openmicroscopy.shoola.util.roi.model.annotation.AnnotationKeys;
@@ -94 +99 @@
         public MeasureBezierFigure()
         {
-                super("Text");
+                super("Text",false);
                 c = true;
                 shape = null;
@@ -122 +127 @@
         public MeasureBezierFigure(String text)
         {
-                super(text, true);
+                super(text, false);
                 c = true;
                 pointArrayX = new ArrayList<Double>();
@@ -176 +181 @@
                                 bounds = g.getFontMetrics().getStringBounds(polygonLength, g);
                                 
-                                if(getPointCount() > 1)
+                                if(super.getNodeCount() > 1)
                                 {
-                                        int midPoint = this.getPointCount()/2-1;
+                                        int midPoint = this.getNodeCount()/2-1;
                                         if(midPoint<0)
                                                 midPoint = 0;
@@ -394 +399 @@
                 for (int i = 0 ; i < path.size(); i++)
                 {
-                        pointArrayX.add(path.get(i).getControlPoint(0).getX());
                         pointArrayY.add(path.get(i).getControlPoint(0).getY());
                 }
                 AnnotationKeys.POINTARRAYX.set(shape, pointArrayX);
                 AnnotationKeys.POINTARRAYY.set(shape, pointArrayY);
-                if (isClosed())
+                if (super.isClosed())
                 {
                         AnnotationKeys.AREA.set(shape,getArea());
@@ -420 +424 @@
         }
         
+        public MeasureBezierFigure clone()
+        {
+                
+                MeasureBezierFigure that = (MeasureBezierFigure)super.clone();
+                return that;
+        }
+        
         /**
          * Implemented as specified by the {@link ROIFigure} interface.