From 77d6b78f92d507cdb22e744b1c93712fc6d67e5b Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 28 May 2018 20:06:26 -0400 Subject: fix STOP handling Apparently STOP codes (a.k.a. color changes) should be by themselves, not attached to another stitch. To add a STOP code at a given stitch, we should clone the stitch and then set the STOP command on the new stitch. --- lib/stitch_plan/stop.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/stitch_plan/stop.py') diff --git a/lib/stitch_plan/stop.py b/lib/stitch_plan/stop.py index c5e9f7e4..83afeb36 100644 --- a/lib/stitch_plan/stop.py +++ b/lib/stitch_plan/stop.py @@ -17,11 +17,18 @@ def process_stop(color_block): """ if len(color_block.stitches) >= 3: - color_block.stitches[-3].stop = True + # make a copy of the stitch and turn it into a STOP code + stitch = color_block.stitches[-3].copy() + stitch.stop = True + + # insert it after the stitch + color_block.stitches.insert(-2, stitch) # and also add a color change on this stitch, completing the C00 # block: - color_block.stitches[-1].stop = True + stitch = color_block.stitches[-1].copy() + stitch.stop = True + color_block.add_stitch(stitch) # reference for the above: https://github.com/lexelby/inkstitch/pull/29#issuecomment-359175447 -- cgit v1.2.3 From f0c8c6a27b2ea2688bceaea0b86e1c182dee39c9 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 28 May 2018 22:15:07 -0400 Subject: don't do ties around the fake color change of a "STOP after" --- lib/stitch_plan/stop.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'lib/stitch_plan/stop.py') diff --git a/lib/stitch_plan/stop.py b/lib/stitch_plan/stop.py index 83afeb36..81dec1da 100644 --- a/lib/stitch_plan/stop.py +++ b/lib/stitch_plan/stop.py @@ -5,20 +5,29 @@ def process_stop(color_block): be useful for applique and similar on multi-needle machines that normally would not stop between colors. - On such machines, the user assigns needles to the colors in the - design before starting stitching. C01, C02, etc are normal + In machine embroidery files, there's no such thing as an actual + "STOP" instruction. All that exists is a "color change" command + (which libembroidery calls STOP just to be confusing). + + On multi-needle machines, the user assigns needles to the colors in + the design before starting stitching. C01, C02, etc are normal needles, but C00 is special. For a block of stitches assigned to C00, the machine will continue sewing with the last color it had and pause after it completes the C00 block. - That means we need to introduce an artificial color change - shortly before the current stitch so that the user can set that - to C00. We'll go back 3 stitches and do that: + That means we need to add an artificial color change instruction + shortly before the current stitch so that the user can set that color + block to C00. We'll go back 3 stitches and mark the start of the C00 + block: """ if len(color_block.stitches) >= 3: - # make a copy of the stitch and turn it into a STOP code + # make a copy of the stitch and set it as a color change stitch = color_block.stitches[-3].copy() + stitch.color_change = True + + # mark this stitch as a "stop" so that we can avoid + # adding tie stitches in ties.py stitch.stop = True # insert it after the stitch @@ -28,7 +37,7 @@ def process_stop(color_block): # block: stitch = color_block.stitches[-1].copy() - stitch.stop = True + stitch.color_change = True color_block.add_stitch(stitch) # reference for the above: https://github.com/lexelby/inkstitch/pull/29#issuecomment-359175447 -- cgit v1.2.3