diff options
| author | Lex Neva <github.com@lexneva.name> | 2018-08-25 11:47:48 -0400 |
|---|---|---|
| committer | Lex Neva <github.com@lexneva.name> | 2018-08-25 11:47:48 -0400 |
| commit | 11d3cea80caeb9738a2eb02473801487c2acba3b (patch) | |
| tree | 13510f23e5041628ef96997f14d852482ff04000 /lib/threads | |
| parent | c5bd1878846c17309c99ad7554d4645088de9629 (diff) | |
| parent | 6a16e90081e619eac5921bd8614c0c46dc83f852 (diff) | |
Merge remote-tracking branch 'origin/master' into simulator-timeline
Diffstat (limited to 'lib/threads')
| -rw-r--r-- | lib/threads/catalog.py | 2 | ||||
| -rw-r--r-- | lib/threads/color.py | 1 | ||||
| -rw-r--r-- | lib/threads/palette.py | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/threads/catalog.py b/lib/threads/catalog.py index d9981dc6..ece2f8ac 100644 --- a/lib/threads/catalog.py +++ b/lib/threads/catalog.py @@ -85,8 +85,10 @@ class _ThreadCatalog(Sequence): if palette.name == name: return palette + _catalog = None + def ThreadCatalog(): """Singleton _ThreadCatalog factory""" diff --git a/lib/threads/color.py b/lib/threads/color.py index cc6c0c48..8c596e44 100644 --- a/lib/threads/color.py +++ b/lib/threads/color.py @@ -3,6 +3,7 @@ import re import colorsys from pyembroidery.EmbThread import EmbThread + class ThreadColor(object): hex_str_re = re.compile('#([0-9a-z]{3}|[0-9a-z]{6})', re.I) diff --git a/lib/threads/palette.py b/lib/threads/palette.py index 785fb082..654c43e5 100644 --- a/lib/threads/palette.py +++ b/lib/threads/palette.py @@ -41,8 +41,11 @@ class ThreadPalette(Set): if self.name.lower().startswith('name: ink/stitch: '): self.name = self.name[18:] - columns_line = palette.readline() - headers_line = palette.readline() + # number of columns + palette.readline() + + # headers + palette.readline() for line in palette: fields = line.split("\t", 3) |