version bump

EmbroidePy · May 20, 2022 · 47a1a43 · 47a1a43
1 parent 1a20ff5
commit 47a1a43
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="vpype-embroidery",
-    version="0.2.0",
+    version="0.3.0",
     description="vpype embroidery plugin",
     long_description=readme,
     long_description_content_type="text/markdown",

diff --git a/vpype_embroidery/eread.py b/vpype_embroidery/eread.py
@@ -6,7 +6,9 @@
 import vpype_cli
 from pyembroidery import EmbPattern
 
-_EMB_SCALE_FACTOR = 2.645833333333333
+_EMB_IN_MM = 0.1
+_PX_IN_MM = 0.2645833333333333  # 1/96 inch
+_EMB_PER_PX = _EMB_IN_MM / _PX_IN_MM
 
 
 @click.command()
@@ -22,11 +24,11 @@ def eread(document: vp.Document, filename: str):
         if len(stitches) == 0:
             continue
         lc = vp.LineCollection()
-        lc.scale(1.0 / _EMB_SCALE_FACTOR)
         stitch_block = np.asarray(stitches, dtype="float")
         stitch_block = stitch_block[..., 0] + 1j * stitch_block[..., 1]
         lc.append(stitch_block)
         lc.set_property(vp.METADATA_FIELD_COLOR, vp.Color(color.hex_color()))
+        lc.scale(_EMB_PER_PX)
         document.add(lc, with_metadata=True)
     return document
 

diff --git a/vpype_embroidery/ewrite.py b/vpype_embroidery/ewrite.py
@@ -3,7 +3,10 @@
 import vpype_cli
 from pyembroidery import COLOR_BREAK, SEQUENCE_BREAK, STITCH, EmbPattern
 
-_EMB_SCALE_FACTOR = 2.645833333333333
+
+_EMB_IN_MM = 0.1
+_PX_IN_MM = 0.2645833333333333  # 1/96 inch
+_PX_PER_EMB = _PX_IN_MM / _EMB_IN_MM
 
 
 @click.command()
@@ -21,7 +24,7 @@ def ewrite(document: vp.Document, filename: str, version: str):
     pattern = EmbPattern()
     for layer in document.layers.values():
         for p in layer:
-            m = p * _EMB_SCALE_FACTOR
+            m = p * _PX_PER_EMB
             for v in m:
                 pattern.add_stitch_absolute(STITCH, int(v.real), int(v.imag))
             pattern.add_command(SEQUENCE_BREAK)