summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGeorge Steel <george.steel@gmail.com>2023-01-28 15:13:03 -0500
committerGitHub <noreply@github.com>2023-01-28 15:13:03 -0500
commitc730250f9f8ee16bfef4114b9c7394660d53cafc (patch)
tree8424e8192d57de2b6475f4b889feccc0129647c6 /lib
parentdbded7c9b15a652677c04264fe1c6ee281e114ce (diff)
parent88ae2b3c5410931a1aec4d21f62c1a0bab15a02c (diff)
Merge pull request #2032 from inkstitch/kaalleen/short-stitch-fix
fix short stitch for second rail
Diffstat (limited to 'lib')
-rw-r--r--lib/elements/satin_column.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index 12261e15..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
@@ -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