diff options
| -rw-r--r-- | lib/extensions/base.py | 6 | ||||
| -rw-r--r-- | lib/extensions/params.py | 4 | ||||
| -rw-r--r-- | lib/gui/simulator.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/extensions/base.py b/lib/extensions/base.py index 1a38973f..ef5cdd6a 100644 --- a/lib/extensions/base.py +++ b/lib/extensions/base.py @@ -150,7 +150,7 @@ class InkstitchExtension(inkex.Effect): # command connectors with a fill color set, will glitch into the elements list if is_command(node) or node.get(CONNECTOR_TYPE): - return[] + return [] if self.svg.selected: if node.get("id") in self.svg.selected: @@ -163,7 +163,9 @@ class InkstitchExtension(inkex.Effect): nodes.extend(self.descendants(child, selected, troubleshoot)) if selected: - if getattr(node, "get_path", None): + if node.tag == SVG_GROUP_TAG: + pass + elif getattr(node, "get_path", None): nodes.append(node) elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or node.tag in EMBROIDERABLE_TAGS or is_clone(node)): nodes.append(node) diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 1982a861..acd96d5b 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -9,7 +9,7 @@ from itertools import groupby import wx from wx.lib.scrolledpanel import ScrolledPanel -from ..commands import is_command +from ..commands import is_command, is_command_symbol from ..elements import (AutoFill, Clone, EmbroideryElement, Fill, Polyline, SatinColumn, Stroke) from ..elements.clone import is_clone @@ -484,7 +484,7 @@ class Params(InkstitchExtension): element = EmbroideryElement(node) classes = [] - if not is_command(node): + if not is_command(node) and not is_command_symbol(node): if node.tag == SVG_POLYLINE_TAG: classes.append(Polyline) elif is_clone(node): diff --git a/lib/gui/simulator.py b/lib/gui/simulator.py index 39c54195..5bc434bc 100644 --- a/lib/gui/simulator.py +++ b/lib/gui/simulator.py @@ -6,10 +6,10 @@ from threading import Event, Thread import wx from wx.lib.intctrl import IntCtrl +from .dialogs import info_dialog from ..i18n import _ from ..stitch_plan import patches_to_stitch_plan, stitch_plan_from_file from ..svg import PIXELS_PER_MM -from .dialogs import info_dialog # L10N command label at bottom of simulator window COMMAND_NAMES = [_("STITCH"), _("JUMP"), _("TRIM"), _("STOP"), _("COLOR CHANGE")] |