diff options
| author | Kaalleen <36401965+kaalleen@users.noreply.github.com> | 2021-03-27 16:55:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 16:55:08 +0100 |
| commit | 71a5d4772a64891223b30eda1d97deea5f8926e0 (patch) | |
| tree | d1860da4fa0e4b6b46a0c47d377a2342f5a3a9dd | |
| parent | 2ccdd5cc8dd16cc5a9b8883466a2034caa81ac08 (diff) | |
Catch Palette IndexError (#1100)
* thread palette catch indexerror
* export threadlist with utf-8
| -rw-r--r-- | lib/extensions/zip.py | 2 | ||||
| -rw-r--r-- | lib/threads/palette.py | 2 | ||||
| -rw-r--r-- | templates/embroider_settings.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/extensions/zip.py b/lib/extensions/zip.py index fedf8c65..eacf2260 100644 --- a/lib/extensions/zip.py +++ b/lib/extensions/zip.py @@ -55,7 +55,7 @@ class Zip(InkstitchExtension): svg.write(etree.tostring(document).decode('utf-8')) elif format == 'threadlist': output_file = os.path.join(path, "%s_%s.txt" % (base_file_name, _("threadlist"))) - output = open(output_file, 'w') + output = open(output_file, 'w', encoding='utf-8') output.write(self.get_threadlist(stitch_plan, base_file_name)) output.close() else: diff --git a/lib/threads/palette.py b/lib/threads/palette.py index c5e3002c..de7ed6f0 100644 --- a/lib/threads/palette.py +++ b/lib/threads/palette.py @@ -57,7 +57,7 @@ class ThreadPalette(Set): thread = ThreadColor(thread_color, thread_name, thread_number, manufacturer=self.name) self.threads[thread] = convert_color(sRGBColor(*thread_color, is_upscaled=True), LabColor) - except ValueError: + except (ValueError, IndexError): continue def __contains__(self, thread): diff --git a/templates/embroider_settings.xml b/templates/embroider_settings.xml index 450068b4..1c7bc966 100644 --- a/templates/embroider_settings.xml +++ b/templates/embroider_settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension"> - <name>{% trans %}Settings{% endtrans %}</name> + <name>{% trans %}Preferences{% endtrans %}</name> <id>org.inkstitch.embroider_settings.{{ locale }}</id> <param name="extension" type="string" gui-hidden="true">embroider_settings</param> <effect needs-live-preview="false"> |