diff options
| -rw-r--r-- | lib/stitch_plan/stitch.py | 22 | ||||
| -rw-r--r-- | lib/stitch_plan/ties.py | 5 |
2 files changed, 11 insertions, 16 deletions
diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py index 0609dd10..462634cb 100644 --- a/lib/stitch_plan/stitch.py +++ b/lib/stitch_plan/stitch.py @@ -2,7 +2,7 @@ from ..utils.geometry import Point class Stitch(Point): - def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, fake_color_change=False, no_ties=False): + def __init__(self, x, y=None, color=None, jump=False, stop=False, trim=False, color_change=False, no_ties=False): self.x = x self.y = y self.color = color @@ -10,7 +10,6 @@ class Stitch(Point): self.trim = trim self.stop = stop self.color_change = color_change - self.fake_color_change = fake_color_change self.no_ties = no_ties # Allow creating a Stitch from a Point @@ -20,16 +19,15 @@ class Stitch(Point): self.y = point.y def __repr__(self): - return "Stitch(%s, %s, %s, %s, %s, %s, %s, %s%s)" % (self.x, - self.y, - self.color, - "JUMP" if self.jump else " ", - "TRIM" if self.trim else " ", - "STOP" if self.stop else " ", - "NO TIES" if self.no_ties else " ", - "FAKE " if self.fake_color_change else "", - "COLOR CHANGE" if self.color_change else " " - ) + return "Stitch(%s, %s, %s, %s, %s, %s, %s, %s)" % (self.x, + self.y, + self.color, + "JUMP" if self.jump else " ", + "TRIM" if self.trim else " ", + "STOP" if self.stop else " ", + "NO TIES" if self.no_ties else " ", + "COLOR CHANGE" if self.color_change else " " + ) def copy(self): return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.no_ties) diff --git a/lib/stitch_plan/ties.py b/lib/stitch_plan/ties.py index c0d2f8de..1d759c0e 100644 --- a/lib/stitch_plan/ties.py +++ b/lib/stitch_plan/ties.py @@ -47,10 +47,7 @@ def add_ties(stitch_plan): for i, stitch in enumerate(color_block.stitches): is_special = stitch.trim or stitch.jump or stitch.color_change or stitch.stop - # see stop.py for an explanation of the fake color change - is_fake = stitch.fake_color_change - - if is_special and not is_fake and not need_tie_in: + if is_special and not need_tie_in: add_tie_off(new_stitches) new_stitches.append(stitch) need_tie_in = True |