beziereditor: additional imports

samizdatco · samizdatco · commit 44a8c8953d56 · 2014-04-21T12:56:26.000-04:00
diff --git a/beziereditor/__init__.py b/beziereditor/__init__.py
@@ -254,10 +254,7 @@ def insert_point(self, x, y):
 
         """
 
-        try:
-            bezier = _ctx.ximport("bezier")
-        except:
-            from nodebox.graphics import bezier
+        from plotdevice.lib import pathmatics
 
         # Do a number of checks distributed along the path.
         # Keep the one closest to the actual mouse location.
@@ -303,8 +300,8 @@ def insert_point(self, x, y):
             closest = closest_precise
 
         # Update the points list with the inserted point.
-        p = bezier.insert_point(self.path, closest_precise)
-        i, t, pt = bezier._locate(self.path, closest_precise)
+        p = pathmatics.insert_point(self.path, closest_precise)
+        i, t, pt = pathmatics._locate(self.path, closest_precise)
         i += 1
         pt = PathElement()
         pt.cmd = p[i].cmd
diff --git a/beziereditor/svg/__init__.py b/beziereditor/svg/__init__.py
@@ -6,7 +6,7 @@
 
 import xml.dom.minidom as parser
 import re
-from nodebox.grobs import RGB, MOVETO
+from plotdevice.grobs import RGB, MOVETO
 
 def parse(svg):
 
@@ -295,7 +295,7 @@ def add_transform_matrix(e, path):
         matrix = matrix.split(",")
         matrix = [float(v) for v in matrix]
 
-        from nodebox.graphics import Transform
+        from plotdevice.grobs import Transform
         t = Transform()
         t._set_matrix(matrix)
         path = t.transformBezierPath(path)
