diff options
Diffstat (limited to 'lib/extensions/gradient_blocks.py')
| -rw-r--r-- | lib/extensions/gradient_blocks.py | 50 |
1 files changed, 45 insertions, 5 deletions
diff --git a/lib/extensions/gradient_blocks.py b/lib/extensions/gradient_blocks.py index 5159149f..456b5007 100644 --- a/lib/extensions/gradient_blocks.py +++ b/lib/extensions/gradient_blocks.py @@ -5,21 +5,31 @@ from math import degrees -from inkex import PathElement, errormsg +from inkex import DirectedLineSegment, PathElement, errormsg +from shapely.geometry import Point +from shapely.ops import nearest_points +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.tags import INKSTITCH_ATTRIBS -from .base import InkstitchExtension +from .commands import CommandsExtension +from .duplicate_params import get_inkstitch_attributes -class GradientBlocks(InkstitchExtension): +class GradientBlocks(CommandsExtension): ''' This will break apart fill objects with a gradient fill into solid color blocks with end_row_spacing. ''' + COMMANDS = ['fill_start', 'fill_end'] + + def __init__(self, *args, **kwargs): + CommandsExtension.__init__(self, *args, **kwargs) + self.arg_parser.add_argument("-e", "--end-row-spacing", type=float, default=0.0, dest="end_row_spacing") + def effect(self): if not self.svg.selection: errormsg(_("Please select at least one object with a gradient fill.")) @@ -42,8 +52,12 @@ class GradientBlocks(InkstitchExtension): # reverse order so we can always insert with the same index number fill_shapes.reverse() attributes.reverse() + + previous_color = None + previous_element = None for i, shape in enumerate(fill_shapes): - style['fill'] = attributes[i]['color'] + color = attributes[i]['color'] + style['fill'] = color end_row_spacing = attributes[i]['end_row_spacing'] or None angle = degrees(attributes[i]['angle']) d = "M " + " ".join([f'{x}, {y}' for x, y in list(shape.exterior.coords)]) + " Z" @@ -54,15 +68,41 @@ class GradientBlocks(InkstitchExtension): "d": d, INKSTITCH_ATTRIBS['angle']: f'{angle: .2f}' }) + # 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}') - block.set('inkstitch:underpath', False) + # disable underlay and underpath + block.set('inkstitch:fill_underlay', False) + block.set('inkstitch:underpath', False) parent.insert(index, block) + + if previous_color == color: + current = FillStitch(block) + previous = FillStitch(previous_element) + nearest = nearest_points(current.shape, previous.shape) + pos_current = self._get_command_postion(current, nearest[0]) + pos_previous = self._get_command_postion(previous, nearest[1]) + add_commands(current, ['fill_end'], pos_current) + add_commands(previous, ['fill_start'], pos_previous) + previous_color = color + previous_element = block parent.remove(element.node) def has_gradient_color(self, element): return element.color.startswith('url') and "linearGradient" in element.color + def _get_command_postion(self, fill, point): + center = fill.shape.centroid + line = DirectedLineSegment((center.x, center.y), (point.x, point.y)) + pos = line.point_at_length(line.length + 20) + return Point(pos) + if __name__ == '__main__': e = GradientBlocks() |