diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/base.py | 7 | ||||
| -rw-r--r-- | lib/extensions/break_apart.py | 17 | ||||
| -rw-r--r-- | lib/extensions/cleanup.py | 14 |
3 files changed, 26 insertions, 12 deletions
diff --git a/lib/extensions/base.py b/lib/extensions/base.py index 310dd873..9f6dc5f6 100644 --- a/lib/extensions/base.py +++ b/lib/extensions/base.py @@ -14,7 +14,8 @@ from ..elements.clone import is_clone, is_embroiderable_clone from ..i18n import _ from ..svg import generate_unique_id from ..svg.tags import (CONNECTOR_TYPE, EMBROIDERABLE_TAGS, INKSCAPE_GROUPMODE, - NOT_EMBROIDERABLE_TAGS, SVG_DEFS_TAG, SVG_GROUP_TAG) + NOT_EMBROIDERABLE_TAGS, SVG_DEFS_TAG, SVG_GROUP_TAG, + SVG_PATH_TAG) SVG_METADATA_TAG = inkex.addNS("metadata", "svg") @@ -164,9 +165,9 @@ class InkstitchExtension(inkex.Effect): nodes.extend(self.descendants(child, selected, troubleshoot)) if selected: - if node.tag in EMBROIDERABLE_TAGS or is_embroiderable_clone(node): + if (node.tag in EMBROIDERABLE_TAGS or is_embroiderable_clone(node)) and not (node.tag == SVG_PATH_TAG and not node.get('d', '')): nodes.append(node) - elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or is_clone(node)): + elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or node.tag in EMBROIDERABLE_TAGS or is_clone(node)): nodes.append(node) return nodes diff --git a/lib/extensions/break_apart.py b/lib/extensions/break_apart.py index 32f548f6..30b2a4b0 100644 --- a/lib/extensions/break_apart.py +++ b/lib/extensions/break_apart.py @@ -21,7 +21,7 @@ class BreakApart(InkstitchExtension): InkstitchExtension.__init__(self, *args, **kwargs) self.OptionParser.add_option("-m", "--method", type="int", default=1, dest="method") - def effect(self): + def effect(self): # noqa: C901 if not self.selected: inkex.errormsg(_("Please select one or more fill areas to break apart.")) return @@ -38,10 +38,13 @@ class BreakApart(InkstitchExtension): # we don't want to touch valid elements paths = element.flatten(element.parse_path()) - paths.sort(key=lambda point_list: Polygon(point_list).area, reverse=True) - polygon = MultiPolygon([(paths[0], paths[1:])]) - if self.geom_is_valid(polygon): - continue + try: + paths.sort(key=lambda point_list: Polygon(point_list).area, reverse=True) + polygon = MultiPolygon([(paths[0], paths[1:])]) + if self.geom_is_valid(polygon): + continue + except ValueError: + pass polygons = self.break_apart_paths(paths) polygons = self.ensure_minimum_size(polygons, 5) @@ -54,13 +57,15 @@ class BreakApart(InkstitchExtension): def break_apart_paths(self, paths): polygons = [] for path in paths: + if len(path) < 3: + continue linestring = LineString(path) - polygon = Polygon(path).buffer(0) if not linestring.is_simple: linestring = unary_union(linestring) for polygon in polygonize(linestring): polygons.append(polygon) else: + polygon = Polygon(path).buffer(0) polygons.append(polygon) return polygons diff --git a/lib/extensions/cleanup.py b/lib/extensions/cleanup.py index f8cb7d9a..e06b4bea 100644 --- a/lib/extensions/cleanup.py +++ b/lib/extensions/cleanup.py @@ -1,5 +1,7 @@ import sys +from inkex import NSS + from ..elements import Fill, Stroke from ..i18n import _ from .base import InkstitchExtension @@ -22,13 +24,19 @@ class Cleanup(InkstitchExtension): # Remove selection, we want every element in the document self.selected = {} + count = 0 + svg = self.document.getroot() + empty_d_objects = svg.xpath(".//svg:path[@d='' or not(@d)]", namespaces=NSS) + for empty in empty_d_objects: + empty.getparent().remove(empty) + count += 1 + if not self.get_elements(): + print >> sys.stderr, _("%s elements removed" % count) return - count = 0 for element in self.elements: - if (isinstance(element, Fill) and self.rm_fill and - element.shape.area < self.fill_threshold): + if (isinstance(element, Fill) and self.rm_fill and element.shape.area < self.fill_threshold): element.node.getparent().remove(element.node) count += 1 if (isinstance(element, Stroke) and self.rm_stroke and |