Changeset 174

Timestamp:

10/01/07 14:05:46 (15 months ago)

Author:

fdb

Message:

Colors updates for the latest version: _canvas and utility library.

Location:

libraries/colors

Files:

• __init__.py (modified) (2 diffs)
• colors_example1.py (modified) (1 diff)
• colors_example2.py (modified) (1 diff)
• colors_example3.py (modified) (1 diff)

libraries/colors/__init__.py

@@ -7 +7 @@
 from copy import deepcopy
 from nodebox.graphics import Color as _Color
-from nodebox.graphics import Grob, RGB, HSB, CMYK, CORNER, random, choice, files
+from nodebox.graphics import Grob, RGB, HSB, CMYK, CORNER
+from nodebox.util import random, choice, files
 from nodebox.graphics.cocoa import _restore, _save
 from AppKit import NSShadow, NSColor
@@ -2679 +2680 @@
         (x, y), (w, h) = path.bounds
         if x+w > 0 and y+h > 0 and x < _ctx.WIDTH and y < _ctx.HEIGHT:
-            _ctx._canvas.append(self)
+            _ctx.canvas.append(self)
 
         if _shadow: 

libraries/colors/colors_example1.py

@@ -1 @@
-colors = ximport("colors")
+try:
+    colors = ximport("colors")
+except ImportError:
+    colors = ximport("__init__")
 
 # Deep green gradient background.

libraries/colors/colors_example2.py

@@ -1 @@
-colors = ximport("colors")
+try:
+    colors = ximport("colors")
+except ImportError:
+    colors = ximport("__init__")
 
 # Aggregates are collections of colorranges (e.g. warm, dark)

libraries/colors/colors_example3.py

@@ -1 @@
-colors = ximport("colors")
+try:
+    colors = ximport("colors")
+except ImportError:
+    colors = ximport("__init__")
 
 size(600, 600)