From 4ba3cd708561870a731d9634d9cdd5c18579cac7 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 22 Feb 2019 22:07:15 -0500 Subject: refactor add_commands() out into commands module --- lib/svg/svg.py | 127 +++++---------------------------------------------------- 1 file changed, 11 insertions(+), 116 deletions(-) (limited to 'lib/svg/svg.py') diff --git a/lib/svg/svg.py b/lib/svg/svg.py index 3fceebfb..0ec43f75 100644 --- a/lib/svg/svg.py +++ b/lib/svg/svg.py @@ -1,124 +1,19 @@ -import inkex -import simplestyle -import simpletransform - -from ..i18n import _ from ..utils import cache -from .realistic_rendering import realistic_stitch, realistic_filter -from .tags import SVG_GROUP_TAG, INKSCAPE_LABEL, INKSCAPE_GROUPMODE, SVG_PATH_TAG, SVG_DEFS_TAG -from .units import get_viewbox_transform - - -def color_block_to_point_lists(color_block): - point_lists = [[]] - - for stitch in color_block: - if stitch.trim: - if point_lists[-1]: - point_lists.append([]) - continue - - if not stitch.jump and not stitch.color_change: - point_lists[-1].append(stitch.as_tuple()) - - # filter out empty point lists - point_lists = [p for p in point_lists if p] - - return point_lists @cache -def get_correction_transform(svg): - transform = get_viewbox_transform(svg) - - # we need to correct for the viewbox - transform = simpletransform.invertTransform(transform) - transform = simpletransform.formatTransform(transform) - - return transform - - -def color_block_to_realistic_stitches(color_block, svg): - paths = [] - - for point_list in color_block_to_point_lists(color_block): - if not point_list: - continue - - color = color_block.color.visible_on_white.darker.to_hex_str() - start = point_list[0] - for point in point_list[1:]: - paths.append(inkex.etree.Element( - SVG_PATH_TAG, - {'style': simplestyle.formatStyle( - { - 'fill': color, - 'stroke': 'none', - 'filter': 'url(#realistic-stitch-filter)' - }), - 'd': realistic_stitch(start, point), - 'transform': get_correction_transform(svg) - })) - start = point - - return paths - - -def color_block_to_paths(color_block, svg): - paths = [] - # We could emit just a single path with one subpath per point list, but - # emitting multiple paths makes it easier for the user to manipulate them. - for point_list in color_block_to_point_lists(color_block): - color = color_block.color.visible_on_white.to_hex_str() - paths.append(inkex.etree.Element( - SVG_PATH_TAG, - {'style': simplestyle.formatStyle( - {'stroke': color, - 'stroke-width': "0.4", - 'fill': 'none'}), - 'd': "M" + " ".join(" ".join(str(coord) for coord in point) for point in point_list), - 'transform': get_correction_transform(svg), - 'embroider_manual_stitch': 'true', - 'embroider_trim_after': 'true', - })) - - # no need to trim at the end of a thread color - if paths: - paths[-1].attrib.pop('embroider_trim_after') - - return paths - - -def render_stitch_plan(svg, stitch_plan, realistic=False): - layer = svg.find(".//*[@id='__inkstitch_stitch_plan__']") - if layer is None: - layer = inkex.etree.Element(SVG_GROUP_TAG, - {'id': '__inkstitch_stitch_plan__', - INKSCAPE_LABEL: _('Stitch Plan'), - INKSCAPE_GROUPMODE: 'layer'}) - else: - # delete old stitch plan - del layer[:] - - # make sure the layer is visible - layer.set('style', 'display:inline') - - for i, color_block in enumerate(stitch_plan): - group = inkex.etree.SubElement(layer, - SVG_GROUP_TAG, - {'id': '__color_block_%d__' % i, - INKSCAPE_LABEL: "color block %d" % (i + 1)}) - if realistic: - group.extend(color_block_to_realistic_stitches(color_block, svg)) - else: - group.extend(color_block_to_paths(color_block, svg)) +def get_document(node): + return node.getroottree().getroot() - svg.append(layer) - if realistic: - defs = svg.find(SVG_DEFS_TAG) +def generate_unique_id(document, prefix="path"): + doc_ids = {node.get('id') for node in document.iterdescendants() if 'id' in node.attrib} - if defs is None: - defs = inkex.etree.SubElement(svg, SVG_DEFS_TAG) + i = 1 + while True: + new_id = "%s%d" % (prefix, i) + if new_id not in doc_ids: + break + i += 1 - defs.append(inkex.etree.fromstring(realistic_filter)) + return new_id -- cgit v1.2.3 From 53a9bd6b31ca3a1f50d41f228e0b598a7d9da8ea Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 25 Feb 2019 19:49:38 -0500 Subject: add trims in stitches.auto_satin --- lib/svg/svg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/svg/svg.py') diff --git a/lib/svg/svg.py b/lib/svg/svg.py index 0ec43f75..3715def8 100644 --- a/lib/svg/svg.py +++ b/lib/svg/svg.py @@ -1,3 +1,5 @@ +from inkex import etree + from ..utils import cache @@ -6,7 +8,8 @@ def get_document(node): return node.getroottree().getroot() -def generate_unique_id(document, prefix="path"): +def generate_unique_id(document_or_element, prefix="path"): + document = get_document(document_or_element) doc_ids = {node.get('id') for node in document.iterdescendants() if 'id' in node.attrib} i = 1 -- cgit v1.2.3 From d1c001857d1e389950b3f346c1a0413d82899ca4 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 8 Mar 2019 20:50:48 -0500 Subject: get root properly --- lib/svg/svg.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/svg/svg.py') diff --git a/lib/svg/svg.py b/lib/svg/svg.py index 3715def8..464a2a18 100644 --- a/lib/svg/svg.py +++ b/lib/svg/svg.py @@ -9,7 +9,11 @@ def get_document(node): def generate_unique_id(document_or_element, prefix="path"): - document = get_document(document_or_element) + if isinstance(document_or_element, etree._ElementTree): + document = document_or_element.getroot() + else: + document = get_document(document_or_element) + doc_ids = {node.get('id') for node in document.iterdescendants() if 'id' in node.attrib} i = 1 -- cgit v1.2.3