diff options
Diffstat (limited to 'lib/elements')
| -rw-r--r-- | lib/elements/__init__.py | 1 | ||||
| -rw-r--r-- | lib/elements/polyline.py | 103 | ||||
| -rw-r--r-- | lib/elements/utils.py | 12 |
3 files changed, 3 insertions, 113 deletions
diff --git a/lib/elements/__init__.py b/lib/elements/__init__.py index 00933f36..bcb341e1 100644 --- a/lib/elements/__init__.py +++ b/lib/elements/__init__.py @@ -8,7 +8,6 @@ from .element import EmbroideryElement from .empty_d_object import EmptyDObject from .fill_stitch import FillStitch from .image import ImageObject -from .polyline import Polyline from .satin_column import SatinColumn from .stroke import Stroke from .text import TextObject diff --git a/lib/elements/polyline.py b/lib/elements/polyline.py deleted file mode 100644 index 9d17132a..00000000 --- a/lib/elements/polyline.py +++ /dev/null @@ -1,103 +0,0 @@ -# Authors: see git history -# -# Copyright (c) 2010 Authors -# Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. - -from inkex import Path -from shapely import geometry as shgeo - -from ..i18n import _ -from ..stitch_plan import StitchGroup -from ..utils import cache -from ..utils.geometry import Point -from .element import EmbroideryElement, param -from .validation import ValidationWarning - - -class PolylineWarning(ValidationWarning): - name = _("Polyline Object") - description = _("This object is an SVG PolyLine. Ink/Stitch can work with this shape, " - "but you can't edit it in Inkscape. Convert it to a manual stitch path " - "to allow editing.") - steps_to_solve = [ - _("* Select this object."), - _("* Do Path > Object to Path."), - _('* Optional: Run the Params extension and check the "manual stitch" box.') - ] - - -class Polyline(EmbroideryElement): - # Handle a <polyline> element, which is treated as a set of points to - # stitch exactly. - # - # <polyline> elements are pretty rare in SVG, from what I can tell. - # Anything you can do with a <polyline> can also be done with a <p>, and - # much more. - # - # Notably, EmbroiderModder2 uses <polyline> elements when converting from - # common machine embroidery file formats to SVG. Handling those here lets - # users use File -> Import to pull in existing designs they may have - # obtained, for example purchased fonts. - - element_name = "Polyline" - - @property - @param('polyline', _('Manual stitch along path'), type='toggle', inverse=True) - def polyline(self): - return self.get_boolean_param("polyline") - - @property - @cache - def shape(self): - return shgeo.MultiLineString(self.csp[0]) - - @property - def path(self): - # A polyline is a series of connected line segments described by their - # points. In order to make use of the existing logic for incorporating - # svg transforms that is in our superclass, we'll convert the polyline - # to a degenerate cubic superpath in which the bezier handles are on - # the segment endpoints. - if self.node.get('points', None): - path = self.node.get_path() - else: - # Set path to (0, 0) for empty polylines - path = 'M 0 0' - path = Path(path).to_superpath() - return path - - @property - @cache - def csp(self): - csp = self.parse_path() - - return csp - - @property - def color(self): - # EmbroiderModder2 likes to use the `stroke` property directly instead - # of CSS. - return self.get_style("stroke", "#000000") - - @property - def stitches(self): - # For a <polyline>, we'll stitch the points exactly as they exist in - # the SVG, with no stitch spacing interpolation, flattening, etc. - - # See the comments in the parent class's parse_path method for a - # description of the CSP data structure. - - stitches = [point for handle_before, point, handle_after in self.csp[0]] - - return stitches - - def validation_warnings(self): - yield PolylineWarning(self.path[0][0][0]) - - def to_stitch_groups(self, last_stitch_group): - stitch_group = StitchGroup(color=self.color, lock_stitches=(None, None)) - - for stitch in self.stitches: - stitch_group.add_stitch(Point(*stitch)) - - return [stitch_group] diff --git a/lib/elements/utils.py b/lib/elements/utils.py index d5122e3f..fde66afc 100644 --- a/lib/elements/utils.py +++ b/lib/elements/utils.py @@ -5,30 +5,24 @@ from ..commands import is_command from ..marker import has_marker -from ..svg.tags import (EMBROIDERABLE_TAGS, SVG_IMAGE_TAG, SVG_PATH_TAG, - SVG_POLYGON_TAG, SVG_POLYLINE_TAG, SVG_TEXT_TAG) +from ..svg.tags import EMBROIDERABLE_TAGS, SVG_IMAGE_TAG, SVG_PATH_TAG, SVG_TEXT_TAG from .clone import Clone, is_clone from .element import EmbroideryElement from .empty_d_object import EmptyDObject from .fill_stitch import FillStitch from .image import ImageObject from .marker import MarkerObject -from .polyline import Polyline from .satin_column import SatinColumn from .stroke import Stroke from .text import TextObject def node_to_elements(node, clone_to_element=False): # noqa: C901 - if node.tag == SVG_POLYLINE_TAG: - return [Polyline(node)] - - elif is_clone(node) and not clone_to_element: + if is_clone(node) and not clone_to_element: # clone_to_element: get an actual embroiderable element once a clone has been defined as a clone return [Clone(node)] - elif ((node.tag == SVG_PATH_TAG and not node.get('d', None)) or - (node.tag in [SVG_POLYLINE_TAG, SVG_POLYGON_TAG] and not node.get('points', None))): + elif node.tag in EMBROIDERABLE_TAGS and not node.get_path(): return [EmptyDObject(node)] elif has_marker(node): |