summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2021-08-07 12:37:17 -0400
committerLex Neva <github.com@lexneva.name>2021-08-07 12:37:17 -0400
commit923ff3cb97c764f9999ac908c9b3aa321fd02301 (patch)
treeb266ad119182475ced5797857bb53ad31d76f34b
parentb1af926ea6018b869d2401aeece46318b88d9a5d (diff)
fix more patch references
-rw-r--r--lib/api/stitch_plan.py2
-rw-r--r--lib/elements/auto_fill.py2
-rw-r--r--lib/elements/clone.py4
-rw-r--r--lib/elements/element.py6
-rw-r--r--lib/elements/empty_d_object.py2
-rw-r--r--lib/elements/fill.py2
-rw-r--r--lib/elements/image.py2
-rw-r--r--lib/elements/pattern.py2
-rw-r--r--lib/elements/polyline.py2
-rw-r--r--lib/elements/satin_column.py2
-rw-r--r--lib/elements/stroke.py2
-rw-r--r--lib/elements/text.py2
-rw-r--r--lib/extensions/base.py2
-rw-r--r--lib/extensions/output.py2
-rw-r--r--lib/extensions/print_pdf.py2
-rw-r--r--lib/extensions/stitch_plan_preview.py2
-rw-r--r--lib/extensions/zip.py2
17 files changed, 20 insertions, 20 deletions
diff --git a/lib/api/stitch_plan.py b/lib/api/stitch_plan.py
index 9c9bb4ac..6d64d781 100644
--- a/lib/api/stitch_plan.py
+++ b/lib/api/stitch_plan.py
@@ -18,7 +18,7 @@ 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)
+ patches = g.extension.elements_to_stitch_groups(g.extension.elements)
stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
return jsonify(stitch_plan)
diff --git a/lib/elements/auto_fill.py b/lib/elements/auto_fill.py
index e72af1ef..f5558cbb 100644
--- a/lib/elements/auto_fill.py
+++ b/lib/elements/auto_fill.py
@@ -213,7 +213,7 @@ class AutoFill(Fill):
else:
return None
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
stitches = []
starting_point = self.get_starting_point(last_patch)
diff --git a/lib/elements/clone.py b/lib/elements/clone.py
index 6dafa63d..a9e10d94 100644
--- a/lib/elements/clone.py
+++ b/lib/elements/clone.py
@@ -93,7 +93,7 @@ class Clone(EmbroideryElement):
return elements
- def to_patches(self, last_patch=None):
+ def to_stitch_groups(self, last_patch=None):
patches = []
source_node = get_clone_source(self.node)
@@ -123,7 +123,7 @@ class Clone(EmbroideryElement):
elements = self.clone_to_element(self.node)
for element in elements:
- patches.extend(element.to_patches(last_patch))
+ patches.extend(element.to_stitch_groups(last_patch))
return patches
diff --git a/lib/elements/element.py b/lib/elements/element.py
index a3577a5c..f06982b2 100644
--- a/lib/elements/element.py
+++ b/lib/elements/element.py
@@ -301,13 +301,13 @@ class EmbroideryElement(object):
def stop_after(self):
return self.get_boolean_param('stop_after', False)
- def to_patches(self, last_patch):
- raise NotImplementedError("%s must implement to_patches()" % self.__class__.__name__)
+ def to_stitch_groups(self, last_patch):
+ raise NotImplementedError("%s must implement to_stitch_groups()" % self.__class__.__name__)
def embroider(self, last_patch):
self.validate()
- patches = self.to_patches(last_patch)
+ patches = self.to_stitch_groups(last_patch)
apply_patterns(patches, self.node)
for patch in patches:
diff --git a/lib/elements/empty_d_object.py b/lib/elements/empty_d_object.py
index 19fb58a4..3c24f333 100644
--- a/lib/elements/empty_d_object.py
+++ b/lib/elements/empty_d_object.py
@@ -23,5 +23,5 @@ class EmptyDObject(EmbroideryElement):
label = self.node.get(INKSCAPE_LABEL) or self.node.get("id")
yield EmptyD((0, 0), label)
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
return []
diff --git a/lib/elements/fill.py b/lib/elements/fill.py
index 2d2ae2ed..442922b6 100644
--- a/lib/elements/fill.py
+++ b/lib/elements/fill.py
@@ -190,7 +190,7 @@ class Fill(EmbroideryElement):
else:
yield InvalidShapeError((x, y))
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
stitch_lists = legacy_fill(self.shape,
self.angle,
self.row_spacing,
diff --git a/lib/elements/image.py b/lib/elements/image.py
index 0828b5ef..73a46871 100644
--- a/lib/elements/image.py
+++ b/lib/elements/image.py
@@ -29,5 +29,5 @@ class ImageObject(EmbroideryElement):
def validation_warnings(self):
yield ImageTypeWarning(self.center())
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
return []
diff --git a/lib/elements/pattern.py b/lib/elements/pattern.py
index 95ce81a1..4b92d366 100644
--- a/lib/elements/pattern.py
+++ b/lib/elements/pattern.py
@@ -29,5 +29,5 @@ class PatternObject(EmbroideryElement):
repr_point = next(inkex.Path(self.parse_path()).end_points)
yield PatternWarning(repr_point)
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
return []
diff --git a/lib/elements/polyline.py b/lib/elements/polyline.py
index aeae17d9..c7a9ea48 100644
--- a/lib/elements/polyline.py
+++ b/lib/elements/polyline.py
@@ -101,7 +101,7 @@ class Polyline(EmbroideryElement):
def validation_warnings(self):
yield PolylineWarning(self.points[0])
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
patch = StitchGroup(color=self.color)
for stitch in self.stitches:
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index e066f3fb..b11bb2c3 100644
--- a/lib/elements/satin_column.py
+++ b/lib/elements/satin_column.py
@@ -828,7 +828,7 @@ class SatinColumn(EmbroideryElement):
points.append(Point(split_point.x, split_point.y))
return [points, split_count]
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
# Stitch a variable-width satin column, zig-zagging between two paths.
# The algorithm will draw zigzags between each consecutive pair of
diff --git a/lib/elements/stroke.py b/lib/elements/stroke.py
index 9fcb4e21..763167ad 100644
--- a/lib/elements/stroke.py
+++ b/lib/elements/stroke.py
@@ -193,7 +193,7 @@ class Stroke(EmbroideryElement):
return StitchGroup(self.color, stitches)
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
patches = []
for path in self.paths:
diff --git a/lib/elements/text.py b/lib/elements/text.py
index dbf76c85..8a3846c0 100644
--- a/lib/elements/text.py
+++ b/lib/elements/text.py
@@ -29,5 +29,5 @@ class TextObject(EmbroideryElement):
def validation_warnings(self):
yield TextTypeWarning(self.pointer())
- def to_patches(self, last_patch):
+ def to_stitch_groups(self, last_patch):
return []
diff --git a/lib/extensions/base.py b/lib/extensions/base.py
index 476e4969..828e3685 100644
--- a/lib/extensions/base.py
+++ b/lib/extensions/base.py
@@ -188,7 +188,7 @@ class InkstitchExtension(inkex.Effect):
selected.append(node)
return selected
- def elements_to_patches(self, elements):
+ def elements_to_stitch_groups(self, elements):
patches = []
for element in elements:
if patches:
diff --git a/lib/extensions/output.py b/lib/extensions/output.py
index f993f79f..7cc12ee0 100644
--- a/lib/extensions/output.py
+++ b/lib/extensions/output.py
@@ -52,7 +52,7 @@ class Output(InkstitchExtension):
self.metadata = self.get_inkstitch_metadata()
collapse_len = self.metadata['collapse_len_mm']
- patches = self.elements_to_patches(self.elements)
+ patches = self.elements_to_stitch_groups(self.elements)
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 ed796bc7..e5cb25d8 100644
--- a/lib/extensions/print_pdf.py
+++ b/lib/extensions/print_pdf.py
@@ -302,7 +302,7 @@ class Print(InkstitchExtension):
self.metadata = self.get_inkstitch_metadata()
collapse_len = self.metadata['collapse_len_mm']
- patches = self.elements_to_patches(self.elements)
+ patches = self.elements_to_stitch_groups(self.elements)
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'])
diff --git a/lib/extensions/stitch_plan_preview.py b/lib/extensions/stitch_plan_preview.py
index ac1a4a67..c50fa738 100644
--- a/lib/extensions/stitch_plan_preview.py
+++ b/lib/extensions/stitch_plan_preview.py
@@ -23,7 +23,7 @@ class StitchPlanPreview(InkstitchExtension):
realistic = False
self.metadata = self.get_inkstitch_metadata()
collapse_len = self.metadata['collapse_len_mm']
- patches = self.elements_to_patches(self.elements)
+ patches = self.elements_to_stitch_groups(self.elements)
stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
render_stitch_plan(svg, stitch_plan, realistic)
diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py
index 3f81af71..22654560 100644
--- a/lib/extensions/zip.py
+++ b/lib/extensions/zip.py
@@ -43,7 +43,7 @@ class Zip(InkstitchExtension):
self.metadata = self.get_inkstitch_metadata()
collapse_len = self.metadata['collapse_len_mm']
- patches = self.elements_to_patches(self.elements)
+ patches = self.elements_to_stitch_groups(self.elements)
stitch_plan = stitch_groups_to_stitch_plan(patches, collapse_len=collapse_len)
base_file_name = self.get_base_file_name()