From 54812774583a3a628d87eb109f37b4fea18f40fd Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 28 Jan 2023 12:02:17 +0100 Subject: fix short stitch for second rail --- lib/elements/satin_column.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/elements/satin_column.py') diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 12261e15..12f96aac 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -1068,7 +1068,7 @@ class SatinColumn(EmbroideryElement): offset_px = [0, 0] if a.distance(pairs[i-1][0]) < min_dist: offset_px[0] = -inset_px - if b.distance(pairs[i-1][0]) < min_dist: + if b.distance(pairs[i-1][1]) < min_dist: offset_px[1] = -inset_px shortened.append(self.offset_points(a, b, offset_px, (0, 0))) return shortened -- cgit v1.2.3 From 88ae2b3c5410931a1aec4d21f62c1a0bab15a02c Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 28 Jan 2023 14:51:12 +0100 Subject: fix random e-stitch --- lib/elements/satin_column.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/elements/satin_column.py') diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 12f96aac..0981e6c3 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -1013,7 +1013,7 @@ class SatinColumn(EmbroideryElement): self.zigzag_spacing, self.pull_compensation_px, self.pull_compensation_percent/100, - self.random_width_decrease.any() and self.random_width_increase.any() and self.random_zigzag_spacing, + self.random_width_decrease.any() or self.random_width_increase.any() or self.random_zigzag_spacing, ) # "left" and "right" here are kind of arbitrary designations meaning -- cgit v1.2.3 From f2f1fea0cb5d5fe122cc62a338b3b6513528f313 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Sat, 28 Jan 2023 22:33:58 +0100 Subject: remove subpaths with only one node from satins (#2033) --- lib/elements/satin_column.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/elements/satin_column.py') diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py index 0981e6c3..1841bba1 100644 --- a/lib/elements/satin_column.py +++ b/lib/elements/satin_column.py @@ -361,7 +361,10 @@ class SatinColumn(EmbroideryElement): @property @cache def csp(self): - return self.parse_path() + paths = self.parse_path() + # exclude subpaths which are just a point + paths = [path for path in paths if len(path) >= 2] + return paths @property @cache @@ -518,8 +521,9 @@ class SatinColumn(EmbroideryElement): def validation_errors(self): # The node should have exactly two paths with the same number of points - or it should # have two rails and at least one rung - - if len(self.rails) < 2: + if len(self.csp) < 2: + yield TooFewPathsError((0, 0)) + elif len(self.rails) < 2: yield TooFewPathsError(self.shape.centroid) elif len(self.csp) == 2: if len(self.rails[0]) != len(self.rails[1]): -- cgit v1.2.3