diff options
| author | Kaalleen <36401965+kaalleen@users.noreply.github.com> | 2023-05-06 18:31:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 18:31:54 +0200 |
| commit | 2e62ba7926a19e2952148c6ced3b6ebf1a96d78a (patch) | |
| tree | 611df4000c633b66746b64589bb4fafc4f310cf9 /lib/elements | |
| parent | 909df7b33b07420b086f9a70b1107dfd81f9175b (diff) | |
Avoid duplicated points in make_spiral (#2268)
* avoid duplicated points in make_spiral
* circular fill: add end_row_spacing, repeats and bean repeats
* fix circular fill if original shape is a circle
Diffstat (limited to 'lib/elements')
| -rw-r--r-- | lib/elements/fill_stitch.py | 10 | ||||
| -rw-r--r-- | lib/elements/stroke.py | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/elements/fill_stitch.py b/lib/elements/fill_stitch.py index 9e2eed45..a2d4855f 100644 --- a/lib/elements/fill_stitch.py +++ b/lib/elements/fill_stitch.py @@ -285,6 +285,7 @@ class FillStitch(EmbroideryElement): sort_index=24, type='float', select_items=[('fill_method', 'auto_fill'), + ('fill_method', 'circular_fill'), ('fill_method', 'legacy_fill')], default=None) def end_row_spacing(self): @@ -378,7 +379,8 @@ class FillStitch(EmbroideryElement): tooltip=_('Defines how many times to run down and back along the path.'), type='int', default="1", - select_items=[('fill_method', 'meander_fill')], + select_items=[('fill_method', 'meander_fill'), + ('fill_method', 'circular_fill')], sort_index=33) def repeats(self): return max(1, self.get_int_param("repeats", 1)) @@ -391,7 +393,8 @@ class FillStitch(EmbroideryElement): 'A value of 2 would quintuple each stitch, etc.\n\n' 'A pattern with various repeats can be created with a list of values separated by a space.'), type='str', - select_items=[('fill_method', 'meander_fill')], + select_items=[('fill_method', 'meander_fill'), + ('fill_method', 'circular_fill')], default=0, sort_index=34) def bean_stitch_repeats(self): @@ -922,9 +925,12 @@ class FillStitch(EmbroideryElement): shape, self.angle, self.row_spacing, + self.end_row_spacing, self.staggers, self.running_stitch_length, self.running_stitch_tolerance, + self.bean_stitch_repeats, + self.repeats, self.skip_last, starting_point, ending_point, diff --git a/lib/elements/stroke.py b/lib/elements/stroke.py index ba525c2d..7ec6b76c 100644 --- a/lib/elements/stroke.py +++ b/lib/elements/stroke.py @@ -188,9 +188,10 @@ class Stroke(EmbroideryElement): @property @param('staggers', - _('Stagger lines this many times before repeating. For linear ripples only.'), + _('Stagger lines this many times before repeating'), tooltip=_('Length of the cycle by which successive stitch lines are staggered. ' - 'Fractional values are allowed and can have less visible diagonals than integer values.'), + 'Fractional values are allowed and can have less visible diagonals than integer values. ' + 'For linear ripples only.'), type='int', select_items=[('stroke_method', 'ripple_stitch')], default=1, |