Merge pull request #33 from EmbroidePy/tatarize-cli-help

Some updates for the CLI.

Author: tatarize

pyembroidery/EmbMatrix.py

@@ -33,6 +33,10 @@ def inverse(self):
     def post_scale(self, sx=1, sy=None, x=0, y=0):
         if sy is None:
             sy = sx
+        if x is None:
+            x = 0
+        if y is None:
+            y = 0
         if x == 0 and y == 0:
             self.m = self.matrix_multiply(self.m, self.get_scale(sx, sy))
         else:
@@ -44,6 +48,10 @@ def post_translate(self, tx, ty):
         self.m = self.matrix_multiply(self.m, self.get_translate(tx, ty))
 
     def post_rotate(self, theta, x=0, y=0):
+        if x is None:
+            x = 0
+        if y is None:
+            y = 0
         if x == 0 and y == 0:
             self.m = self.matrix_multiply(self.m, self.get_rotate(theta))
         else:
@@ -90,6 +98,13 @@ def point_in_matrix_space(self, v0, v1=None):
             v0 * m[1] + v1 * m[4] + 1 * m[7]
         ]
 
+    def apply(self, v):
+        m = self.m
+        nx = v[0] * m[0] + v[1] * m[3] + 1 * m[6]
+        ny = v[0] * m[1] + v[1] * m[4] + 1 * m[7]
+        v[0] = nx
+        v[1] = ny
+
     @staticmethod
     def get_identity():
         return \

pyembroidery/EmbPattern.py

@@ -233,6 +233,10 @@ def translate(self, dx, dy):
             stitch[0] += dx
             stitch[1] += dy
 
+    def transform(self, matrix):
+        for stitch in self.stitches:
+            matrix.apply(stitch)
+
     def fix_color_count(self):
         """Ensure the there are threads for all color blocks."""
         thread_index = 0

pyembroidery/PesReader.py

@@ -1,5 +1,5 @@
-from .PecReader import read_pec
 from .EmbThread import EmbThread
+from .PecReader import read_pec
 from .ReadHelper import read_string_8, read_int_8, read_int_32le, read_int_24be, read_int_16le
 
 
@@ -18,19 +18,37 @@ def read(f, out, settings=None):
     # Metadata started appearing in V4
     # Threads appeared in V5.
     # We quickly abort if there's any complex items in the header.
-    # "#PES0100", "#PES0090" "#PES0080" "#PES0070", "#PES0040",
-    # "#PES0030", "#PES0022", "#PES0020"
-    if pes_string == "#PES0060":
+    if pes_string == "PES0100":
+        out.metadata("version", 10)
+    elif pes_string == "#PES0090":
+        out.metadata("version", 9)
+    elif pes_string == "#PES0080":
+        out.metadata("version", 8)
+    elif pes_string == "#PES0070":
+        out.metadata("version", 7)
+    elif pes_string == "#PES0060":
+        out.metadata("version", 6)
         read_pes_header_version_6(f, out, loaded_thread_values)
     elif pes_string == "#PES0050":
+        out.metadata("version", 5)
         read_pes_header_version_5(f, out, loaded_thread_values)
     elif pes_string == "#PES0055":
+        out.metadata("version", 5.5)
         read_pes_header_version_5(f, out, loaded_thread_values)
     elif pes_string == "#PES0056":
+        out.metadata("version", 5.6)
         read_pes_header_version_5(f, out, loaded_thread_values)
     elif pes_string == "#PES0040":
+        out.metadata("version", 4)
         read_pes_header_version_4(f, out)
+    elif pes_string == "#PES0030":
+        out.metadata("version", 3)
+    elif pes_string == "#PES0022":
+        out.metadata("version", 2.2)
+    elif pes_string == "#PES0020":
+        out.metadata("version", 2)
     elif pes_string == "#PES0001":
+        out.metadata("version", 1)
         read_pes_header_version_1(f, out)
     else:
         pass  # Header is unrecognised.

pyembroidery/PesWriter.py

@@ -21,7 +21,7 @@
 
 def write(pattern, f, settings=None):
     if settings is not None:
-        version = settings.get("pes version", VERSION_1)
+        version = float(settings.get("pes version", VERSION_1))
         truncated = settings.get("truncated", False)
     else:
         version = VERSION_1

pyembroidery/PyEmbroidery.py

@@ -396,12 +396,14 @@ def convert(filename_from, filename_to, settings=None):
 
 
 def get_extension_by_filename(filename):
-    """extracts he extension from a filename"""
+    """extracts the extension from a filename"""
     return os.path.splitext(filename)[1][1:]
 
 
 def read_embroidery(reader, f, settings=None, pattern=None):
     """Reads fileobject or filename with reader."""
+    if reader is None:
+        return None
     if pattern is None:
         pattern = EmbPattern()
     if isinstance(f, str):
@@ -482,6 +484,8 @@ def read(filename, settings=None, pattern=None):
 
 
 def write_embroidery(writer, pattern, stream, settings=None):
+    if pattern is None:
+        return
     if settings is None:
         settings = {}
     else: