Merge remote-tracking branch 'origin/master' into lexelby-mac-build-mk2

1 files changed, 10 insertions, 30 deletions

diff --git a/lib/extensions/input.py b/lib/extensions/input.py
index 251859c5..cb5ac452 100644
--- a/lib/extensions/input.py
+++ b/lib/extensions/input.py
@@ -3,49 +3,29 @@ from os.path import realpath, dirname, join as path_join
 import sys
 from inkex import etree
 import inkex
-
-# help python find libembroidery when running in a local repo clone
-if getattr(sys, 'frozen', None) is None:
-    sys.path.append(realpath(path_join(dirname(__file__), '..', '..')))
-
-from libembroidery import *
+import pyembroidery
 
 from ..svg import PIXELS_PER_MM, render_stitch_plan
 from ..svg.tags import INKSCAPE_LABEL
 from ..i18n import _
-from ..stitch_plan import StitchPlan
+from ..stitch_plan import StitchPlan, ColorBlock
+from ..utils.io import save_stdout
 
 
 class Input(object):
-    def pattern_stitches(self, pattern):
-        stitch_pointer = pattern.stitchList
-        while stitch_pointer:
-            yield stitch_pointer.stitch
-            stitch_pointer = stitch_pointer.next
-
-
     def affect(self, args):
         embroidery_file = args[0]
-        pattern = embPattern_create()
-        embPattern_read(pattern, embroidery_file)
-        embPattern_flipVertical(pattern)
+        pattern = pyembroidery.read(embroidery_file)
 
         stitch_plan = StitchPlan()
         color_block = None
-        current_color = None
-
-        for stitch in self.pattern_stitches(pattern):
-            if stitch.color != current_color:
-                thread = embThreadList_getAt(pattern.threadList, stitch.color)
-                color = thread.color
-                color_block = stitch_plan.new_color_block((color.r, color.g, color.b))
-                current_color = stitch.color
 
-            if not stitch.flags & END:
-                color_block.add_stitch(stitch.xx * PIXELS_PER_MM, stitch.yy * PIXELS_PER_MM,
-                                       jump=stitch.flags & JUMP,
-                                       color_change=stitch.flags & STOP,
-                                       trim=stitch.flags & TRIM)
+        for raw_stitches, thread in pattern.get_as_colorblocks():
+            color_block = stitch_plan.new_color_block(thread)
+            for x, y, command in raw_stitches:
+                color_block.add_stitch(x * PIXELS_PER_MM / 10.0, y * PIXELS_PER_MM / 10.0,
+                                       jump=(command == pyembroidery.JUMP),
+                                       trim=(command == pyembroidery.TRIM))
 
         extents = stitch_plan.extents
         svg = etree.Element("svg", nsmap=inkex.NSS, attrib=