Changeset 3241

Timestamp:

07/12/07 12:35:31 (1 year ago)

Author:

ed

Message:

Lots of improvements to the DrawnObject? class:

- Expanded the Height and Width properties to apply to all shapes, even irregular ones such as polygons and rotated text.

- Added convenience properties Position and Size, which are simply shorthad for (Xpos, Ypos) and (Width, Height), respectively.

- Added the Rect property, which is read-only, and returns an instance of a wx.Rect whose dimensions contain the associated drawn object. If this seems to be a very useful thing, we could wrap it into a true Dabo object.

- Added the 'drawPolyLines()' method, which is similar to drawPolygon(), but creates an open-ended series of line segments.

Files:

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

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -3 +3 @@
-import time
-import types
+import math
-import wx
-from wx._core import PyAssertionError
@@ -1293 +1294 @@
-                PenWidth=penWidth, LineStyle=lineStyle, HatchStyle=hatchStyle,
-                Shape="polygon", Points=points, DrawMode=mode)
+        # Add it to the list of drawing objects
+        obj = self._addToDrawnObjects(obj, persist)
+        return obj
+
+
+    def drawPolyLines(self, points, penColor="black", penWidth=1, 
+            lineStyle=None, mode=None, persist=True):
+        """Draws a series of connected line segments defined by the specified points.
+
+        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
+        point to the first is not drawn, leaving an 'open' polygon. As a result, there is no 
+        FillColor or HatchStyle defined for this.
+
+        See the 'drawCircle()' method above for more details.
+        """
+        obj = DrawObject(self, PenColor=penColor, PenWidth=penWidth, LineStyle=lineStyle, 
+                Shape="polylines", Points=points, DrawMode=mode)
-        # Add it to the list of drawing objects
-        obj = self._addToDrawnObjects(obj, persist)
@@ -2695 +2714 @@
-        if self.Shape == "circle":
-            dc.DrawCircle(x, y, self.Radius)
+            self._width = self._height = self.Radius * 2
-        elif self.Shape == "rect":
-            w, h = self.Width, self.Height
@@ -2703 +2723 @@
-                h = self.Parent.Height
-            dc.DrawRectangle(x, y, w, h)
-
-
+
+
+
+
+
+
+
+
+
+
+
-        elif self.Shape == "line":
-            x1, y1 = self.Points[0]
-            x2, y2 = self.Points[1]
-            dc.DrawLine(x1, y1, x2, y2)
+            self._xPos = min(x1, x2)
+            self._yPos = min(y1, y2)
+            self._width = abs(x1 - x2)
+            self._height = abs(y1 - y2)
-        elif self.Shape == "gradient":
-            self._drawGradient(dc, x, y)
@@ -2748 +2781 @@
-            else:
-                dc.DrawRotatedText(txt, x, y, self._angle)
+            w, h = dabo.ui.fontMetricFromDrawObject(self)
+            angle = self._angle % 360
+            if angle % 90 == 0:
+                if angle % 180 == 0:
+                    self._width, self._height = w, h
+                else:
+                    # 90 degree variant; switch the values.
+                    self._width, self._height = h, w
+            else:
+                rad = math.radians(angle)
+                self._width = abs(math.cos(rad) * w) + abs(math.sin(rad) * h)
+                self._height = abs(math.sin(rad) * w) + abs(math.cos(rad) * h)
-
-
@@ -3025 +3070 @@
-            
-
+    def _getPosition(self):
+        return (self._xPos, self._yPos)
+
+    def _setPosition(self, val):
+        if (self._xPos, self._yPos) != val:
+            self._xPos, self._yPos = val
+            self.update()
+
+
-    def _getRadius(self):
-        return self._radius
@@ -3032 +3086 @@
-            self._radius = val
-            self.update()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def _getShape(self):
-        return self._shape
@@ -3181 +3274 @@
-            _("Tuple of (x,y) pairs defining a polygon.  (tuple)"))
-
+    Position = property(_getPosition, _setPosition, None,
+            _("Shorthand for (Xpos, Ypos).  (2-tuple)"))
+    
-    Radius = property(_getRadius, _setRadius, None,
-            _("For circles, the radius of the shape  (int)"))
-
+    Rect = property(_getRect, None, None,
+            _("Reference to a wx.Rect that encompasses the drawn object (read-only) (wx.Rect)"))
+    
+    Size = property(_getSize, _setSize, None,
+            _("Convenience property, equivalent to (Width, Height)  (2-tuple)"))
+    
-    Shape = property(_getShape, _setShape, None,
-            _("Type of shape to draw  (str)"))