mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

remove obselete 'fake color change' code

pull/316/head
Lex Neva 2018-09-16 13:09:00 -04:00
rodzic 9b619de228
commit fa125ff27e
2 zmienionych plików z 11 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
lib/stitch_plan/stitch.py
Wyświetl plik

@ -2,7 +2,7 @@ from ..utils.geometry import Point
class Stitch(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.x = x
self.y = y self.y = y
self.color = color self.color = color
@ -10,7 +10,6 @@ class Stitch(Point):
self.trim = trim self.trim = trim
self.stop = stop self.stop = stop
self.color_change = color_change self.color_change = color_change
self.fake_color_change = fake_color_change
self.no_ties = no_ties self.no_ties = no_ties
# Allow creating a Stitch from a Point # Allow creating a Stitch from a Point
@ -20,16 +19,15 @@ class Stitch(Point):
self.y = point.y self.y = point.y
def __repr__(self): def __repr__(self):
return "Stitch(%s, %s, %s, %s, %s, %s, %s, %s%s)" % (self.x, return "Stitch(%s, %s, %s, %s, %s, %s, %s, %s)" % (self.x,
self.y, self.y,
self.color, self.color,
"JUMP" if self.jump else " ", "JUMP" if self.jump else " ",
"TRIM" if self.trim else " ", "TRIM" if self.trim else " ",
"STOP" if self.stop else " ", "STOP" if self.stop else " ",
"NO TIES" if self.no_ties else " ", "NO TIES" if self.no_ties else " ",
"FAKE " if self.fake_color_change else "", "COLOR CHANGE" if self.color_change else " "
"COLOR CHANGE" if self.color_change else " " )
)
def copy(self): def copy(self):
return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.no_ties) return Stitch(self.x, self.y, self.color, self.jump, self.stop, self.trim, self.color_change, self.no_ties)

5
lib/stitch_plan/ties.py
Wyświetl plik

@ -47,10 +47,7 @@ def add_ties(stitch_plan):
for i, stitch in enumerate(color_block.stitches): for i, stitch in enumerate(color_block.stitches):
is_special = stitch.trim or stitch.jump or stitch.color_change or stitch.stop 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 if is_special and not need_tie_in:
is_fake = stitch.fake_color_change
if is_special and not is_fake and not need_tie_in:
add_tie_off(new_stitches) add_tie_off(new_stitches)
new_stitches.append(stitch) new_stitches.append(stitch)
need_tie_in = True need_tie_in = True