rename Patch to StitchGroup

8 files changed, 25 insertions, 25 deletions

diff --git a/lib/elements/auto_fill.py b/lib/elements/auto_fill.py
index 69533f62..29ca3545 100644
--- a/lib/elements/auto_fill.py
+++ b/lib/elements/auto_fill.py
@@ -12,7 +12,7 @@ from shapely import geometry as shgeo
 from ..i18n import _
 from ..stitches import auto_fill
 from ..utils import cache, version
-from .element import Patch, param
+from .element import StitchGroup, param
 from .fill import Fill
 from .validation import ValidationWarning
 
@@ -260,7 +260,7 @@ class AutoFill(Fill):
 
             self.fatal(message)
 
-        return [Patch(stitches=stitches, color=self.color)]
+        return [StitchGroup(stitches=stitches, color=self.color)]
 
     def validation_warnings(self):
         if self.shape.area < 20:
diff --git a/lib/elements/element.py b/lib/elements/element.py
index dc466fbf..bcb59bf4 100644
--- a/lib/elements/element.py
+++ b/lib/elements/element.py
@@ -20,7 +20,7 @@ from ..svg.tags import (EMBROIDERABLE_TAGS, INKSCAPE_LABEL, INKSTITCH_ATTRIBS,
 from ..utils import Point, cache
 
 
-class Patch:
+class StitchGroup:
     """A raw collection of stitches with attached instructions."""
 
     def __init__(self, color=None, stitches=None, trim_after=False, stop_after=False, tie_modus=0, stitch_as_is=False):
@@ -32,10 +32,10 @@ class Patch:
         self.stitch_as_is = stitch_as_is
 
     def __add__(self, other):
-        if isinstance(other, Patch):
-            return Patch(self.color, self.stitches + other.stitches)
+        if isinstance(other, StitchGroup):
+            return StitchGroup(self.color, self.stitches + other.stitches)
         else:
-            raise TypeError("Patch can only be added to another Patch")
+            raise TypeError("StitchGroup can only be added to another StitchGroup")
 
     def __len__(self):
         # This method allows `len(patch)` and `if patch:
@@ -45,7 +45,7 @@ class Patch:
         self.stitches.append(stitch)
 
     def reverse(self):
-        return Patch(self.color, self.stitches[::-1])
+        return StitchGroup(self.color, self.stitches[::-1])
 
 
 class Param(object):
diff --git a/lib/elements/fill.py b/lib/elements/fill.py
index b6799165..75a86ffd 100644
--- a/lib/elements/fill.py
+++ b/lib/elements/fill.py
@@ -14,7 +14,7 @@ from ..i18n import _
 from ..stitches import legacy_fill
 from ..svg import PIXELS_PER_MM
 from ..utils import cache
-from .element import EmbroideryElement, Patch, param
+from .element import EmbroideryElement, StitchGroup, param
 from .validation import ValidationError
 
 
@@ -198,4 +198,4 @@ class Fill(EmbroideryElement):
                                    self.flip,
                                    self.staggers,
                                    self.skip_last)
-        return [Patch(stitches=stitch_list, color=self.color) for stitch_list in stitch_lists]
+        return [StitchGroup(stitches=stitch_list, color=self.color) for stitch_list in stitch_lists]
diff --git a/lib/elements/polyline.py b/lib/elements/polyline.py
index 5ea00508..f63dfc3b 100644
--- a/lib/elements/polyline.py
+++ b/lib/elements/polyline.py
@@ -9,7 +9,7 @@ from shapely import geometry as shgeo
 from ..i18n import _
 from ..utils import cache
 from ..utils.geometry import Point
-from .element import EmbroideryElement, Patch, param
+from .element import EmbroideryElement, StitchGroup, param
 from .validation import ValidationWarning
 
 
@@ -101,7 +101,7 @@ class Polyline(EmbroideryElement):
         yield PolylineWarning(self.points[0])
 
     def to_patches(self, last_patch):
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
 
         for stitch in self.stitches:
             patch.add_stitch(Point(*stitch))
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index 02d7a36c..3d0e7ff5 100644
--- a/lib/elements/satin_column.py
+++ b/lib/elements/satin_column.py
@@ -14,7 +14,7 @@ from shapely.ops import nearest_points
 from ..i18n import _
 from ..svg import line_strings_to_csp, point_lists_to_csp
 from ..utils import Point, cache, collapse_duplicate_point, cut
-from .element import EmbroideryElement, Patch, param
+from .element import EmbroideryElement, StitchGroup, param
 from .validation import ValidationError, ValidationWarning
 
 
@@ -716,7 +716,7 @@ class SatinColumn(EmbroideryElement):
         # other.
         forward, back = self.plot_points_on_rails(self.contour_underlay_stitch_length,
                                                   -self.contour_underlay_inset)
-        return Patch(color=self.color, stitches=(forward + list(reversed(back))))
+        return StitchGroup(color=self.color, stitches=(forward + list(reversed(back))))
 
     def do_center_walk(self):
         # Center walk underlay is just a running stitch down and back on the
@@ -725,7 +725,7 @@ class SatinColumn(EmbroideryElement):
         # Do it like contour underlay, but inset all the way to the center.
         forward, back = self.plot_points_on_rails(self.center_walk_underlay_stitch_length,
                                                   -100000)
-        return Patch(color=self.color, stitches=(forward + list(reversed(back))))
+        return StitchGroup(color=self.color, stitches=(forward + list(reversed(back))))
 
     def do_zigzag_underlay(self):
         # zigzag underlay, usually done at a much lower density than the
@@ -738,7 +738,7 @@ class SatinColumn(EmbroideryElement):
         # "German underlay" described here:
         #   http://www.mrxstitch.com/underlay-what-lies-beneath-machine-embroidery/
 
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
 
         sides = self.plot_points_on_rails(self.zigzag_underlay_spacing / 2.0,
                                           -self.zigzag_underlay_inset)
@@ -767,7 +767,7 @@ class SatinColumn(EmbroideryElement):
         if self.max_stitch_length:
             return self.do_split_stitch()
 
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
 
         sides = self.plot_points_on_rails(self.zigzag_spacing, self.pull_compensation)
 
@@ -785,7 +785,7 @@ class SatinColumn(EmbroideryElement):
 
         # print >> dbg, "satin", self.zigzag_spacing, self.pull_compensation
 
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
 
         sides = self.plot_points_on_rails(self.zigzag_spacing, self.pull_compensation)
 
@@ -800,7 +800,7 @@ class SatinColumn(EmbroideryElement):
 
     def do_split_stitch(self):
         # stitches exceeding the maximum stitch length will be divided into equal parts through additional stitches
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
         sides = self.plot_points_on_rails(self.zigzag_spacing, self.pull_compensation)
         for i, (left, right) in enumerate(zip(*sides)):
             patch.add_stitch(left)
@@ -834,7 +834,7 @@ class SatinColumn(EmbroideryElement):
         # beziers.  The boundary points between beziers serve as "checkpoints",
         # allowing the user to control how the zigzags flow around corners.
 
-        patch = Patch(color=self.color)
+        patch = StitchGroup(color=self.color)
 
         if self.center_walk_underlay:
             patch += self.do_center_walk()
diff --git a/lib/elements/stroke.py b/lib/elements/stroke.py
index cf034d21..edd5525a 100644
--- a/lib/elements/stroke.py
+++ b/lib/elements/stroke.py
@@ -11,7 +11,7 @@ from ..i18n import _
 from ..stitches import bean_stitch, running_stitch
 from ..svg import parse_length_with_units
 from ..utils import Point, cache
-from .element import EmbroideryElement, Patch, param
+from .element import EmbroideryElement, StitchGroup, param
 
 warned_about_legacy_running_stitch = False
 
@@ -190,7 +190,7 @@ class Stroke(EmbroideryElement):
 
         stitches = running_stitch(repeated_path, stitch_length)
 
-        return Patch(self.color, stitches)
+        return StitchGroup(self.color, stitches)
 
     def to_patches(self, last_patch):
         patches = []
@@ -198,7 +198,7 @@ class Stroke(EmbroideryElement):
         for path in self.paths:
             path = [Point(x, y) for x, y in path]
             if self.manual_stitch_mode:
-                patch = Patch(color=self.color, stitches=path, stitch_as_is=True)
+                patch = StitchGroup(color=self.color, stitches=path, stitch_as_is=True)
             elif self.is_running_stitch():
                 patch = self.running_stitch(path, self.running_stitch_length)
 
diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py
index 3e1f68c5..94be66db 100644
--- a/lib/gui/simulator.py
+++ b/lib/gui/simulator.py
@@ -733,7 +733,7 @@ class SimulatorPreview(Thread):
         The parent is expected to be a wx.Window and also implement the following methods:
 
             def generate_patches(self, abort_event):
-                Produce an list of Patch instances.  This method will be
+                Produce an list of StitchGroup instances.  This method will be
                 invoked in a background thread and it is expected that it may
                 take awhile.
 
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
     """