diff --git a/pyembroidery/A100Reader.pyc b/pyembroidery/A100Reader.pyc new file mode 100644 index 0000000..b8ce6b0 Binary files /dev/null and b/pyembroidery/A100Reader.pyc differ diff --git a/pyembroidery/A10oReader.pyc b/pyembroidery/A10oReader.pyc new file mode 100644 index 0000000..ae8f536 Binary files /dev/null and b/pyembroidery/A10oReader.pyc differ diff --git a/pyembroidery/BroReader.pyc b/pyembroidery/BroReader.pyc new file mode 100644 index 0000000..32b19ec Binary files /dev/null and b/pyembroidery/BroReader.pyc differ diff --git a/pyembroidery/CsvReader.pyc b/pyembroidery/CsvReader.pyc new file mode 100644 index 0000000..42d75cf Binary files /dev/null and b/pyembroidery/CsvReader.pyc differ diff --git a/pyembroidery/CsvWriter.pyc b/pyembroidery/CsvWriter.pyc new file mode 100644 index 0000000..5854b98 Binary files /dev/null and b/pyembroidery/CsvWriter.pyc differ diff --git a/pyembroidery/DatReader.py b/pyembroidery/DatReader.py index 88868cb..015bde9 100644 --- a/pyembroidery/DatReader.py +++ b/pyembroidery/DatReader.py @@ -66,12 +66,14 @@ def read_sunstar_dat_stitches(f, out): out.move(x, y) continue if ctrl == 0x80: - out.trim(x, y) + out.trim() + if x != 0 or y != 0: + out.move(x, y) continue if ctrl == 0x87: out.color_change() if x != 0 or y != 0: - out.stitch(x, y) + out.move(x, y) continue if ctrl == 0x84: # Initialized info. out.stitch(x, y) diff --git a/pyembroidery/DatReader.pyc b/pyembroidery/DatReader.pyc new file mode 100644 index 0000000..b5187e6 Binary files /dev/null and b/pyembroidery/DatReader.pyc differ diff --git a/pyembroidery/DsbReader.pyc b/pyembroidery/DsbReader.pyc new file mode 100644 index 0000000..93b5bcd Binary files /dev/null and b/pyembroidery/DsbReader.pyc differ diff --git a/pyembroidery/DstReader.pyc b/pyembroidery/DstReader.pyc new file mode 100644 index 0000000..af8dc66 Binary files /dev/null and b/pyembroidery/DstReader.pyc differ diff --git a/pyembroidery/DstWriter.pyc b/pyembroidery/DstWriter.pyc new file mode 100644 index 0000000..eb66b45 Binary files /dev/null and b/pyembroidery/DstWriter.pyc differ diff --git a/pyembroidery/DszReader.pyc b/pyembroidery/DszReader.pyc new file mode 100644 index 0000000..c2b80a4 Binary files /dev/null and b/pyembroidery/DszReader.pyc differ diff --git a/pyembroidery/EmbConstant.pyc b/pyembroidery/EmbConstant.pyc new file mode 100644 index 0000000..a3bc771 Binary files /dev/null and b/pyembroidery/EmbConstant.pyc differ diff --git a/pyembroidery/EmbEncoder.pyc b/pyembroidery/EmbEncoder.pyc new file mode 100644 index 0000000..5833130 Binary files /dev/null and b/pyembroidery/EmbEncoder.pyc differ diff --git a/pyembroidery/EmbPattern.py b/pyembroidery/EmbPattern.py index 7c0fd20..8f1ac69 100644 --- a/pyembroidery/EmbPattern.py +++ b/pyembroidery/EmbPattern.py @@ -81,7 +81,7 @@ class EmbPattern: except KeyError: color = thread["rgb"] if isinstance(color, int): - thread_object.color = thread["color"] + thread_object.color = color elif isinstance(color, str): if color == "random": thread_object.color = 0xFF000000 | random.randint(0, 0xFFFFFF) diff --git a/pyembroidery/EmbPattern.pyc b/pyembroidery/EmbPattern.pyc new file mode 100644 index 0000000..c1829d9 Binary files /dev/null and b/pyembroidery/EmbPattern.pyc differ diff --git a/pyembroidery/EmbThread.pyc b/pyembroidery/EmbThread.pyc new file mode 100644 index 0000000..9fb2284 Binary files /dev/null and b/pyembroidery/EmbThread.pyc differ diff --git a/pyembroidery/EmbThreadJef.pyc b/pyembroidery/EmbThreadJef.pyc new file mode 100644 index 0000000..b039911 Binary files /dev/null and b/pyembroidery/EmbThreadJef.pyc differ diff --git a/pyembroidery/EmbThreadPec.pyc b/pyembroidery/EmbThreadPec.pyc new file mode 100644 index 0000000..95be0f2 Binary files /dev/null and b/pyembroidery/EmbThreadPec.pyc differ diff --git a/pyembroidery/EmbThreadSew.pyc b/pyembroidery/EmbThreadSew.pyc new file mode 100644 index 0000000..61dd184 Binary files /dev/null and b/pyembroidery/EmbThreadSew.pyc differ diff --git a/pyembroidery/EmbThreadShv.pyc b/pyembroidery/EmbThreadShv.pyc new file mode 100644 index 0000000..49486f0 Binary files /dev/null and b/pyembroidery/EmbThreadShv.pyc differ diff --git a/pyembroidery/EmdReader.pyc b/pyembroidery/EmdReader.pyc new file mode 100644 index 0000000..d9ebb42 Binary files /dev/null and b/pyembroidery/EmdReader.pyc differ diff --git a/pyembroidery/ExpReader.pyc b/pyembroidery/ExpReader.pyc new file mode 100644 index 0000000..b594cfe Binary files /dev/null and b/pyembroidery/ExpReader.pyc differ diff --git a/pyembroidery/ExpWriter.pyc b/pyembroidery/ExpWriter.pyc new file mode 100644 index 0000000..a2b3b3f Binary files /dev/null and b/pyembroidery/ExpWriter.pyc differ diff --git a/pyembroidery/ExyReader.pyc b/pyembroidery/ExyReader.pyc new file mode 100644 index 0000000..8d95c15 Binary files /dev/null and b/pyembroidery/ExyReader.pyc differ diff --git a/pyembroidery/FxyReader.pyc b/pyembroidery/FxyReader.pyc new file mode 100644 index 0000000..d059b5b Binary files /dev/null and b/pyembroidery/FxyReader.pyc differ diff --git a/pyembroidery/GtReader.pyc b/pyembroidery/GtReader.pyc new file mode 100644 index 0000000..f6b781c Binary files /dev/null and b/pyembroidery/GtReader.pyc differ diff --git a/pyembroidery/InbReader.pyc b/pyembroidery/InbReader.pyc new file mode 100644 index 0000000..48be489 Binary files /dev/null and b/pyembroidery/InbReader.pyc differ diff --git a/pyembroidery/JefReader.pyc b/pyembroidery/JefReader.pyc new file mode 100644 index 0000000..046522a Binary files /dev/null and b/pyembroidery/JefReader.pyc differ diff --git a/pyembroidery/JefWriter.pyc b/pyembroidery/JefWriter.pyc new file mode 100644 index 0000000..683f66c Binary files /dev/null and b/pyembroidery/JefWriter.pyc differ diff --git a/pyembroidery/JpxReader.pyc b/pyembroidery/JpxReader.pyc new file mode 100644 index 0000000..4634ccc Binary files /dev/null and b/pyembroidery/JpxReader.pyc differ diff --git a/pyembroidery/KsmReader.pyc b/pyembroidery/KsmReader.pyc new file mode 100644 index 0000000..da6f83e Binary files /dev/null and b/pyembroidery/KsmReader.pyc differ diff --git a/pyembroidery/MaxReader.pyc b/pyembroidery/MaxReader.pyc new file mode 100644 index 0000000..1b70ff5 Binary files /dev/null and b/pyembroidery/MaxReader.pyc differ diff --git a/pyembroidery/MitReader.pyc b/pyembroidery/MitReader.pyc new file mode 100644 index 0000000..a8dec3e Binary files /dev/null and b/pyembroidery/MitReader.pyc differ diff --git a/pyembroidery/NewReader.pyc b/pyembroidery/NewReader.pyc new file mode 100644 index 0000000..0dbc1b4 Binary files /dev/null and b/pyembroidery/NewReader.pyc differ diff --git a/pyembroidery/PcdReader.pyc b/pyembroidery/PcdReader.pyc new file mode 100644 index 0000000..ef87012 Binary files /dev/null and b/pyembroidery/PcdReader.pyc differ diff --git a/pyembroidery/PcmReader.pyc b/pyembroidery/PcmReader.pyc new file mode 100644 index 0000000..7b4da9e Binary files /dev/null and b/pyembroidery/PcmReader.pyc differ diff --git a/pyembroidery/PcqReader.pyc b/pyembroidery/PcqReader.pyc new file mode 100644 index 0000000..06a8e11 Binary files /dev/null and b/pyembroidery/PcqReader.pyc differ diff --git a/pyembroidery/PcsReader.pyc b/pyembroidery/PcsReader.pyc new file mode 100644 index 0000000..6811633 Binary files /dev/null and b/pyembroidery/PcsReader.pyc differ diff --git a/pyembroidery/PecGraphics.pyc b/pyembroidery/PecGraphics.pyc new file mode 100644 index 0000000..906376a Binary files /dev/null and b/pyembroidery/PecGraphics.pyc differ diff --git a/pyembroidery/PecReader.py b/pyembroidery/PecReader.py index 1cec658..5f89caf 100644 --- a/pyembroidery/PecReader.py +++ b/pyembroidery/PecReader.py @@ -151,7 +151,8 @@ def read_pec_stitches(f, out): if jump: out.move(x, y) elif trim: - out.trim(x, y) + out.trim() + out.move(x, y) else: out.stitch(x, y) out.end() diff --git a/pyembroidery/PecReader.pyc b/pyembroidery/PecReader.pyc new file mode 100644 index 0000000..05decef Binary files /dev/null and b/pyembroidery/PecReader.pyc differ diff --git a/pyembroidery/PecWriter.pyc b/pyembroidery/PecWriter.pyc new file mode 100644 index 0000000..22a37cd Binary files /dev/null and b/pyembroidery/PecWriter.pyc differ diff --git a/pyembroidery/PesReader.pyc b/pyembroidery/PesReader.pyc new file mode 100644 index 0000000..2bee39b Binary files /dev/null and b/pyembroidery/PesReader.pyc differ diff --git a/pyembroidery/PesWriter.pyc b/pyembroidery/PesWriter.pyc new file mode 100644 index 0000000..dc92693 Binary files /dev/null and b/pyembroidery/PesWriter.pyc differ diff --git a/pyembroidery/PhbReader.pyc b/pyembroidery/PhbReader.pyc new file mode 100644 index 0000000..e1a5206 Binary files /dev/null and b/pyembroidery/PhbReader.pyc differ diff --git a/pyembroidery/PhcReader.pyc b/pyembroidery/PhcReader.pyc new file mode 100644 index 0000000..65fb5bb Binary files /dev/null and b/pyembroidery/PhcReader.pyc differ diff --git a/pyembroidery/PmvReader.pyc b/pyembroidery/PmvReader.pyc new file mode 100644 index 0000000..dc6c199 Binary files /dev/null and b/pyembroidery/PmvReader.pyc differ diff --git a/pyembroidery/PmvWriter.pyc b/pyembroidery/PmvWriter.pyc new file mode 100644 index 0000000..346e2f3 Binary files /dev/null and b/pyembroidery/PmvWriter.pyc differ diff --git a/pyembroidery/PyEmbroidery.pyc b/pyembroidery/PyEmbroidery.pyc new file mode 100644 index 0000000..6378437 Binary files /dev/null and b/pyembroidery/PyEmbroidery.pyc differ diff --git a/pyembroidery/ReadHelper.pyc b/pyembroidery/ReadHelper.pyc new file mode 100644 index 0000000..125c7be Binary files /dev/null and b/pyembroidery/ReadHelper.pyc differ diff --git a/pyembroidery/SewReader.pyc b/pyembroidery/SewReader.pyc new file mode 100644 index 0000000..3b13229 Binary files /dev/null and b/pyembroidery/SewReader.pyc differ diff --git a/pyembroidery/ShvReader.pyc b/pyembroidery/ShvReader.pyc new file mode 100644 index 0000000..a37f042 Binary files /dev/null and b/pyembroidery/ShvReader.pyc differ