From 516dafb33ff967390c6e733939192979f1b5f0ae Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Thu, 18 May 2023 11:17:37 +0200 Subject: improve zigzag to satin (zigzag style) --- lib/extensions/zigzag_line_to_satin.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/extensions/zigzag_line_to_satin.py') diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 5ff76be7..36933321 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -55,15 +55,18 @@ class ZigzagLineToSatin(InkstitchExtension): # zigzag pattern: VVVVV rails = [point_list[0::2], point_list[1::2]] rail_points = [[], []] + rung_points = [[], []] for i, rail in enumerate(rails): for j, point in enumerate(rail): if j == 0 or point in point_list[2::len(point_list)-3]: rail_points[i].append(point) + rung_points[i].append(point) continue p0 = rail[j-1] - rail_points[i].append(inkex.Vector2d(inkex.DirectedLineSegment(p0, point).point_at_ratio(0.5))) rail_points[i].append(point) - rungs = list(zip(*rail_points)) + rung_points[i].append(inkex.Vector2d(inkex.DirectedLineSegment(p0, point).point_at_ratio(0.5))) + rung_points[i].append(point) + rungs = list(zip(*rung_points)) return rail_points, rungs else: # square pattern: |_|▔|_|▔| @@ -88,7 +91,7 @@ class ZigzagLineToSatin(InkstitchExtension): def _smooth_path(self, rails): path_commands = [] - smoothing = 0.2 + smoothing = 0.4 for rail in rails: for i, point in enumerate(rail): if i == 0: -- cgit v1.2.3 From 5a0d2b312631d5c6c59c8c6aa7ee0119b5da11d4 Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Fri, 19 May 2023 18:12:45 +0200 Subject: adjust smoothed zigzag rungs --- lib/extensions/zigzag_line_to_satin.py | 48 ++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 8 deletions(-) (limited to 'lib/extensions/zigzag_line_to_satin.py') diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 36933321..8794f4dc 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -32,15 +32,17 @@ class ZigzagLineToSatin(InkstitchExtension): point_list = list(node.get_path().end_points) rails, rungs = self._get_rails_and_rungs(point_list) - if self.options.rungs: - if self.options.reduce_rungs and len(rungs) > 2: - rungs = rungs[0::2] - d.extend(self._rung_path(rungs)) if not self.options.smoothing: for rail in rails: d.append('M ' + ' '.join([str(point) for point in rail])) else: - d.append(self._smooth_path(rails)) + rails, rungs = self._smooth_path(rails, rungs) + d.append(rails) + + if self.options.rungs: + if self.options.pattern != 'zigzag' and self.options.reduce_rungs and len(rungs) > 2: + rungs = rungs[0::2] + d.extend(self._rung_path(rungs)) node.set('d', " ".join(d)) node.set('inkstitch:satin_column', True) @@ -89,10 +91,14 @@ class ZigzagLineToSatin(InkstitchExtension): rungs.extend([[points[0], points[1]], [points[2], points[3]]]) return rails, rungs - def _smooth_path(self, rails): + def _smooth_path(self, rails, rungs): path_commands = [] + new_rungs = [] + k = [1, 0] smoothing = 0.4 - for rail in rails: + has_equal_rail_point_count = len(rails[0]) == len(rails[1]) + for j, rail in enumerate(rails): + r = rungs[j:len(rungs):2] for i, point in enumerate(rail): if i == 0: path_commands.append(inkex.paths.Move(*point)) @@ -125,7 +131,33 @@ class ZigzagLineToSatin(InkstitchExtension): # generate curves path_commands.append(inkex.paths.Curve(*start, *end, *point)) - return str(inkex.Path(path_commands)) + + if self.options.pattern == 'zigzag' and (has_equal_rail_point_count or i <= len(r)) and (not self.options.reduce_rungs or j == 0): + # in zigzag mode we do have alternating points on rails + # when smoothing them out, rungs may not intersect anymore + # so we need to find a spot on the smoothed rail to ensure the correct length + rung = r[i-1] + line = inkex.DirectedLineSegment(rung[0], rung[1]) + point0 = line.point_at_length(-50) + point1 = line.point_at_length(line.length + 50) + new_point = inkex.bezier.linebezierintersect((point0, point1), [prev, start, end, point]) + if new_point: + new_rungs.append((rung[k[j]], new_point[0])) + else: + new_rungs.append(rung) + + rungs = self._update_rungs(new_rungs, rungs, r, has_equal_rail_point_count) + return str(inkex.Path(path_commands)), rungs + + def _update_rungs(self, new_rungs, rungs, r, has_equal_rail_point_count): + if self.options.pattern == 'zigzag': + rungs = new_rungs + if not has_equal_rail_point_count and not self.options.reduce_rungs: + # make sure, that the last rail on canvas is also the last rail in the list + # this important when we delete the very first and very last rung + count = len(r) + rungs[count], rungs[-1] = rungs[-1], rungs[count] + return rungs def _rung_path(self, rungs): if len(rungs) < 3: -- cgit v1.2.3 From 65bbfe9662aabac3592973dd4a470b40d705560a Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 20 May 2023 21:11:39 +0200 Subject: zigzag to line: optional sharp edges --- lib/extensions/zigzag_line_to_satin.py | 37 ++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'lib/extensions/zigzag_line_to_satin.py') diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 8794f4dc..64fe810a 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -30,13 +30,15 @@ class ZigzagLineToSatin(InkstitchExtension): for node in self.svg.selection: d = [] point_list = list(node.get_path().end_points) + # find duplicated nodes (= do not smooth) + point_list, sharp_edges = self._get_sharp_edge_nodes(point_list) rails, rungs = self._get_rails_and_rungs(point_list) if not self.options.smoothing: for rail in rails: d.append('M ' + ' '.join([str(point) for point in rail])) else: - rails, rungs = self._smooth_path(rails, rungs) + rails, rungs = self._smooth_path(rails, rungs, sharp_edges) d.append(rails) if self.options.rungs: @@ -47,6 +49,20 @@ class ZigzagLineToSatin(InkstitchExtension): node.set('d', " ".join(d)) node.set('inkstitch:satin_column', True) + def _get_sharp_edge_nodes(self, point_list): + points = [] + sharp_edges = [] + skip = False + for p0, p1 in zip(point_list[:-1], point_list[1:]): + if skip is True: + skip = False + continue + points.append(p0) + if inkex.DirectedLineSegment(p0, p1).length < 0.3: + sharp_edges.append(p0) + skip = True + return points, sharp_edges + def _get_rails_and_rungs(self, point_list): if self.options.pattern == "sawtooth": # sawtooth pattern: |/|/|/| @@ -91,7 +107,7 @@ class ZigzagLineToSatin(InkstitchExtension): rungs.extend([[points[0], points[1]], [points[2], points[3]]]) return rails, rungs - def _smooth_path(self, rails, rungs): + def _smooth_path(self, rails, rungs, sharp_edges): # noqa: C901 path_commands = [] new_rungs = [] k = [1, 0] @@ -108,7 +124,9 @@ class ZigzagLineToSatin(InkstitchExtension): prev_prev = rail[i - 1] else: prev_prev = rail[i-2] + prev = rail[i-1] + if i > len(rail) - 2: next = point else: @@ -117,14 +135,20 @@ class ZigzagLineToSatin(InkstitchExtension): # get length of handles length = inkex.DirectedLineSegment(point, prev).length * smoothing - # get handle positions + # get start handle positions start = inkex.DirectedLineSegment(prev_prev, point) - end = inkex.DirectedLineSegment(next, prev) - if not start.length == 0: + if prev in sharp_edges: + start = prev + elif not start.length == 0: start = start.parallel(*prev).point_at_length(start.length - length) else: start = start.start - if not end.length == 0: + + # get end handle positions + end = inkex.DirectedLineSegment(next, prev) + if point in sharp_edges: + end = point + elif not end.length == 0: end = end.parallel(*point).point_at_length(end.length - length) else: end = end.start @@ -132,6 +156,7 @@ class ZigzagLineToSatin(InkstitchExtension): # generate curves path_commands.append(inkex.paths.Curve(*start, *end, *point)) + # recalculate rungs for zigzag pattern if self.options.pattern == 'zigzag' and (has_equal_rail_point_count or i <= len(r)) and (not self.options.reduce_rungs or j == 0): # in zigzag mode we do have alternating points on rails # when smoothing them out, rungs may not intersect anymore -- cgit v1.2.3 From 839a43929bfa7678b11389d3f0fbe8723ab0c363 Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 20 May 2023 23:24:36 +0200 Subject: do not ommit last point --- lib/extensions/zigzag_line_to_satin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/extensions/zigzag_line_to_satin.py') diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 64fe810a..8088bf78 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -58,9 +58,10 @@ class ZigzagLineToSatin(InkstitchExtension): skip = False continue points.append(p0) - if inkex.DirectedLineSegment(p0, p1).length < 0.3: + if inkex.DirectedLineSegment(p0, p1).length < 0.4: sharp_edges.append(p0) skip = True + points.append(p1) return points, sharp_edges def _get_rails_and_rungs(self, point_list): -- cgit v1.2.3 From 724db616dbd186b6955244bd3f50f3b3a0671ff0 Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sun, 21 May 2023 17:57:36 +0200 Subject: change back to 0.3 --- lib/extensions/zigzag_line_to_satin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/extensions/zigzag_line_to_satin.py') diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 8088bf78..167f4b91 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -58,7 +58,7 @@ class ZigzagLineToSatin(InkstitchExtension): skip = False continue points.append(p0) - if inkex.DirectedLineSegment(p0, p1).length < 0.4: + if inkex.DirectedLineSegment(p0, p1).length < 0.3: sharp_edges.append(p0) skip = True points.append(p1) -- cgit v1.2.3