summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Neva <lexelby@users.noreply.github.com>2018-04-02 21:40:13 -0400
committerGitHub <noreply@github.com>2018-04-02 21:40:13 -0400
commit1051bd93c8ea0666c6db07964af7433ce2e80d4e (patch)
treebb329c25f7f2c8e4440ea4216646965f7882ebae
parentcd1f5b71d78b5c3ed65777c316e871aa258d2f3a (diff)
parenta4ba6d06e093d14dc04aa6cfe7cf444204fc2a8e (diff)
Merge pull request #133 from lexelby/lexelby-fix-exploding-pes
fix exploding pes and doubled colors
-rw-r--r--.travis.yml2
m---------embroidermodder0
-rw-r--r--inkstitch/__init__.py13
3 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index bbcd2240..923e9773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,7 @@ install:
export WINEDEBUG=-all
- wget -q https://github.com/lexelby/inkstitch-build-objects/releases/download/v1.0.0/windows-libembroidery.tar.gz
+ wget -q https://github.com/lexelby/inkstitch-build-objects/releases/download/v1.1.0/windows-libembroidery.tar.gz
tar zxf windows-libembroidery.tar.gz
rm windows-libembroidery.tar.gz
diff --git a/embroidermodder b/embroidermodder
-Subproject 406d261a1a2a3d046c77aaef2161e67e00672f3
+Subproject 1a3faa9747fcff1cce07c4c58b54b1e780017f5
diff --git a/inkstitch/__init__.py b/inkstitch/__init__.py
index e72a59b5..2e7a55f6 100644
--- a/inkstitch/__init__.py
+++ b/inkstitch/__init__.py
@@ -274,12 +274,13 @@ def write_embroidery_file(file_path, stitch_plan, svg):
add_thread(pattern, make_thread(color_block.color))
for stitch in color_block:
- if stitch.stop:
- # The user specified "STOP after". "STOP" is the same thing as
- # a color change, and the user will assign a special color at
- # the machine that tells it to pause after. We need to add
- # another copy of the same color here so that the stitches after
- # the STOP are still the same color.
+ if stitch.stop and stitch is not color_block.last_stitch:
+ # A STOP stitch that is not at the end of a color block
+ # occurs when the user specified "STOP after". "STOP" is the
+ # same thing as a color change, and the user will assign a
+ # special color at the machine that tells it to pause after.
+ # We need to add another copy of the same color here so that
+ # the stitches after the STOP are still the same color.
add_thread(pattern, make_thread(color_block.color))
flags = get_flags(stitch)