From 111fd8f0ef7bc8e62322c38a7a7467c453f85331 Mon Sep 17 00:00:00 2001 From: Kaalleen Date: Sat, 13 May 2023 21:11:27 +0200 Subject: * move all gradient methods to extension * add underlay to single color elements to compensate density --- lib/elements/gradient_fill.py | 79 --------------------------- lib/extensions/gradient_blocks.py | 110 +++++++++++++++++++++++++++++++++----- lib/stitches/ripple_stitch.py | 5 +- 3 files changed, 99 insertions(+), 95 deletions(-) delete mode 100644 lib/elements/gradient_fill.py diff --git a/lib/elements/gradient_fill.py b/lib/elements/gradient_fill.py deleted file mode 100644 index 18443368..00000000 --- a/lib/elements/gradient_fill.py +++ /dev/null @@ -1,79 +0,0 @@ -from math import pi - -from inkex import DirectedLineSegment, Transform -from shapely import geometry as shgeo -from shapely.affinity import affine_transform, rotate -from shapely.ops import split - -from ..svg import PIXELS_PER_MM, get_correction_transform - - -def gradient_shapes_and_attributes(element, shape): - # e.g. url(#linearGradient872) -> linearGradient872 - color = element.color[5:-1] - xpath = f'.//svg:defs/svg:linearGradient[@id="{color}"]' - gradient = element.node.getroottree().getroot().findone(xpath) - gradient.apply_transform() - point1 = (float(gradient.get('x1')), float(gradient.get('y1'))) - point2 = (float(gradient.get('x2')), float(gradient.get('y2'))) - # get 90° angle to calculate the splitting angle - line = DirectedLineSegment(point1, point2) - angle = line.angle - (pi / 2) - # Ink/Stitch somehow turns the stitch angle - stitch_angle = angle * -1 - # create bbox polygon to calculate the length necessary to make sure that - # the gradient splitter lines will cut the entire design - bbox = element.node.bounding_box() - bbox_polygon = shgeo.Polygon([(bbox.left, bbox.top), (bbox.right, bbox.top), - (bbox.right, bbox.bottom), (bbox.left, bbox.bottom)]) - # gradient stops - offsets = gradient.stop_offsets - stop_styles = gradient.stop_styles - # now split the shape according to the gradient stops - polygons = [] - colors = [] - attributes = [] - previous_color = None - end_row_spacing = None - for i, offset in enumerate(offsets): - shape_rest = [] - split_point = shgeo.Point(line.point_at_ratio(float(offset))) - length = split_point.hausdorff_distance(bbox_polygon) - split_line = shgeo.LineString([(split_point.x - length - 2, split_point.y), - (split_point.x + length + 2, split_point.y)]) - split_line = rotate(split_line, angle, origin=split_point, use_radians=True) - transform = -Transform(get_correction_transform(element.node)) - transform = list(transform.to_hexad()) - split_line = affine_transform(split_line, transform) - offset_line = split_line.parallel_offset(1, 'right') - polygon = split(shape, split_line) - color = stop_styles[i]['stop-color'] - # does this gradient line split the shape - offset_outside_shape = len(polygon.geoms) == 1 - for poly in polygon.geoms: - if isinstance(poly, shgeo.Polygon) and element.shape_is_valid(poly): - if poly.intersects(offset_line): - if previous_color: - polygons.append(poly) - colors.append(previous_color) - attributes.append({'angle': stitch_angle, 'end_row_spacing': end_row_spacing, 'color': previous_color}) - polygons.append(poly) - attributes.append({'angle': stitch_angle + pi, 'end_row_spacing': end_row_spacing, 'color': color}) - else: - shape_rest.append(poly) - shape = shgeo.MultiPolygon(shape_rest) - previous_color = color - end_row_spacing = element.row_spacing / PIXELS_PER_MM * 2 - # add left over shape(s) - if shape: - if offset_outside_shape: - for s in shape.geoms: - polygons.append(s) - attributes.append({'color': stop_styles[-2]['stop-color'], 'angle': stitch_angle, 'end_row_spacing': end_row_spacing}) - stitch_angle += pi - else: - end_row_spacing = None - for s in shape.geoms: - polygons.append(s) - attributes.append({'color': stop_styles[-1]['stop-color'], 'angle': stitch_angle, 'end_row_spacing': end_row_spacing}) - return polygons, attributes diff --git a/lib/extensions/gradient_blocks.py b/lib/extensions/gradient_blocks.py index d80d5340..5d8318b6 100644 --- a/lib/extensions/gradient_blocks.py +++ b/lib/extensions/gradient_blocks.py @@ -3,17 +3,18 @@ # Copyright (c) 2010 Authors # Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. -from math import degrees +from math import degrees, pi -from inkex import DirectedLineSegment, PathElement, errormsg +from inkex import DirectedLineSegment, PathElement, Transform, errormsg +from shapely import geometry as shgeo +from shapely.affinity import affine_transform, rotate from shapely.geometry import Point -from shapely.ops import nearest_points +from shapely.ops import nearest_points, split from ..commands import add_commands from ..elements import FillStitch -from ..elements.gradient_fill import gradient_shapes_and_attributes from ..i18n import _ -from ..svg import get_correction_transform +from ..svg import PIXELS_PER_MM, get_correction_transform from ..svg.tags import INKSTITCH_ATTRIBS from .commands import CommandsExtension from .duplicate_params import get_inkstitch_attributes @@ -56,35 +57,45 @@ class GradientBlocks(CommandsExtension): fill_shapes.reverse() attributes.reverse() + if self.options.end_row_spacing != 0: + end_row_spacing = self.options.end_row_spacing + else: + end_row_spacing = element.row_spacing / PIXELS_PER_MM * 2 + end_row_spacing = f'{end_row_spacing: .2f}' + previous_color = None previous_element = None for i, shape in enumerate(fill_shapes): color = attributes[i]['color'] style['fill'] = color - end_row_spacing = attributes[i]['end_row_spacing'] or None + is_gradient = attributes[i]['is_gradient'] angle = degrees(attributes[i]['angle']) + angle = f'{angle: .2f}' d = "M " + " ".join([f'{x}, {y}' for x, y in list(shape.exterior.coords)]) + " Z" block = PathElement(attrib={ "id": self.uniqueId("path"), "style": str(style), "transform": correction_transform, "d": d, - INKSTITCH_ATTRIBS['angle']: f'{angle: .2f}' + INKSTITCH_ATTRIBS['angle']: angle }) # apply parameters from original element params = get_inkstitch_attributes(element.node) for attrib in params: block.attrib[attrib] = str(element.node.attrib[attrib]) - # set end_row_spacing - if end_row_spacing: - if self.options.end_row_spacing != 0: - end_row_spacing = self.options.end_row_spacing - block.set('inkstitch:end_row_spacing_mm', f'{end_row_spacing: .2f}') - else: - block.pop('inkstitch:end_row_spacing_mm') # disable underlay and underpath block.set('inkstitch:fill_underlay', False) block.set('inkstitch:underpath', False) + # set end_row_spacing + if is_gradient: + block.set('inkstitch:end_row_spacing_mm', end_row_spacing) + else: + block.pop('inkstitch:end_row_spacing_mm') + # use underlay to compensate for higher density in the gradient parts + block.set('inkstitch:fill_underlay', True) + block.set('inkstitch:fill_underlay_angle', angle) + block.set('inkstitch:fill_underlay_row_spacing_mm', end_row_spacing) + parent.insert(index, block) if previous_color == color: @@ -109,6 +120,77 @@ class GradientBlocks(CommandsExtension): return Point(pos) +def gradient_shapes_and_attributes(element, shape): + # e.g. url(#linearGradient872) -> linearGradient872 + color = element.color[5:-1] + xpath = f'.//svg:defs/svg:linearGradient[@id="{color}"]' + gradient = element.node.getroottree().getroot().findone(xpath) + gradient.apply_transform() + point1 = (float(gradient.get('x1')), float(gradient.get('y1'))) + point2 = (float(gradient.get('x2')), float(gradient.get('y2'))) + # get 90° angle to calculate the splitting angle + line = DirectedLineSegment(point1, point2) + angle = line.angle - (pi / 2) + # Ink/Stitch somehow turns the stitch angle + stitch_angle = angle * -1 + # create bbox polygon to calculate the length necessary to make sure that + # the gradient splitter lines will cut the entire design + bbox = element.node.bounding_box() + bbox_polygon = shgeo.Polygon([(bbox.left, bbox.top), (bbox.right, bbox.top), + (bbox.right, bbox.bottom), (bbox.left, bbox.bottom)]) + # gradient stops + offsets = gradient.stop_offsets + stop_styles = gradient.stop_styles + # now split the shape according to the gradient stops + polygons = [] + colors = [] + attributes = [] + previous_color = None + is_gradient = False + for i, offset in enumerate(offsets): + shape_rest = [] + split_point = shgeo.Point(line.point_at_ratio(float(offset))) + length = split_point.hausdorff_distance(bbox_polygon) + split_line = shgeo.LineString([(split_point.x - length - 2, split_point.y), + (split_point.x + length + 2, split_point.y)]) + split_line = rotate(split_line, angle, origin=split_point, use_radians=True) + transform = -Transform(get_correction_transform(element.node)) + transform = list(transform.to_hexad()) + split_line = affine_transform(split_line, transform) + offset_line = split_line.parallel_offset(1, 'right') + polygon = split(shape, split_line) + color = stop_styles[i]['stop-color'] + # does this gradient line split the shape + offset_outside_shape = len(polygon.geoms) == 1 + for poly in polygon.geoms: + if isinstance(poly, shgeo.Polygon) and element.shape_is_valid(poly): + if poly.intersects(offset_line): + if previous_color: + polygons.append(poly) + colors.append(previous_color) + attributes.append({'color': previous_color, 'angle': stitch_angle, 'is_gradient': is_gradient}) + polygons.append(poly) + attributes.append({'color': color, 'angle': stitch_angle + pi, 'is_gradient': is_gradient}) + else: + shape_rest.append(poly) + shape = shgeo.MultiPolygon(shape_rest) + previous_color = color + is_gradient = True + # add left over shape(s) + if shape: + if offset_outside_shape: + for s in shape.geoms: + polygons.append(s) + attributes.append({'color': stop_styles[-2]['stop-color'], 'angle': stitch_angle, 'is_gradient': is_gradient}) + stitch_angle += pi + else: + is_gradient = False + for s in shape.geoms: + polygons.append(s) + attributes.append({'color': stop_styles[-1]['stop-color'], 'angle': stitch_angle, 'is_gradient': is_gradient}) + return polygons, attributes + + if __name__ == '__main__': e = GradientBlocks() e.effect() diff --git a/lib/stitches/ripple_stitch.py b/lib/stitches/ripple_stitch.py index dc85445a..52d91c2d 100644 --- a/lib/stitches/ripple_stitch.py +++ b/lib/stitches/ripple_stitch.py @@ -103,8 +103,9 @@ def _get_satin_line_count(stroke, pairs): if shortest_line_len == 0 or length < shortest_line_len: shortest_line_len = length num_lines = ceil(shortest_line_len / stroke.min_line_dist) - # we want the line count to be constantly even or odd (even if the design is resized - # so the stitch plan can be carefully planed connecting the end point to the following object + # We want the line count always to be either even or odd - depending on the line count value. + # So that the end point stays the same even if the design is resized. This is necessary to enable + # the user to carefully plan the output and and connect the end point to the following object if stroke.line_count % 2 != num_lines % 2: num_lines -= 1 # for flat join styles we need to add an other line -- cgit v1.2.3