diff options
| -rw-r--r-- | lib/threads/color.py | 9 | ||||
| -rw-r--r-- | requirements.txt | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/threads/color.py b/lib/threads/color.py index 26da78d5..699f4448 100644 --- a/lib/threads/color.py +++ b/lib/threads/color.py @@ -5,7 +5,7 @@ import colorsys -from inkex import Color, ColorCMS +from inkex import Color from pyembroidery.EmbThread import EmbThread @@ -33,12 +33,7 @@ class ThreadColor(object): self.rgb = (color.get_red(), color.get_green(), color.get_blue()) return elif isinstance(color, str): - # This will catch icc colors which cannot be parsed as rgb colors directly - if isinstance(Color(color), ColorCMS): - # The icc color has a hex color prepended. - # The easiest way to receive a color value is therefore to just use the hex color from the front. - color = color.split()[0] - self.rgb = tuple(Color(color).to('rgb').get_values(False)) + self.rgb = tuple(Color(color).to('rgb')) elif isinstance(color, (list, tuple)): self.rgb = tuple(color) else: diff --git a/requirements.txt b/requirements.txt index ece0a36a..ae7a5de0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,10 @@ # but the .gitignore file should be updated to ignore the build directory. ./pyembroidery -# get up to date inkex version (March 1, 2024) -inkex @ git+https://gitlab.com/inkscape/extensions.git@1792934a09046fdef8aab20d05aad9c47f825bf5 +# For macOS and Windows our installer bundles the version specified here +# but some Linux distros package Ink/Stitch as depending on the inkex that's bundled with Inkscape. +# So at least for releases we should use a tagged version here such as EXTENSIONS_AT_INKSCAPE_$version. +inkex @ git+https://gitlab.com/inkscape/extensions.git@EXTENSIONS_AT_INKSCAPE_1.4.1 # for linux user it may be tricky to install wxPython from sources # prebuilt packages: https://wxpython.org/pages/downloads/index.html |