diff options
Diffstat (limited to 'lib/elements')
| -rw-r--r-- | lib/elements/element.py | 17 | ||||
| -rw-r--r-- | lib/elements/utils.py | 29 |
2 files changed, 34 insertions, 12 deletions
diff --git a/lib/elements/element.py b/lib/elements/element.py index 0846b7ab..ea2d5d6b 100644 --- a/lib/elements/element.py +++ b/lib/elements/element.py @@ -2,6 +2,7 @@ # # Copyright (c) 2010 Authors # Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. +import json import sys from contextlib import contextmanager from copy import deepcopy @@ -25,7 +26,7 @@ from ..stitch_plan.lock_stitch import (LOCK_DEFAULTS, AbsoluteLock, CustomLock, from ..svg import (PIXELS_PER_MM, apply_transforms, convert_length, get_node_transform) from ..svg.tags import INKSCAPE_LABEL, INKSTITCH_ATTRIBS -from ..utils import Point, cache +from ..utils import DotDict, Point, cache from ..utils.cache import (CacheKeyGenerator, get_stitch_plan_cache, is_cache_disabled) @@ -159,6 +160,20 @@ class EmbroideryElement(object): return [int(default)] return params + def get_json_param(self, param, default=None): + json_value = self.get_param(param, None) + try: + return json.loads(json_value, object_hook=DotDict) + except (json.JSONDecodeError, TypeError): + if default is None: + return DotDict() + else: + return DotDict(default) + + def set_json_param(self, param, value): + json_value = json.dumps(value) + self.set_param(param, json_value) + def set_param(self, name, value): # Sets a param on the node backing this element. Used by params dialog. # After calling, this element is invalid due to caching and must be re-created to use the new value. diff --git a/lib/elements/utils.py b/lib/elements/utils.py index 09d24935..a3de62e9 100644 --- a/lib/elements/utils.py +++ b/lib/elements/utils.py @@ -37,18 +37,25 @@ def node_to_elements(node, clone_to_element=False) -> List[EmbroideryElement]: return [MarkerObject(node)] elif node.tag in EMBROIDERABLE_TAGS or is_clone(node): - element = EmbroideryElement(node) - elements = [] - if element.get_style("fill", "black") and not element.get_style('fill-opacity', 1) == "0": - elements.append(FillStitch(node)) - if element.get_style("stroke"): - if element.get_boolean_param("satin_column") and len(element.path) > 1: - elements.append(SatinColumn(node)) - elif not is_command(element.node): - elements.append(Stroke(node)) - if element.get_boolean_param("stroke_first", False): - elements.reverse() + + from ..sew_stack import SewStack + sew_stack = SewStack(node) + + if not sew_stack.sew_stack_only: + element = EmbroideryElement(node) + if element.get_style("fill", "black") and not element.get_style('fill-opacity', 1) == "0": + elements.append(FillStitch(node)) + if element.get_style("stroke"): + if element.get_boolean_param("satin_column") and len(element.path) > 1: + elements.append(SatinColumn(node)) + elif not is_command(element.node): + elements.append(Stroke(node)) + if element.get_boolean_param("stroke_first", False): + elements.reverse() + + elements.append(sew_stack) + return elements elif node.tag == SVG_IMAGE_TAG: |