Merge pull request #146 from EmbroidePy/generic-writer

Import GenericWriter Correctly
EmbroidePy · Apr 26, 2022 · 06225f6 · 06225f6
2 parents e8bede8 + adaff94
commit 06225f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/pyembroidery/GenericWriter.py b/pyembroidery/GenericWriter.py
@@ -412,20 +412,13 @@ def close_block(self):
             self.block_closing = True
 
     def write(self):
-        pattern = self.pattern
-        f = self.f
-        settings = self.settings
-
-        if settings is None:
-            return
-
         # DOCUMENT STATISTICS
         self.set_document_statistics()
 
         self.open_pattern()
         if self.metadata_entry is not None:
-            for i, key in enumerate(pattern.extras):
-                value = pattern.extras[key]
+            for i, key in enumerate(self.pattern.extras):
+                value = self.pattern.extras[key]
                 self.format_dictionary.update({
                     "metadata_index": i,
                     "metadata_key": str(key),
@@ -436,7 +429,7 @@ def write(self):
                 )
 
         if self.thread_entry is not None:
-            for i, thread in enumerate(pattern.threadlist):
+            for i, thread in enumerate(self.pattern.threadlist):
                 self.format_dictionary.update({
                     "thread_index": i,
                     "thread_color": thread.hex_color(),
@@ -453,7 +446,7 @@ def write(self):
                 write_string_utf8(
                     self.f, self.thread_entry.format_map(self.format_dictionary)
                 )
-        for self.command_index in range(0, len(pattern.stitches)):
+        for self.command_index in range(0, len(self.pattern.stitches)):
             self.update_command()
             write_segment = self.get_write_segment(self.cmd)
 
@@ -462,7 +455,7 @@ def write(self):
                 if isinstance(write_segment, dict):
                     key, default = write_segment[None]
                     key = key.format_map(self.format_dictionary)
-                    write_segment = write_segment.get(key,default)
+                    write_segment = write_segment.get(key, default)
                 self.update_positions(self.x, self.y, self.cmd)
                 if self.cmd == SEQUIN_MODE:
                     self.open_document()

diff --git a/pyembroidery/__init__.py b/pyembroidery/__init__.py
@@ -7,6 +7,7 @@
 from .EmbPattern import EmbPattern
 from .EmbThread import EmbThread
 from .EmbCompress import compress, expand
+import pyembroidery.GenericWriter as GenericWriter
 
 # items available in a sub-heirarchy (e.g. pyembroidery.PecGraphics.get_graphic_as_string)
 from .PecGraphics import get_graphic_as_string

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pyembroidery",
-    version="1.4.35",
+    version="1.4.36",
     author="Tatarize",
     author_email="[email protected]",
     description="Embroidery IO library",