diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/params.py | 12 | ||||
| -rw-r--r-- | lib/extensions/select_elements.py | 5 | ||||
| -rw-r--r-- | lib/extensions/update_svg.py | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 076ed301..dc6cd147 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -16,15 +16,15 @@ import wx from wx.lib.scrolledpanel import ScrolledPanel from ..commands import is_command, is_command_symbol -from ..elements import (Clone, EmbroideryElement, FillStitch, Polyline, - SatinColumn, Stroke) +from ..elements import (Clone, EmbroideryElement, FillStitch, SatinColumn, + Stroke) from ..elements.clone import is_clone from ..exceptions import InkstitchException, format_uncaught_exception from ..gui import PresetsPanel, PreviewRenderer, WarningPanel from ..gui.simulator import SplitSimulatorWindow from ..i18n import _ from ..stitch_plan import stitch_groups_to_stitch_plan -from ..svg.tags import SVG_POLYLINE_TAG +from ..svg.tags import EMBROIDERABLE_TAGS from ..utils import get_resource_dir from ..utils.param import ParamOption from ..utils.svg_data import get_pagecolor @@ -658,10 +658,10 @@ class Params(InkstitchExtension): classes = [] if not is_command(node) and not is_command_symbol(node): - if node.tag == SVG_POLYLINE_TAG: - classes.append(Polyline) - elif is_clone(node): + if is_clone(node): classes.append(Clone) + elif node.tag in EMBROIDERABLE_TAGS and not node.get_path(): + pass else: if element.get_style("fill", 'black') and not element.get_style("fill-opacity", 1) == "0": classes.append(FillStitch) diff --git a/lib/extensions/select_elements.py b/lib/extensions/select_elements.py index c1b948a3..59e3d06d 100644 --- a/lib/extensions/select_elements.py +++ b/lib/extensions/select_elements.py @@ -9,7 +9,7 @@ import sys from inkex import Boolean, errormsg -from ..elements import Clone, FillStitch, Polyline, SatinColumn, Stroke +from ..elements import Clone, FillStitch, SatinColumn, Stroke from ..i18n import _ from ..utils import get_bundled_dir from .base import InkstitchExtension @@ -27,7 +27,6 @@ class SelectElements(InkstitchExtension): pars.add_argument("--select-ripples", type=Boolean, dest="ripples", default=False) pars.add_argument("--select-zigzag", type=Boolean, dest="zigzag", default=False) pars.add_argument("--select-manual", type=Boolean, dest="manual", default=False) - pars.add_argument("--select-polyline", type=Boolean, dest="poly", default=False) pars.add_argument("--select-satin", type=Boolean, dest="satin", default=False) pars.add_argument("--satin-underlay", type=str, dest="satin_underlay", default="all") pars.add_argument("--rung-count", type=str, dest="rung_count", default="all") @@ -115,8 +114,6 @@ class SelectElements(InkstitchExtension): for element in self.elements: if isinstance(element, Stroke) and self._select_stroke(element): ids.add(element.id) - elif isinstance(element, Polyline) and self.options.poly: - ids.add(element.id) elif isinstance(element, FillStitch) and self._select_fill(element): ids.add(element.id) elif isinstance(element, SatinColumn) and self._select_satin(element): diff --git a/lib/extensions/update_svg.py b/lib/extensions/update_svg.py index 0f0609be..f620af2d 100644 --- a/lib/extensions/update_svg.py +++ b/lib/extensions/update_svg.py @@ -14,8 +14,11 @@ class UpdateSvg(InkstitchExtension): def __init__(self, *args, **kwargs): InkstitchExtension.__init__(self, *args, **kwargs) + # inkstitch_svg_version history: + # 1 -> v3.0.0, May 2023 + # 2 -> v.3.1.0 May 2024 + # TODO: When there are more legacy versions than only one, this can be transformed into a user input - # inkstitch_svg_version history: 1 -> v3.0.0, May 2023 self.update_from = 0 def effect(self): |