rename more patch references

8 files changed, 28 insertions, 28 deletions

diff --git a/lib/api/stitch_plan.py b/lib/api/stitch_plan.py
index 2011b592..9c9bb4ac 100644
--- a/lib/api/stitch_plan.py
+++ b/lib/api/stitch_plan.py
@@ -5,7 +5,7 @@
 
 from flask import Blueprint, g, jsonify
 
-from ..stitch_plan import patches_to_stitch_plan
+from ..stitch_plan import stitch_groups_to_stitch_plan
 
 
 stitch_plan = Blueprint('stitch_plan', __name__)
@@ -19,6 +19,6 @@ def get_stitch_plan():
     metadata = g.extension.get_inkstitch_metadata()
     collapse_len = metadata['collapse_len_mm']
     patches = g.extension.elements_to_patches(g.extension.elements)
-    stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len)
+    stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
 
     return jsonify(stitch_plan)
diff --git a/lib/extensions/output.py b/lib/extensions/output.py
index e621f1b6..f993f79f 100644
--- a/lib/extensions/output.py
+++ b/lib/extensions/output.py
@@ -8,7 +8,7 @@ import sys
 import tempfile
 
 from ..output import write_embroidery_file
-from ..stitch_plan import patches_to_stitch_plan
+from ..stitch_plan import stitch_groups_to_stitch_plan
 from .base import InkstitchExtension
 
 
@@ -53,7 +53,7 @@ class Output(InkstitchExtension):
         self.metadata = self.get_inkstitch_metadata()
         collapse_len = self.metadata['collapse_len_mm']
         patches = self.elements_to_patches(self.elements)
-        stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len, disable_ties=self.settings.get('laser_mode', False))
+        stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len, disable_ties=self.settings.get('laser_mode', False))
 
         temp_file = tempfile.NamedTemporaryFile(suffix=".%s" % self.file_extension, delete=False)
 
diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py
index 0facdf92..ed796bc7 100644
--- a/lib/extensions/print_pdf.py
+++ b/lib/extensions/print_pdf.py
@@ -23,7 +23,7 @@ from werkzeug.serving import make_server
 from ..gui import open_url
 from ..i18n import get_languages
 from ..i18n import translation as inkstitch_translation
-from ..stitch_plan import patches_to_stitch_plan
+from ..stitch_plan import stitch_groups_to_stitch_plan
 from ..svg import render_stitch_plan
 from ..svg.tags import INKSCAPE_GROUPMODE
 from ..threads import ThreadCatalog
@@ -303,7 +303,7 @@ class Print(InkstitchExtension):
         self.metadata = self.get_inkstitch_metadata()
         collapse_len = self.metadata['collapse_len_mm']
         patches = self.elements_to_patches(self.elements)
-        stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len)
+        stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
         palette = ThreadCatalog().match_and_apply_palette(stitch_plan, self.get_inkstitch_metadata()['thread-palette'])
 
         overview_svg, color_block_svgs = self.render_svgs(stitch_plan, realistic=False)
diff --git a/lib/extensions/stitch_plan_preview.py b/lib/extensions/stitch_plan_preview.py
index 40ad6a2a..ac1a4a67 100644
--- a/lib/extensions/stitch_plan_preview.py
+++ b/lib/extensions/stitch_plan_preview.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
+from ..stitch_plan import stitch_groups_to_stitch_plan
 from ..svg import render_stitch_plan
 from .base import InkstitchExtension
 
@@ -24,7 +24,7 @@ class StitchPlanPreview(InkstitchExtension):
         self.metadata = self.get_inkstitch_metadata()
         collapse_len = self.metadata['collapse_len_mm']
         patches = self.elements_to_patches(self.elements)
-        stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len)
+        stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
         render_stitch_plan(svg, stitch_plan, realistic)
 
         # translate stitch plan to the right side of the canvas
diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py
index 605b4573..3f81af71 100644
--- a/lib/extensions/zip.py
+++ b/lib/extensions/zip.py
@@ -16,7 +16,7 @@ import pyembroidery
 
 from ..i18n import _
 from ..output import write_embroidery_file
-from ..stitch_plan import patches_to_stitch_plan
+from ..stitch_plan import stitch_groups_to_stitch_plan
 from ..threads import ThreadCatalog
 from .base import InkstitchExtension
 
@@ -44,7 +44,7 @@ class Zip(InkstitchExtension):
         self.metadata = self.get_inkstitch_metadata()
         collapse_len = self.metadata['collapse_len_mm']
         patches = self.elements_to_patches(self.elements)
-        stitch_plan = patches_to_stitch_plan(patches, collapse_len=collapse_len)
+        stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
 
         base_file_name = self.get_base_file_name()
         path = tempfile.mkdtemp()
diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py
index 94be66db..d031590b 100644
--- a/lib/gui/simulator.py
+++ b/lib/gui/simulator.py
@@ -11,7 +11,7 @@ import wx
 from wx.lib.intctrl import IntCtrl
 
 from ..i18n import _
-from ..stitch_plan import patches_to_stitch_plan, stitch_plan_from_file
+from ..stitch_plan import stitch_groups_to_stitch_plan, stitch_plan_from_file
 from ..svg import PIXELS_PER_MM
 
 # L10N command label at bottom of simulator window
@@ -789,7 +789,7 @@ class SimulatorPreview(Thread):
             return
 
         if patches and not self.refresh_needed.is_set():
-            stitch_plan = patches_to_stitch_plan(patches)
+            stitch_plan = stitch_groups_to_stitch_plan(patches)
 
             # GUI stuff needs to happen in the main thread, so we ask the main
             # thread to call refresh_simulator().
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)