Changeset 3247

Timestamp:

07/13/07 05:49:56 (1 year ago)

Author:

ed

Message:

Added the following draw methods:

drawEllipse(xPos, yPos, width, height, ...)
drawArc(xPos, yPos, rad, startAngle, endAngle, ...)
drawEllipticArc(xPos, yPos, width, height, startAngle, endAngle, ...)

Files:

• trunk/dabo/ui/uiwx/dPemMixin.py (modified) (13 diffs)

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -1242 +1242 @@
-
-    def drawCircle(self, xPos, yPos, rad, penColor="black", penWidth=1,
- 
+
-            persist=True):
-        """Draws a circle of the specified radius around the specified point.
-
- 
- 
- 
+
+
+
-        it will be drawn once only.
-
- 
- 
+
+
+
-        returned object to False. You can also manipulate the position, size,
-        color, and fill by changing the various properties of the object.
@@ -1262 +1262 @@
-        obj = self._addToDrawnObjects(obj, persist)
-        return obj
-
-
-Rectangle(self, xPos, yPos, width, height, penColor="black", 
+
+
+Arc(self, xPos, yPos, rad, startAngle, endAngle, penColor="black",
-            penWidth=1, fillColor=None, lineStyle=None, hatchStyle=None,
-            mode=None, persist=True):
-
-
+
+
+
-
-        See the 'drawCircle()' method above for more details.
-        """
-        obj = DrawObject(self, FillColor=fillColor, PenColor=penColor,
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                DrawMode=mode)
-        # Add it to the list of drawing objects
@@ -1281 +1299 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            mode=None, persist=True):
-        """Draws a polygon defined by the specified points.
-
- 
+
-        polygon.
-
@@ -1299 +1353 @@
-
-
- 
+
-            lineStyle=None, mode=None, persist=True):
-        """Draws a series of connected line segments defined by the specified points.
@@ -1305 +1359 @@
-        The 'points' parameter should be a tuple of (x,y) pairs defining the shape. Lines
-        are drawn connecting the points sequentially, but a segment from the last
- 
+
-        FillColor or HatchStyle defined for this.
-
-        See the 'drawCircle()' method above for more details.
-        """
- 
+
-                Shape="polylines", Points=points, DrawMode=mode)
-        # Add it to the list of drawing objects
@@ -2581 +2635 @@
-        self._points = None
-        self._radius = None
+        self._startAngle = None
+        self._endAngle = None
-        self._shape = None
-        self._visible = True
@@ -2715 +2771 @@
-            dc.DrawCircle(x, y, self.Radius)
-            self._width = self._height = self.Radius * 2
-
+
+
+
+
+
+
+
+
+
+
-            w, h = self.Width, self.Height
-            # If any of these values is -1, use the parent object's size
@@ -2722 +2787 @@
-            if h < 0:
-                h = self.Parent.Height
-
+
+
+
+
-        elif self.Shape in ("polygon", "polylines"):
-            if self.Shape == "polygon":
@@ -2910 +2978 @@
-
-
+    def _getEndAngle(self):
+        return self._endAngle
+
+    def _setEndAngle(self, val):
+        if self._endAngle != val:
+            self._endAngle = val
+            self.update()
+
+
-    def _getFillColor(self):
-        return self._fillColor
@@ -3134 +3211 @@
-        
-        
+    def _getStartAngle(self):
+        return self._startAngle
+
+    def _setStartAngle(self, val):
+        if self._startAngle != val:
+            self._startAngle = val
+            self.update()
+
+
-    def _getText(self):
-        return self._text
@@ -3185 +3271 @@
-        
-    Angle = property(_getAngle, _setAngle, None,
-
+(in degrees) 
-    
-    BackColor = property(_getBackColor, _setBackColor, None,
@@ -3213 +3299 @@
-            """))
-    
+    EndAngle = property(_getEndAngle, _setEndAngle, None,
+            _("Angle (in degrees) used to end drawing a circular arc  (int)"))
+    
-    FillColor = property(_getFillColor, _setFillColor, None,
-            _("Background color for the shape  (color)"))
@@ -3289 +3378 @@
-            _("Type of shape to draw  (str)"))
-
+    StartAngle = property(_getStartAngle, _setStartAngle, None,
+            _("Angle (in degrees) used to start drawing a circular arc  (int)"))
+    
-    Text = property(_getText, _setText, None,
-            _("Text to be drawn  (str)"))