diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/base.py | 7 | ||||
| -rw-r--r-- | lib/extensions/cleanup.py | 14 |
2 files changed, 15 insertions, 6 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/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 |