diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/convert_to_satin.py | 9 | ||||
| -rw-r--r-- | lib/extensions/remove_embroidery_settings.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/extensions/convert_to_satin.py b/lib/extensions/convert_to_satin.py index f3924659..e2b287dd 100644 --- a/lib/extensions/convert_to_satin.py +++ b/lib/extensions/convert_to_satin.py @@ -1,17 +1,18 @@ import math from itertools import chain, groupby -import inkex import numpy from numpy import diff, setdiff1d, sign from shapely import geometry as shgeo -from .base import InkstitchExtension +import inkex + from ..elements import Stroke from ..i18n import _ from ..svg import PIXELS_PER_MM, get_correction_transform -from ..svg.tags import SVG_PATH_TAG +from ..svg.tags import INKSTITCH_ATTRIBS, SVG_PATH_TAG from ..utils import Point +from .base import InkstitchExtension class SelfIntersectionError(Exception): @@ -309,6 +310,6 @@ class ConvertToSatin(InkstitchExtension): "style": path_style, "transform": correction_transform, "d": d, - "embroider_satin_column": "true", + INKSTITCH_ATTRIBS['satin_column']: "true", } ) diff --git a/lib/extensions/remove_embroidery_settings.py b/lib/extensions/remove_embroidery_settings.py index d87a216a..d39c7e94 100644 --- a/lib/extensions/remove_embroidery_settings.py +++ b/lib/extensions/remove_embroidery_settings.py @@ -30,11 +30,11 @@ class RemoveEmbroiderySettings(InkstitchExtension): if not self.selected: xpath = ".//svg:path" elements = self.find_elements(xpath) - self.remove_embroider_attributes(elements) + self.remove_inkstitch_attributes(elements) else: for node in self.selected: elements = self.get_selected_elements(node) - self.remove_embroider_attributes(elements) + self.remove_inkstitch_attributes(elements) def remove_commands(self): if not self.selected: @@ -83,8 +83,8 @@ class RemoveEmbroiderySettings(InkstitchExtension): def remove_element(self, element): element.getparent().remove(element) - def remove_embroider_attributes(self, elements): + def remove_inkstitch_attributes(self, elements): for element in elements: for attrib in element.attrib: - if attrib.startswith('embroider_'): + if attrib.startswith(inkex.NSS['inkstitch'], 1): del element.attrib[attrib] |