Merge pull request #114 from EmbroidePy/1.4.28

Maintenance

Author: tatarize

__init__.py

@@ -23,8 +23,10 @@
 #     contents = compoundfiles.CompoundFileReader(f).open('Contents')
 #     contents.seek(4)  # file size
 #     art = BytesIO(zlib.decompress(bytes([swizzle(b) for b in contents.read()])))
-#     while True:
-#         b = read_int_8(art)
-#         if b is None or b == -1:
-#             break
-#         print('%02X' % b)
+#     with open('file.bin', 'bw') as f:
+#         while True:
+#             b = read_int_8(art)
+#             if b is None or b == -1:
+#                 break
+#             f.write(bytearray(chr(b), 'utf-8'))
+#             print('%02X' % b)

pyembroidery/ArtReader.py

@@ -1,8 +1,8 @@
-from .ReadHelper import read_int_16le, read_int_8, signed8, signed16
-
+from .ReadHelper import read_int_8, read_int_16le, signed8, signed16
 
 # Do you even embroider .bro?
 
+
 def read_bro_stitches(f, out):
     count = 0
     while True:

pyembroidery/BroReader.py

@@ -5,9 +5,9 @@
 
 def read(f, out, settings=None):
     count = int(f.readline())
-    for i in range(0,count):
+    for i in range(0, count):
         line = f.readline()
-        splits = line.split(',')
+        splits = line.split(",")
         thread = EmbThread()
         thread.catalog_number = splits[0]
         thread.set_color(int(splits[1]), int(splits[2]), int(splits[3]))

pyembroidery/ColReader.py

@@ -7,9 +7,9 @@ def write(pattern, f, settings=None):
     write_string_utf8(f, "%d\r\n" % len(pattern.threadlist))
     index = 0
     for thread in pattern.threadlist:
-        write_string_utf8(f, "%d,%d,%d,%d\r\n" % (
-            index,
-            thread.get_red(),
-            thread.get_green(),
-            thread.get_blue()))
+        write_string_utf8(
+            f,
+            "%d,%d,%d,%d\r\n"
+            % (index, thread.get_red(), thread.get_green(), thread.get_blue()),
+        )
         index += 1

pyembroidery/ColWriter.py

@@ -5,13 +5,14 @@
 
 def read(f, out, settings=None):
     import csv
-    csv_reader = csv.reader(f, delimiter=',')
+
+    csv_reader = csv.reader(f, delimiter=",")
     command_dict = get_command_dictionary()
     for row in csv_reader:
         if len(row) == 0:
             continue
         if "*" in row[0]:
-            split = row[2].split(' ')
+            split = row[2].split(" ")
             command = command_dict[split[0]]
             for sp in split[1:]:
                 if sp[0] == "n":
@@ -35,7 +36,12 @@ def read(f, out, settings=None):
             out.metadata(row[1], row[2])
         elif "$" in row[0]:
             thread_add = {}
-            if len(row) == 7 and len(row[2]) <= 3 and len(row[3]) <= 3 and len(row[4]) <= 3:
+            if (
+                len(row) == 7
+                and len(row[2]) <= 3
+                and len(row[3]) <= 3
+                and len(row[4]) <= 3
+            ):
                 # This is an embroidermodder csv file, I changed the colors and added more details.
                 # [THREAD_NUMBER], [RED], [GREEN], [BLUE], [DESCRIPTION], [CATALOG_NUMBER]\"\n");
                 thread_add["rgb"] = (int(row[2]), int(row[3]), int(row[4]))

pyembroidery/CsvReader.py

@@ -13,8 +13,8 @@ def csv(f, values):
     string = ""
     for v in values:
         if len(string) > 0:
-            string += ','
-        string += ('\"%s\"' % v)
+            string += ","
+        string += '"%s"' % v
     write_string_utf8(f, string + "\n")
 
 
@@ -38,19 +38,19 @@ def write_data(pattern, f):
     width = extends[2] - extends[0]
     height = extends[3] - extends[1]
 
-    csv(f, ('#', '[VAR_NAME]', '[VAR_VALUE]'))
+    csv(f, ("#", "[VAR_NAME]", "[VAR_VALUE]"))
     count_stitches = pattern.count_stitches()
-    csv(f, ('>', 'STITCH_COUNT:', str(count_stitches)))
+    csv(f, (">", "STITCH_COUNT:", str(count_stitches)))
     count_threads = pattern.count_color_changes()
-    csv(f, ('>', 'THREAD_COUNT:', str(count_threads)))
+    csv(f, (">", "THREAD_COUNT:", str(count_threads)))
     count_set_needles = pattern.count_needle_sets()
-    csv(f, ('>', 'NEEDLE_COUNT:', str(count_set_needles)))
-    csv(f, ('>', 'EXTENTS_LEFT:', str(extends[0])))
-    csv(f, ('>', 'EXTENTS_TOP:', str(extends[1])))
-    csv(f, ('>', 'EXTENTS_RIGHT:', str(extends[2])))
-    csv(f, ('>', 'EXTENTS_BOTTOM:', str(extends[3])))
-    csv(f, ('>', 'EXTENTS_WIDTH:', str(width)))
-    csv(f, ('>', 'EXTENTS_HEIGHT:', str(height)))
+    csv(f, (">", "NEEDLE_COUNT:", str(count_set_needles)))
+    csv(f, (">", "EXTENTS_LEFT:", str(extends[0])))
+    csv(f, (">", "EXTENTS_TOP:", str(extends[1])))
+    csv(f, (">", "EXTENTS_RIGHT:", str(extends[2])))
+    csv(f, (">", "EXTENTS_BOTTOM:", str(extends[3])))
+    csv(f, (">", "EXTENTS_WIDTH:", str(width)))
+    csv(f, (">", "EXTENTS_HEIGHT:", str(height)))
 
     stitch_counts = {}
     for s in pattern.stitches:
@@ -67,56 +67,50 @@ def write_data(pattern, f):
                 name = "COMMAND_" + names[the_key]
             except (IndexError, KeyError):
                 name = "COMMAND_UNKNOWN_" + str(the_key)
-            csv(f, (
-                '>',
-                name,
-                str(the_value)
-            ))
+            csv(f, (">", name, str(the_value)))
 
     write_string_utf8(f, "\n")
 
 
 def write_metadata(pattern, f):
     if len(pattern.extras) > 0:
-        csv(f, (
-            '#',
-            '[METADATA_NAME]',
-            '[METADATA]'
-        ))
+        csv(f, ("#", "[METADATA_NAME]", "[METADATA]"))
         for the_key, the_value in pattern.extras.items():
             if isinstance(the_value, tuple):
                 the_value = "\n" + get_graphic_as_string(the_value)
-            csv(f, (
-                '@',
-                str(the_key),
-                str(the_value)
-            ))
+            csv(f, ("@", str(the_key), str(the_value)))
         write_string_utf8(f, "\n")
 
 
 def write_threads(pattern, f):
     if len(pattern.threadlist) > 0:
-        csv(f, (
-            '#',
-            '[THREAD_NUMBER]',
-            '[HEX_COLOR]',
-            '[DESCRIPTION]',
-            '[BRAND]',
-            '[CATALOG_NUMBER]',
-            '[DETAILS]',
-            '[WEIGHT]'
-        ))
+        csv(
+            f,
+            (
+                "#",
+                "[THREAD_NUMBER]",
+                "[HEX_COLOR]",
+                "[DESCRIPTION]",
+                "[BRAND]",
+                "[CATALOG_NUMBER]",
+                "[DETAILS]",
+                "[WEIGHT]",
+            ),
+        )
         for i, thread in enumerate(pattern.threadlist):
-            csv(f, (
-                '$',
-                str(i),
-                thread.hex_color(),
-                thread.description,
-                thread.brand,
-                thread.catalog_number,
-                thread.details,
-                thread.weight,
-            ))
+            csv(
+                f,
+                (
+                    "$",
+                    str(i),
+                    thread.hex_color(),
+                    thread.description,
+                    thread.brand,
+                    thread.catalog_number,
+                    thread.details,
+                    thread.weight,
+                ),
+            )
         write_string_utf8(f, "\n")
 
 
@@ -137,87 +131,74 @@ def decoded_name(names, data):
 
 def write_stitches_displacement(pattern, f):
     names = get_common_name_dictionary()
-    csv(f, (
-        '#',
-        '[STITCH_INDEX]',
-        '[STITCH_TYPE]',
-        '[X]',
-        '[Y]',
-        '[DX]',
-        '[DY]',
-        '[R]',
-        '[ANGLE]'
-    ))
+    csv(
+        f,
+        (
+            "#",
+            "[STITCH_INDEX]",
+            "[STITCH_TYPE]",
+            "[X]",
+            "[Y]",
+            "[DX]",
+            "[DY]",
+            "[R]",
+            "[ANGLE]",
+        ),
+    )
 
     current_x = 0
     current_y = 0
     for i, stitch in enumerate(pattern.stitches):
         name = decoded_name(names, stitch[2])
         dx = stitch[0] - current_x
         dy = stitch[1] - current_y
-        csv(f, (
-            '*',
-            str(i),
-            name,
-            str(stitch[0]),
-            str(stitch[1]),
-            str(dx),
-            str(dy),
-            str(distance(dx, dy)),
-            str(angle(dx, dy))
-        ))
+        csv(
+            f,
+            (
+                "*",
+                str(i),
+                name,
+                str(stitch[0]),
+                str(stitch[1]),
+                str(dx),
+                str(dy),
+                str(distance(dx, dy)),
+                str(angle(dx, dy)),
+            ),
+        )
         current_x = stitch[0]
         current_y = stitch[1]
 
 
 def write_stitches_deltas(pattern, f):
     names = get_common_name_dictionary()
-    csv(f, (
-        '#',
-        '[STITCH_INDEX]',
-        '[STITCH_TYPE]',
-        '[X]',
-        '[Y]',
-        '[DX]',
-        '[DY]'
-    ))
+    csv(f, ("#", "[STITCH_INDEX]", "[STITCH_TYPE]", "[X]", "[Y]", "[DX]", "[DY]"))
     current_x = 0
     current_y = 0
     for i, stitch in enumerate(pattern.stitches):
         name = decoded_name(names, stitch[2])
         dx = stitch[0] - current_x
         dy = stitch[1] - current_y
-        csv(f, (
-            '*',
-            str(i),
-            name,
-            str(stitch[0]),
-            str(stitch[1]),
-            str(dx),
-            str(dy)
-        ))
+        csv(f, ("*", str(i), name, str(stitch[0]), str(stitch[1]), str(dx), str(dy)))
         current_x = stitch[0]
         current_y = stitch[1]
 
 
 def write_stitches(pattern, f):
     names = get_common_name_dictionary()
-    csv(f, (
-        '#',
-        '[STITCH_INDEX]',
-        '[STITCH_TYPE]',
-        '[X]',
-        '[Y]'
-    ))
+    csv(f, ("#", "[STITCH_INDEX]", "[STITCH_TYPE]", "[X]", "[Y]"))
     for i, stitch in enumerate(pattern.stitches):
         name = decoded_name(names, stitch[2])
-        csv(f, (
-            '*',
-            str(i),
-            name,
-            str(stitch[0]),
-            str(stitch[1]),
-        ))
+        csv(
+            f,
+            (
+                "*",
+                str(i),
+                name,
+                str(stitch[0]),
+                str(stitch[1]),
+            ),
+        )
 
 
 def write(pattern, f, settings=None):

pyembroidery/CsvWriter.py

@@ -63,7 +63,9 @@ def read_barudan_dat(f, out):
             if dx != 0 or dy != 0:
                 out.move(dx, dy)
             continue
-        if command == 0x08:  # ww, stop file had proper A8 rather than E8 and displacement
+        if (
+            command == 0x08
+        ):  # ww, stop file had proper A8 rather than E8 and displacement
             # C00 Stop
             out.stop()
             if dx != 0 or dy != 0:

pyembroidery/DatReader.py

@@ -40,12 +40,8 @@ def process_header_info(out, prefix, value):
     elif prefix == "CP":
         out.metadata("copyright", value)
     elif prefix == "TC":
-        values = [x.strip() for x in value.split(',')]
-        out.add_thread({
-            "hex": values[0],
-            "description": value[1],
-            "catalog": value[2]
-        })
+        values = [x.strip() for x in value.split(",")]
+        out.add_thread({"hex": values[0], "description": value[1], "catalog": value[2]})
     else:
         out.metadata(prefix, value)
 
@@ -54,12 +50,14 @@ def dst_read_header(f, out):
     header = f.read(512)
     start = 0
     for i, element in enumerate(header):
-        if element == 13 or element == 10 or element == '\n' or element == '\r':  # 13 =='\r', 10 = '\n'
+        if (
+            element == 13 or element == 10 or element == "\n" or element == "\r"
+        ):  # 13 =='\r', 10 = '\n'
             end = i
             data = header[start:end]
             start = end
             try:
-                line = data.decode('utf8').strip()
+                line = data.decode("utf8").strip()
                 if len(line) > 3:
                     process_header_info(out, line[0:2].strip(), line[3:].strip())
             except UnicodeDecodeError:  # Non-utf8 information. See #83
@@ -94,9 +92,9 @@ def dst_read_stitches(f, out, settings=None):
     clipping = True
     trim_distance = None
     if settings is not None:
-        count_max = settings.get('trim_at', count_max)
+        count_max = settings.get("trim_at", count_max)
         trim_distance = settings.get("trim_distance", trim_distance)
-        clipping = settings.get('clipping', clipping)
+        clipping = settings.get("clipping", clipping)
     if trim_distance is not None:
         trim_distance *= 10  # Pixels per mm. Native units are 1/10 mm.
     out.interpolate_trims(count_max, trim_distance, clipping)