From c1e6558f7852def419adfbeb087b2194e6030a2c Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 10:57:53 -0400
Subject: rename Patch to StitchGroup

---
 lib/stitch_plan/stitch_plan.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index fc0d3760..d1af5365 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -12,9 +12,9 @@ from .ties import add_ties
 
 def patches_to_stitch_plan(patches, collapse_len=None, disable_ties=False):  # noqa: C901
 
-    """Convert a collection of inkstitch.element.Patch objects to a StitchPlan.
+    """Convert a collection of inkstitch.element.StitchGroup objects to a StitchPlan.
 
-    * applies instructions embedded in the Patch such as trim_after and stop_after
+    * applies instructions embedded in the StitchGroup such as trim_after and stop_after
     * adds tie-ins and tie-offs
     * adds jump-stitches between patches if necessary
     """
-- 
cgit v1.2.3


From 84cb4e2c333d331eb863714797a55589f41e51b2 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 11:21:13 -0400
Subject: move StitchGroup into lib.stitch_plan

---
 lib/stitch_plan/__init__.py     |   4 +-
 lib/stitch_plan/color_block.py  | 142 +++++++++++++++++++++++++++++++++++++++
 lib/stitch_plan/stitch.py       |   3 +-
 lib/stitch_plan/stitch_group.py |  34 ++++++++++
 lib/stitch_plan/stitch_plan.py  | 144 +---------------------------------------
 5 files changed, 182 insertions(+), 145 deletions(-)
 create mode 100644 lib/stitch_plan/color_block.py
 create mode 100644 lib/stitch_plan/stitch_group.py

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/__init__.py b/lib/stitch_plan/__init__.py
index 68301e94..ba4729bb 100644
--- a/lib/stitch_plan/__init__.py
+++ b/lib/stitch_plan/__init__.py
@@ -3,6 +3,8 @@
 # Copyright (c) 2010 Authors
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
-from .stitch_plan import patches_to_stitch_plan, StitchPlan, ColorBlock
+from .stitch_plan import patches_to_stitch_plan, StitchPlan
+from .color_block import ColorBlock
+from .stitch_group import StitchGroup
 from .stitch import Stitch
 from .read_file import stitch_plan_from_file
diff --git a/lib/stitch_plan/color_block.py b/lib/stitch_plan/color_block.py
new file mode 100644
index 00000000..1cff8aa4
--- /dev/null
+++ b/lib/stitch_plan/color_block.py
@@ -0,0 +1,142 @@
+from .stitch import Stitch
+from ..threads import ThreadColor
+from ..utils.geometry import Point
+from ..svg import PIXELS_PER_MM
+
+
+class ColorBlock(object):
+    """Holds a set of stitches, all with the same thread color."""
+
+    def __init__(self, color=None, stitches=None):
+        self.color = color
+        self.stitches = stitches or []
+
+    def __iter__(self):
+        return iter(self.stitches)
+
+    def __len__(self):
+        return len(self.stitches)
+
+    def __repr__(self):
+        return "ColorBlock(%s, %s)" % (self.color, self.stitches)
+
+    def __getitem__(self, item):
+        return self.stitches[item]
+
+    def __delitem__(self, item):
+        del self.stitches[item]
+
+    def __json__(self):
+        return dict(color=self.color, stitches=self.stitches)
+
+    def has_color(self):
+        return self._color is not None
+
+    @property
+    def color(self):
+        return self._color
+
+    @color.setter
+    def color(self, value):
+        if isinstance(value, ThreadColor):
+            self._color = value
+        elif value is None:
+            self._color = None
+        else:
+            self._color = ThreadColor(value)
+
+    @property
+    def last_stitch(self):
+        if self.stitches:
+            return self.stitches[-1]
+        else:
+            return None
+
+    @property
+    def num_stitches(self):
+        """Number of stitches in this color block."""
+        return len(self.stitches)
+
+    @property
+    def num_trims(self):
+        """Number of trims in this color block."""
+
+        return sum(1 for stitch in self if stitch.trim)
+
+    @property
+    def stop_after(self):
+        if self.last_stitch is not None:
+            return self.last_stitch.stop
+        else:
+            return False
+
+    @property
+    def trim_after(self):
+        # If there's a STOP, it will be at the end.  We still want to return
+        # True.
+        for stitch in reversed(self.stitches):
+            if stitch.stop or stitch.jump:
+                continue
+            elif stitch.trim:
+                return True
+            else:
+                break
+
+        return False
+
+    def filter_duplicate_stitches(self):
+        if not self.stitches:
+            return
+
+        stitches = [self.stitches[0]]
+
+        for stitch in self.stitches[1:]:
+            if stitches[-1].jump or stitch.stop or stitch.trim or stitch.color_change:
+                # Don't consider jumps, stops, color changes, or trims as candidates for filtering
+                pass
+            else:
+                length = (stitch - stitches[-1]).length()
+                if length <= 0.1 * PIXELS_PER_MM:
+                    # duplicate stitch, skip this one
+                    continue
+
+            stitches.append(stitch)
+
+        self.stitches = stitches
+
+    def add_stitch(self, *args, **kwargs):
+        if not args:
+            # They're adding a command, e.g. `color_block.add_stitch(stop=True)``.
+            # Use the position from the last stitch.
+            if self.last_stitch:
+                args = (self.last_stitch.x, self.last_stitch.y)
+            else:
+                raise ValueError("internal error: can't add a command to an empty stitch block")
+
+        if isinstance(args[0], Stitch):
+            self.stitches.append(args[0])
+        elif isinstance(args[0], Point):
+            self.stitches.append(Stitch(args[0].x, args[0].y, *args[1:], **kwargs))
+        else:
+            if not args and self.last_stitch:
+                args = (self.last_stitch.x, self.last_stitch.y)
+            self.stitches.append(Stitch(*args, **kwargs))
+
+    def add_stitches(self, stitches, *args, **kwargs):
+        for stitch in stitches:
+            if isinstance(stitch, (Stitch, Point)):
+                self.add_stitch(stitch, *args, **kwargs)
+            else:
+                self.add_stitch(*stitch, *args, **kwargs)
+
+    def replace_stitches(self, stitches):
+        self.stitches = stitches
+
+    @property
+    def bounding_box(self):
+        minx = min(stitch.x for stitch in self)
+        miny = min(stitch.y for stitch in self)
+        maxx = max(stitch.x for stitch in self)
+        maxy = max(stitch.y for stitch in self)
+
+        return minx, miny, maxx, maxy
diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py
index ae6fa480..85d71935 100644
--- a/lib/stitch_plan/stitch.py
+++ b/lib/stitch_plan/stitch.py
@@ -8,8 +8,7 @@ from ..utils.geometry import Point
 
 class Stitch(Point):
     def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, tie_modus=0, no_ties=False):
-        self.x = x
-        self.y = y
+        Point.__init__(self, x, y)
         self.color = color
         self.jump = jump
         self.trim = trim
diff --git a/lib/stitch_plan/stitch_group.py b/lib/stitch_plan/stitch_group.py
new file mode 100644
index 00000000..d1e6bae7
--- /dev/null
+++ b/lib/stitch_plan/stitch_group.py
@@ -0,0 +1,34 @@
+class StitchGroup:
+    """A collection of Stitch objects with attached instructions.
+
+    StitchGroups will later be combined to make ColorBlocks, which in turn are
+    combined to make a StitchPlan.  Jump stitches are allowed between
+    StitchGroups, but not between stitches inside a StitchGroup.  This means
+    that EmbroideryElement classes should produce multiple StitchGroups only if
+    they want to allow for the possibility of jump stitches to be added in
+    between them by the stitch plan generation code.
+    """
+
+    def __init__(self, color=None, stitches=None, trim_after=False, stop_after=False, tie_modus=0, stitch_as_is=False):
+        self.color = color
+        self.stitches = stitches or []
+        self.trim_after = trim_after
+        self.stop_after = stop_after
+        self.tie_modus = tie_modus
+        self.stitch_as_is = stitch_as_is
+
+    def __add__(self, other):
+        if isinstance(other, StitchGroup):
+            return StitchGroup(self.color, self.stitches + other.stitches)
+        else:
+            raise TypeError("StitchGroup can only be added to another StitchGroup")
+
+    def __len__(self):
+        # This method allows `len(patch)` and `if patch:
+        return len(self.stitches)
+
+    def add_stitch(self, stitch):
+        self.stitches.append(stitch)
+
+    def reverse(self):
+        return StitchGroup(self.color, self.stitches[::-1])
diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index d1af5365..f5981fb9 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -3,11 +3,9 @@
 # Copyright (c) 2010 Authors
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
-from ..svg import PIXELS_PER_MM
-from ..threads import ThreadColor
-from ..utils.geometry import Point
-from .stitch import Stitch
 from .ties import add_ties
+from .color_block import ColorBlock
+from ..svg import PIXELS_PER_MM
 
 
 def patches_to_stitch_plan(patches, collapse_len=None, disable_ties=False):  # noqa: C901
@@ -168,141 +166,3 @@ class StitchPlan(object):
             return self.color_blocks[-1]
         else:
             return None
-
-
-class ColorBlock(object):
-    """Holds a set of stitches, all with the same thread color."""
-
-    def __init__(self, color=None, stitches=None):
-        self.color = color
-        self.stitches = stitches or []
-
-    def __iter__(self):
-        return iter(self.stitches)
-
-    def __len__(self):
-        return len(self.stitches)
-
-    def __repr__(self):
-        return "ColorBlock(%s, %s)" % (self.color, self.stitches)
-
-    def __getitem__(self, item):
-        return self.stitches[item]
-
-    def __delitem__(self, item):
-        del self.stitches[item]
-
-    def __json__(self):
-        return dict(color=self.color, stitches=self.stitches)
-
-    def has_color(self):
-        return self._color is not None
-
-    @property
-    def color(self):
-        return self._color
-
-    @color.setter
-    def color(self, value):
-        if isinstance(value, ThreadColor):
-            self._color = value
-        elif value is None:
-            self._color = None
-        else:
-            self._color = ThreadColor(value)
-
-    @property
-    def last_stitch(self):
-        if self.stitches:
-            return self.stitches[-1]
-        else:
-            return None
-
-    @property
-    def num_stitches(self):
-        """Number of stitches in this color block."""
-        return len(self.stitches)
-
-    @property
-    def num_trims(self):
-        """Number of trims in this color block."""
-
-        return sum(1 for stitch in self if stitch.trim)
-
-    @property
-    def stop_after(self):
-        if self.last_stitch is not None:
-            return self.last_stitch.stop
-        else:
-            return False
-
-    @property
-    def trim_after(self):
-        # If there's a STOP, it will be at the end.  We still want to return
-        # True.
-        for stitch in reversed(self.stitches):
-            if stitch.stop or stitch.jump:
-                continue
-            elif stitch.trim:
-                return True
-            else:
-                break
-
-        return False
-
-    def filter_duplicate_stitches(self):
-        if not self.stitches:
-            return
-
-        stitches = [self.stitches[0]]
-
-        for stitch in self.stitches[1:]:
-            if stitches[-1].jump or stitch.stop or stitch.trim or stitch.color_change:
-                # Don't consider jumps, stops, color changes, or trims as candidates for filtering
-                pass
-            else:
-                length = (stitch - stitches[-1]).length()
-                if length <= 0.1 * PIXELS_PER_MM:
-                    # duplicate stitch, skip this one
-                    continue
-
-            stitches.append(stitch)
-
-        self.stitches = stitches
-
-    def add_stitch(self, *args, **kwargs):
-        if not args:
-            # They're adding a command, e.g. `color_block.add_stitch(stop=True)``.
-            # Use the position from the last stitch.
-            if self.last_stitch:
-                args = (self.last_stitch.x, self.last_stitch.y)
-            else:
-                raise ValueError("internal error: can't add a command to an empty stitch block")
-
-        if isinstance(args[0], Stitch):
-            self.stitches.append(args[0])
-        elif isinstance(args[0], Point):
-            self.stitches.append(Stitch(args[0].x, args[0].y, *args[1:], **kwargs))
-        else:
-            if not args and self.last_stitch:
-                args = (self.last_stitch.x, self.last_stitch.y)
-            self.stitches.append(Stitch(*args, **kwargs))
-
-    def add_stitches(self, stitches, *args, **kwargs):
-        for stitch in stitches:
-            if isinstance(stitch, (Stitch, Point)):
-                self.add_stitch(stitch, *args, **kwargs)
-            else:
-                self.add_stitch(*(list(stitch) + args), **kwargs)
-
-    def replace_stitches(self, stitches):
-        self.stitches = stitches
-
-    @property
-    def bounding_box(self):
-        minx = min(stitch.x for stitch in self)
-        miny = min(stitch.y for stitch in self)
-        maxx = max(stitch.x for stitch in self)
-        maxy = max(stitch.y for stitch in self)
-
-        return minx, miny, maxx, maxy
-- 
cgit v1.2.3


From 8fc42628e285160f8f747772b6d5674a1bf23a09 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 11:37:17 -0400
Subject: add tags capability

---
 lib/stitch_plan/stitch.py | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py
index 85d71935..ea4423fa 100644
--- a/lib/stitch_plan/stitch.py
+++ b/lib/stitch_plan/stitch.py
@@ -7,7 +7,9 @@ from ..utils.geometry import Point
 
 
 class Stitch(Point):
-    def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, tie_modus=0, no_ties=False):
+    """A stitch is a Point with extra information telling how to sew it."""
+
+    def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, tie_modus=0, no_ties=False, tags=None):
         Point.__init__(self, x, y)
         self.color = color
         self.jump = jump
@@ -16,6 +18,9 @@ class Stitch(Point):
         self.color_change = color_change
         self.tie_modus = tie_modus
         self.no_ties = no_ties
+        self.tags = set()
+
+        self.add_tags(tags or [])
 
         # Allow creating a Stitch from a Point
         if isinstance(x, Point):
@@ -34,8 +39,32 @@ class Stitch(Point):
                                                                "NO TIES" if self.no_ties else " ",
                                                                "COLOR CHANGE" if self.color_change else " ")
 
+    def add_tags(self, tags):
+        for tag in tags:
+            self.add_tag(tag)
+
+    def add_tag(self, tag):
+        """Store arbitrary information about a stitch.
+
+        Tags can be used to store any information about a stitch.  This can be
+        used by other parts of the code to keep track of where a Stitch came
+        from.  The Stitch treats tags as opaque.
+
+        Use strings as tags.  Python automatically optimizes this kind of
+        usage of strings, and it doesn't have to constantly do string
+        comparisons.  More details here:
+
+          https://stackabuse.com/guide-to-string-interning-in-python
+        """
+        self.tags.add(tag)
+
+    def has_tag(self, tag):
+        return tag in self.tags
+
     def copy(self):
-        return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.tie_modus, self.no_ties)
+        return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.tie_modus, self.no_ties, self.tags)
 
     def __json__(self):
-        return vars(self)
+        attributes = dict(vars(self))
+        attributes['tags'] = list(attributes['tags'])
+        return attributes
-- 
cgit v1.2.3


From 28e394b2ae7f4dabcc331d456103d4b3d0efae84 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 12:00:56 -0400
Subject: StitchGroups now contain only Stitches

---
 lib/stitch_plan/color_block.py  |  6 +-----
 lib/stitch_plan/stitch.py       | 20 +++++++++++++-------
 lib/stitch_plan/stitch_group.py | 18 ++++++++++++++++--
 3 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/color_block.py b/lib/stitch_plan/color_block.py
index 1cff8aa4..4ff33cdf 100644
--- a/lib/stitch_plan/color_block.py
+++ b/lib/stitch_plan/color_block.py
@@ -112,15 +112,11 @@ class ColorBlock(object):
                 args = (self.last_stitch.x, self.last_stitch.y)
             else:
                 raise ValueError("internal error: can't add a command to an empty stitch block")
-
+            self.stitches.append(Stitch(*args, **kwargs))
         if isinstance(args[0], Stitch):
             self.stitches.append(args[0])
         elif isinstance(args[0], Point):
             self.stitches.append(Stitch(args[0].x, args[0].y, *args[1:], **kwargs))
-        else:
-            if not args and self.last_stitch:
-                args = (self.last_stitch.x, self.last_stitch.y)
-            self.stitches.append(Stitch(*args, **kwargs))
 
     def add_stitches(self, stitches, *args, **kwargs):
         for stitch in stitches:
diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py
index ea4423fa..f163d09c 100644
--- a/lib/stitch_plan/stitch.py
+++ b/lib/stitch_plan/stitch.py
@@ -4,13 +4,25 @@
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
 from ..utils.geometry import Point
+from copy import deepcopy
 
 
 class Stitch(Point):
     """A stitch is a Point with extra information telling how to sew it."""
 
     def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, tie_modus=0, no_ties=False, tags=None):
-        Point.__init__(self, x, y)
+        if isinstance(x, Stitch):
+            # Allow creating a Stitch from another Stitch.  Attributes passed as
+            # arguments will override any existing attributes.
+            vars(self).update(deepcopy(vars(x)))
+        elif isinstance(x, Point):
+            # Allow creating a Stitch from a Point
+            point = x
+            self.x = point.x
+            self.y = point.y
+        else:
+            Point.__init__(self, x, y)
+
         self.color = color
         self.jump = jump
         self.trim = trim
@@ -22,12 +34,6 @@ class Stitch(Point):
 
         self.add_tags(tags or [])
 
-        # Allow creating a Stitch from a Point
-        if isinstance(x, Point):
-            point = x
-            self.x = point.x
-            self.y = point.y
-
     def __repr__(self):
         return "Stitch(%s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.x,
                                                                self.y,
diff --git a/lib/stitch_plan/stitch_group.py b/lib/stitch_plan/stitch_group.py
index d1e6bae7..548ad892 100644
--- a/lib/stitch_plan/stitch_group.py
+++ b/lib/stitch_plan/stitch_group.py
@@ -1,5 +1,8 @@
+from .stitch import Stitch
+
+
 class StitchGroup:
-    """A collection of Stitch objects with attached instructions.
+    """A collection of Stitch objects with attached instructions and attributes.
 
     StitchGroups will later be combined to make ColorBlocks, which in turn are
     combined to make a StitchPlan.  Jump stitches are allowed between
@@ -11,11 +14,14 @@ class StitchGroup:
 
     def __init__(self, color=None, stitches=None, trim_after=False, stop_after=False, tie_modus=0, stitch_as_is=False):
         self.color = color
-        self.stitches = stitches or []
         self.trim_after = trim_after
         self.stop_after = stop_after
         self.tie_modus = tie_modus
         self.stitch_as_is = stitch_as_is
+        self.stitches = []
+
+        if stitches:
+            self.add_stitches(stitches)
 
     def __add__(self, other):
         if isinstance(other, StitchGroup):
@@ -27,7 +33,15 @@ class StitchGroup:
         # This method allows `len(patch)` and `if patch:
         return len(self.stitches)
 
+    def add_stitches(self, stitches):
+        for stitch in stitches:
+            self.add_stitch(stitch)
+
     def add_stitch(self, stitch):
+        if not isinstance(stitch, Stitch):
+            # probably a Point
+            stitch = Stitch(stitch)
+
         self.stitches.append(stitch)
 
     def reverse(self):
-- 
cgit v1.2.3


From 173548dee569b0503ba1ddeba5cb8aae74c44c46 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 12:18:55 -0400
Subject: rename more patch references

---
 lib/stitch_plan/__init__.py    |  2 +-
 lib/stitch_plan/stitch_plan.py | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/__init__.py b/lib/stitch_plan/__init__.py
index ba4729bb..d4b43ace 100644
--- a/lib/stitch_plan/__init__.py
+++ b/lib/stitch_plan/__init__.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2010 Authors
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
-from .stitch_plan import patches_to_stitch_plan, StitchPlan
+from .stitch_plan import stitch_groups_to_stitch_plan, StitchPlan
 from .color_block import ColorBlock
 from .stitch_group import StitchGroup
 from .stitch import Stitch
diff --git a/lib/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py
index f5981fb9..7e7621c1 100644
--- a/lib/stitch_plan/stitch_plan.py
+++ b/lib/stitch_plan/stitch_plan.py
@@ -8,49 +8,49 @@ from .color_block import ColorBlock
 from ..svg import PIXELS_PER_MM
 
 
-def patches_to_stitch_plan(patches, collapse_len=None, disable_ties=False):  # noqa: C901
+def stitch_groups_to_stitch_plan(stitch_groups, collapse_len=None, disable_ties=False):  # noqa: C901
 
-    """Convert a collection of inkstitch.element.StitchGroup objects to a StitchPlan.
+    """Convert a collection of StitchGroups to a StitchPlan.
 
     * applies instructions embedded in the StitchGroup such as trim_after and stop_after
     * adds tie-ins and tie-offs
-    * adds jump-stitches between patches if necessary
+    * adds jump-stitches between stitch_group if necessary
     """
 
     if collapse_len is None:
         collapse_len = 3.0
     collapse_len = collapse_len * PIXELS_PER_MM
     stitch_plan = StitchPlan()
-    color_block = stitch_plan.new_color_block(color=patches[0].color)
+    color_block = stitch_plan.new_color_block(color=stitch_groups[0].color)
 
-    for patch in patches:
-        if not patch.stitches:
+    for stitch_group in stitch_groups:
+        if not stitch_group.stitches:
             continue
 
-        if color_block.color != patch.color:
+        if color_block.color != stitch_group.color:
             if len(color_block) == 0:
                 # We just processed a stop, which created a new color block.
                 # We'll just claim this new block as ours:
-                color_block.color = patch.color
+                color_block.color = stitch_group.color
             else:
                 # end the previous block with a color change
                 color_block.add_stitch(color_change=True)
 
                 # make a new block of our color
-                color_block = stitch_plan.new_color_block(color=patch.color)
+                color_block = stitch_plan.new_color_block(color=stitch_group.color)
 
                 # always start a color with a JUMP to the first stitch position
-                color_block.add_stitch(patch.stitches[0], jump=True)
+                color_block.add_stitch(stitch_group.stitches[0], jump=True)
         else:
-            if len(color_block) and (patch.stitches[0] - color_block.stitches[-1]).length() > collapse_len:
-                color_block.add_stitch(patch.stitches[0], jump=True)
+            if len(color_block) and (stitch_group.stitches[0] - color_block.stitches[-1]).length() > collapse_len:
+                color_block.add_stitch(stitch_group.stitches[0], jump=True)
 
-        color_block.add_stitches(stitches=patch.stitches, tie_modus=patch.tie_modus, no_ties=patch.stitch_as_is)
+        color_block.add_stitches(stitches=stitch_group.stitches, tie_modus=stitch_group.tie_modus, no_ties=stitch_group.stitch_as_is)
 
-        if patch.trim_after:
+        if stitch_group.trim_after:
             color_block.add_stitch(trim=True)
 
-        if patch.stop_after:
+        if stitch_group.stop_after:
             color_block.add_stitch(stop=True)
             color_block = stitch_plan.new_color_block(color_block.color)
 
-- 
cgit v1.2.3


From 3b7994c01add202c8f3475956f093a143890160f Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sat, 7 Aug 2021 12:38:41 -0400
Subject: add headers

---
 lib/stitch_plan/color_block.py  | 5 +++++
 lib/stitch_plan/stitch_group.py | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/color_block.py b/lib/stitch_plan/color_block.py
index 4ff33cdf..86edaff2 100644
--- a/lib/stitch_plan/color_block.py
+++ b/lib/stitch_plan/color_block.py
@@ -1,3 +1,8 @@
+# Authors: see git history
+#
+# Copyright (c) 2010 Authors
+# Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
+
 from .stitch import Stitch
 from ..threads import ThreadColor
 from ..utils.geometry import Point
diff --git a/lib/stitch_plan/stitch_group.py b/lib/stitch_plan/stitch_group.py
index 548ad892..ee077f26 100644
--- a/lib/stitch_plan/stitch_group.py
+++ b/lib/stitch_plan/stitch_group.py
@@ -1,3 +1,8 @@
+# Authors: see git history
+#
+# Copyright (c) 2010 Authors
+# Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
+
 from .stitch import Stitch
 
 
-- 
cgit v1.2.3


From dd865008356d1e04b29a5eb59a8480900f255628 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 15 Aug 2021 17:24:59 -0400
Subject: keep underlay, underpath, and border travel

---
 lib/stitch_plan/stitch_group.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib/stitch_plan')

diff --git a/lib/stitch_plan/stitch_group.py b/lib/stitch_plan/stitch_group.py
index ee077f26..98d9799e 100644
--- a/lib/stitch_plan/stitch_group.py
+++ b/lib/stitch_plan/stitch_group.py
@@ -17,7 +17,7 @@ class StitchGroup:
     between them by the stitch plan generation code.
     """
 
-    def __init__(self, color=None, stitches=None, trim_after=False, stop_after=False, tie_modus=0, stitch_as_is=False):
+    def __init__(self, color=None, stitches=None, trim_after=False, stop_after=False, tie_modus=0, stitch_as_is=False, tags=None):
         self.color = color
         self.trim_after = trim_after
         self.stop_after = stop_after
@@ -28,6 +28,9 @@ class StitchGroup:
         if stitches:
             self.add_stitches(stitches)
 
+        if tags:
+            self.add_tags(tags)
+
     def __add__(self, other):
         if isinstance(other, StitchGroup):
             return StitchGroup(self.color, self.stitches + other.stitches)
@@ -51,3 +54,11 @@ class StitchGroup:
 
     def reverse(self):
         return StitchGroup(self.color, self.stitches[::-1])
+
+    def add_tags(self, tags):
+        for stitch in self.stitches:
+            stitch.add_tags(tags)
+
+    def add_tag(self, tag):
+        for stitch in self.stitches:
+            stitch.add_tag(tag)
-- 
cgit v1.2.3