Changeset 82 for nodebox/trunk/src/DrawingPrimitives.py

Timestamp:

02/12/07 00:35:23 (2 years ago)

Author:

fdb

Message:

Small fixes, but bezier.insert_point is still incorrect.

Files:

• nodebox/trunk/src/DrawingPrimitives.py (modified) (5 diffs)

nodebox/trunk/src/DrawingPrimitives.py

@@ -71 +71 @@
     def __repr__(self):
         return "Point(x=%s, y=%s)" % (self.x, self.y)
+        
+    def __eq__(self, other):
+        return self.x == other.x and self.y == other.y
+        
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
 class Grob(object):
@@ -268 +274 @@
         import bezier
         self.path = bezier.insert_point(self, t).path
+        self._segment_cache = None
 
 class PathElement(object):
-    cmd = None
-    x = 0
-    y = 0
-    ctrl1 = Point()
-    ctrl2 = Point()
-
     def __init__(self, cmd=None, pts=None):
         self.cmd = cmd
@@ -281 +282 @@
             assert len(pts) == 1
             self.x, self.y = pts[0]
+            self.ctrl1 = Point(pts[0])
+            self.ctrl2 = Point(pts[0])
         elif cmd == LINETO:
             assert len(pts) == 1
             self.x, self.y = pts[0]
+            self.ctrl1 = Point(pts[0])
+            self.ctrl2 = Point(pts[0])
         elif cmd == CURVETO:
             assert len(pts) == 3
@@ -291 +296 @@
         elif cmd == CLOSE:
             assert pts is None or len(pts) == 0
+            self.x = self.y = 0.0
+            self.ctrl1 = Point(0.0, 0.0)
+            self.ctrl2 = Point(0.0, 0.0)
+        else:
+            self.x = self.y = 0.0
+            self.ctrl1 = Point()
+            self.ctrl2 = Point()
+        #else:
+        #    raise NodeBoxError, "PathElement: unknown command %s" % cmd
 
     def __repr__(self):
@@ -298 +312 @@
             return "PathElement(LINETO, ((%s, %s),))" % (self.x, self.y)
         elif self.cmd == CURVETO:
-            return "PathElement(LINETO, ((%s, %s), (%s, %s), (%s, %s))" % \
+            return "PathElement(CURVETO, ((%s, %s), (%s, %s), (%s, %s))" % \
                 (self.ctrl1.x, self.ctrl1.y, self.ctrl2.x, self.ctrl2.y, self.x, self.y)
         elif self.cmd == CLOSE:
             return "PathElement(CLOSE)"
+            
+    def __eq__(self, other):
+        if self.cmd != other.cmd: return False
+        return self.x == other.x and self.y == other.y \
+            and self.ctrl1 == other.ctrl1 and self.ctrl2 == other.ctrl2
+        
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
 class Rect(BezierPath):