diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/elements/fill_stitch.py | 5 | ||||
| -rw-r--r-- | lib/stitches/meander_fill.py | 2 | ||||
| -rw-r--r-- | lib/svg/tags.py | 1 | ||||
| -rw-r--r-- | lib/tiles.py | 21 |
4 files changed, 3 insertions, 26 deletions
diff --git a/lib/elements/fill_stitch.py b/lib/elements/fill_stitch.py index 8de169e0..7c214798 100644 --- a/lib/elements/fill_stitch.py +++ b/lib/elements/fill_stitch.py @@ -171,11 +171,6 @@ class FillStitch(EmbroideryElement): return self.get_split_float_param('meander_scale_percent', (100, 100)) / 100 @property - @param('meander_padding_mm', _('Meander padding'), type='float', unit="mm", default=0, select_items=[('fill_method', 4)], sort_index=5) - def meander_padding(self): - return self.get_float_param('meander_padding_mm', 0) - - @property @param('angle', _('Angle of lines of stitches'), tooltip=_('The angle increases in a counter-clockwise direction. 0 is horizontal. Negative angles are allowed.'), diff --git a/lib/stitches/meander_fill.py b/lib/stitches/meander_fill.py index 5f399158..ca3b7d69 100644 --- a/lib/stitches/meander_fill.py +++ b/lib/stitches/meander_fill.py @@ -22,7 +22,7 @@ def meander_fill(fill, shape, shape_index, starting_point, ending_point): debug.log(f"tile name: {tile.name}") debug.log_line_strings(lambda: ensure_geometry_collection(shape.boundary).geoms, 'Meander shape') - graph = tile.to_graph(shape, fill.meander_scale, fill.meander_padding) + graph = tile.to_graph(shape, fill.meander_scale) debug.log_graph(graph, 'Meander graph') debug.log(lambda: f"graph connected? {nx.is_connected(graph)}") start, end = find_starting_and_ending_nodes(graph, shape, starting_point, ending_point) diff --git a/lib/svg/tags.py b/lib/svg/tags.py index 32744d1b..5a7d31c2 100644 --- a/lib/svg/tags.py +++ b/lib/svg/tags.py @@ -71,7 +71,6 @@ inkstitch_attribs = [ 'reverse', 'meander_pattern', 'meander_scale_percent', - 'meander_padding_mm', 'expand_mm', 'fill_underlay', 'fill_underlay_angle', diff --git a/lib/tiles.py b/lib/tiles.py index 5d33d946..9986183b 100644 --- a/lib/tiles.py +++ b/lib/tiles.py @@ -24,7 +24,6 @@ class Tile: self.tile = None self.width = None self.height = None - self.buffer_size = None self.shift0 = None self.shift1 = None @@ -39,7 +38,6 @@ class Tile: def _load(self): self._load_paths(self.tile_svg) self._load_dimensions(self.tile_svg) - self._load_buffer_size(self.tile_svg) self._load_parallelogram(self.tile_svg) def _load_paths(self, tile_svg): @@ -52,13 +50,6 @@ class Tile: self.width = svg_element.viewport_width self.height = svg_element.viewport_height - def _load_buffer_size(self, tile_svg): - circle_elements = tile_svg.findall('.//svg:circle', namespaces=inkex.NSS) - if circle_elements: - self.buffer_size = circle_elements[0].radius - else: - self.buffer_size = 0 - def _load_parallelogram(self, tile_svg): parallelogram_elements = tile_svg.findall(".//svg:*[@class='para']", namespaces=inkex.NSS) if parallelogram_elements: @@ -114,7 +105,7 @@ class Tile: self.tile = scaled_tile @debug.time - def to_graph(self, shape, scale, buffer=None): + def to_graph(self, shape, scale): """Apply this tile to a shape, repeating as necessary. Return value: @@ -128,15 +119,7 @@ class Tile: shape_center, shape_width, shape_height = self._get_center_and_dimensions(shape) shape_diagonal = Point(shape_width, shape_height).length() - - if not buffer: - average_scale = (x_scale + y_scale) / 2 - buffer = self.buffer_size * average_scale - - contracted_shape = shape.buffer(-buffer) - prepared_shape = prep(contracted_shape) - - # debug.log_line_string(contracted_shape.exterior, "contracted shape") + prepared_shape = prep(shape) return self._generate_graph(prepared_shape, shape_center, shape_diagonal) |