From 97d53bad33ce4279f45fef54e78ea67fb66752c6 Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Wed, 17 May 2023 23:17:22 +0200 Subject: ripple stitch grid starting point --- lib/stitches/ripple_stitch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stitches/ripple_stitch.py') diff --git a/lib/stitches/ripple_stitch.py b/lib/stitches/ripple_stitch.py index 40a522eb..e2f60a29 100644 --- a/lib/stitches/ripple_stitch.py +++ b/lib/stitches/ripple_stitch.py @@ -235,8 +235,8 @@ def _adjust_helper_lines_for_grid(stroke, helper_lines, skip_start, skip_end): if stroke.join_style == 0 and (stroke.reverse and count % 2 != 0): count += 1 - elif (stroke.join_style == 1 and ((stroke.reverse and skip_end % 2 != 0) or - (not stroke.reverse and skip_start % 2 != 0))): + elif (stroke.join_style == 1 and ((stroke.reverse and (count + skip_start) % 2 != 0) or + (not stroke.reverse and skip_start % 2 != 0))): count += 1 if count % 2 != 0: -- cgit v1.2.3 From 40976c82f67b3cda117ee5da01cf40479d42e97d Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Fri, 19 May 2023 19:22:05 +0200 Subject: ripple: apply stitch length and stagger to grid --- lib/stitches/ripple_stitch.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/stitches/ripple_stitch.py') diff --git a/lib/stitches/ripple_stitch.py b/lib/stitches/ripple_stitch.py index e2f60a29..90dc7cbc 100644 --- a/lib/stitches/ripple_stitch.py +++ b/lib/stitches/ripple_stitch.py @@ -246,14 +246,15 @@ def _adjust_helper_lines_for_grid(stroke, helper_lines, skip_start, skip_end): def _do_grid(stroke, helper_lines, skip_start, skip_end): helper_lines = _adjust_helper_lines_for_grid(stroke, helper_lines, skip_start, skip_end) + grid = [] for i, helper in enumerate(helper_lines): end = len(helper) - skip_end points = helper[skip_start:end] - if i % 2 == 0: - points.reverse() if stroke.reverse: points.reverse() - yield from points + grid.append(points) + grid = _get_staggered_stitches(stroke, grid, 0) + return grid def _get_guided_helper_lines(stroke, outline, max_distance): -- cgit v1.2.3