diff options
| author | Lex Neva <lexelby@users.noreply.github.com> | 2018-09-29 13:22:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 13:22:05 -0600 |
| commit | 5139c13fd7f43bb4d829e3c8225c51268e4d27d1 (patch) | |
| tree | 8d89cf6fc362aa261baf9f63d68653c50fe72aa5 /lib/stitch_plan/stitch.py | |
| parent | ee7ed8f679dd493bd8991ede51bc741c47567b51 (diff) | |
| parent | 5e9cb83a9375a2b6312f390e84e4ac8e778d04cb (diff) | |
Merge pull request #316 from inkstitch/lexelby/bug-fixes
more bug fixes
Diffstat (limited to 'lib/stitch_plan/stitch.py')
| -rw-r--r-- | lib/stitch_plan/stitch.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/stitch_plan/stitch.py b/lib/stitch_plan/stitch.py index 5fe10fb8..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, 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,20 +10,24 @@ 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 + if isinstance(x, Point): + point = x + self.x = point.x + 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) |