Changeset 175 for nodebox/trunk/src/nodebox/graphics/cocoa.py

Timestamp:

10/01/07 15:37:11 (15 months ago)

Author:

fdb

Message:

vdiff and two compliance tests for NodeBox?.

Files:

• nodebox/trunk/src/nodebox/graphics/cocoa.py (modified) (4 diffs)

nodebox/trunk/src/nodebox/graphics/cocoa.py

@@ -210 +210 @@
         if path is None:
             self._nsBezierPath = NSBezierPath.bezierPath()
-        elif isinstance(path, list):
+        elif isinstance(path, (list,tuple)):
             self._nsBezierPath = NSBezierPath.bezierPath()
             self.extend(path)
@@ -293 +293 @@
         self._segment_cache = None
         for el in pathElements:
-            self.append(el)
+            if isinstance(el, (list, tuple)):
+                x, y = el
+                if len(self) == 0:
+                    cmd = MOVETO
+                else:
+                    cmd = LINETO
+                self.append(PathElement(cmd, ((x, y),)))
+            elif isinstance(el, PathElement):
+                self.append(el)
+            else:
+                raise NodeBoxError, "Don't know how to handle %s" % el
 
     def append(self, el):
@@ -480 +490 @@
             params = len(args)
 
-        if params == 1 and isinstance(args[0], Color):
+        if params == 1 and args[0] is None:
+            clr = NSColor.colorWithDeviceWhite_alpha_(0.0, 0.0)
+        elif params == 1 and isinstance(args[0], Color):
             clr = args[0]._cmyk
         elif params == 1 and isinstance(args[0], NSColor):
@@ -1558 +1570 @@
     def drawpath(self, path, **kwargs):
         BezierPath.checkKwargs(kwargs)
-        if isinstance(path, list):
-            path = BezierPath(self, path, kwargs)
+        if isinstance(path, (list, tuple)):
+            path = self.BezierPath(path, **kwargs)
         path.inheritFromContext(kwargs.keys())
         path.draw()