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

Timestamp:

02/11/07 20:54:49 (2 years ago)

Author:

fdb

Message:

1.8.3 updates, bezier changes, not complete yet.

Files:

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

nodebox/trunk/src/DrawingPrimitives.py

@@ -101 +101 @@
         self.strokecolor = None
         self.strokewidth = 1.0
+        self._segment_cache = None
 
     def inheritFromContext(self):
@@ -139 +140 @@
 
     def moveto(self, x, y):
+        self._segment_cache = None
         self.path.moveToPoint_( (x, y) )
 
     def lineto(self, x, y):
+        self._segment_cache = None
         self.path.lineToPoint_( (x, y) )
 
     def curveto(self, x1, y1, x2, y2, x3, y3):
+        self._segment_cache = None
         self.path.curveToPoint_controlPoint1_controlPoint2_( (x3, y3), (x1, y1), (x2, y2) )
 
     def closepath(self):
+        self._segment_cache = None
         self.path.closePath()
 
@@ -179 +184 @@
 
     def extend(self, pathElements):
+        self._segment_cache = None
         for el in pathElements:
             self.append(el)
 
     def append(self, el):
+        self._segment_cache = None
         if el.cmd == MOVETO:
             self.moveto(el.x, el.y)
@@ -191 +198 @@
         elif el.cmd == CLOSE:
             self.closepath()
+            
+    def _get_contours(self):
+        import bezier
+        return bezier.contours(self)
+    contours = property(_get_contours)
 
     ### Drawing methods ###
@@ -223 +235 @@
             self.path.stroke()
         _restore()
+        
+    ### Mathematics ###
+    
+    def segment_lengths(self, percentual=False, n=10):
+        import bezier
+        if percentual: # Use the opportunity to store the segment cache.
+            if self._segment_cache is None:
+                self._segment_cache = bezier.segment_lengths(self, percentual=True, n=n)
+            return self._segment_cache
+        else:
+            return bezier.segment_lengths(self, percentual=True, n=n)
+
+    def _get_length(self, segmented=False, n=10):
+        import bezier
+        return bezier.length(self, segmented=segmented, n=n)
+    length = property(_get_length)
+        
+    def point(self, t):
+        import bezier
+        return bezier.point(self, t)
+        
+    def points(self, amount=100):
+        import bezier
+        if len(self) == 0:
+            raise NodeBoxError, "The given path is empty"
+
+        delta = 1.0/amount
+        for i in xrange(amount):
+            yield self.point(delta*i)
 
 class PathElement(object):
@@ -246 +287 @@
         elif cmd == CLOSE:
             assert pts is None or len(pts) == 0
+
+    def __repr__(self):
+        if self.cmd == MOVETO:
+            return "PathElement(MOVETO, ((%s, %s),))" % (self.x, self.y)
+        elif self.cmd == LINETO:
+            return "PathElement(LINETO, ((%s, %s),))" % (self.x, self.y)
+        elif self.cmd == CURVETO:
+            return "PathElement(LINETO, ((%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)"
 
 class Rect(BezierPath):
@@ -897 +949 @@
         self.height = height
         self.speed = None
-        print "canvas init"
         self.mousedown = False
 
@@ -1212 +1263 @@
         self._autoclosepath = close
 
+    def findpath(self, points, curvature=1.0):
+        import bezier
+        path = bezier.findpath(points, curvature=curvature)
+        path._ctx = self
+        path.inheritFromContext()
+        return path
+    
     ### Clipping Commands ###
     def beginclip(self, path):
@@ -1423 +1481 @@
     k = KantGenerator(sourceFile)
     return k.output()
+
+def _test():
+    import doctest, DrawingPrimitives
+    return doctest.testmod(DrawingPrimitives)
+
+if __name__=='__main__':
+    #import profile
+    #profile.run("
+    
+    _test()