diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/params.py | 3 | ||||
| -rw-r--r-- | lib/extensions/select_elements.py | 20 | ||||
| -rw-r--r-- | lib/extensions/stroke_to_lpe_satin.py | 2 | ||||
| -rw-r--r-- | lib/extensions/zigzag_line_to_satin.py | 2 |
4 files changed, 9 insertions, 18 deletions
diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 802086d8..bf01153b 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -672,8 +672,7 @@ class Params(InkstitchExtension): classes.append(FillStitch) if element.get_style("stroke") is not None: classes.append(Stroke) - if element.get_style("stroke-dasharray") is None: - classes.append(SatinColumn) + classes.append(SatinColumn) return classes def get_nodes_by_class(self): diff --git a/lib/extensions/select_elements.py b/lib/extensions/select_elements.py index 0d4ce5f1..8fa9ca9d 100644 --- a/lib/extensions/select_elements.py +++ b/lib/extensions/select_elements.py @@ -22,9 +22,9 @@ class SelectElements(InkstitchExtension): pars.add_argument("--select-running-stitch", type=Boolean, dest="running", default=False) pars.add_argument("--select-ripples", type=Boolean, dest="ripples", default=False) + pars.add_argument("--select-zigzag", type=Boolean, dest="zigzag", default=False) pars.add_argument("--select-manual", type=Boolean, dest="manual", default=False) pars.add_argument("--select-polyline", type=Boolean, dest="poly", default=False) - pars.add_argument("--select-zigzag", type=Boolean, dest="zigzag", default=False) pars.add_argument("--select-satin", type=Boolean, dest="satin", default=False) pars.add_argument("--satin-underlay", type=str, dest="satin_underlay", default="all") pars.add_argument("--select-e", type=Boolean, dest="e", default=False) @@ -101,16 +101,13 @@ class SelectElements(InkstitchExtension): def _select_stroke(self, element): select = False method = element.stroke_method - manual = element.manual_stitch_mode - if self.options.ripples and method == 1: + if self.options.running and method == 'running_stitch': select = True - elif self.options.manual and manual: + if self.options.ripples and method == 'ripple_stitch': select = True - elif method == 1 or manual: - return False - elif self.options.zigzag and not element.dashed: + elif self.options.zigzag and method == 'zigzag_stitch': select = True - elif self.options.running and element.dashed: + elif self.options.manual and method == 'manual_stitch': select = True return select @@ -139,13 +136,12 @@ class SelectElements(InkstitchExtension): def _select_satin(self, element): select = False - if not (self.options.satin or self.options.e): - return False if not self._select_satin_underlay(element): return False - if self.options.e and element.e_stitch: + method = element.satin_method + if self.options.satin and method == "satin_column": select = True - elif self.options.satin and not element.e_stitch: + elif self.options.e and method == "e_stitch": select = True return select diff --git a/lib/extensions/stroke_to_lpe_satin.py b/lib/extensions/stroke_to_lpe_satin.py index 1e9813a6..4052207a 100644 --- a/lib/extensions/stroke_to_lpe_satin.py +++ b/lib/extensions/stroke_to_lpe_satin.py @@ -92,8 +92,6 @@ class StrokeToLpeSatin(InkstitchExtension): element.set_param('satin_column', 'true') element.node.style['stroke-width'] = self.svg.viewport_to_unit('0.756') - # remove running_stitch dashes if they are there - element.update_dash(False) def _process_satin_column(self, element): current_effects = element.node.get(PATH_EFFECT, None) diff --git a/lib/extensions/zigzag_line_to_satin.py b/lib/extensions/zigzag_line_to_satin.py index 94a901c0..7e5232a7 100644 --- a/lib/extensions/zigzag_line_to_satin.py +++ b/lib/extensions/zigzag_line_to_satin.py @@ -50,8 +50,6 @@ class ZigzagLineToSatin(InkstitchExtension): element.node.set('d', " ".join(d)) element.set_param('satin_column', True) - # remove dashes - element.update_dash(False) def _get_rails_and_rungs(self, point_list): if self.options.pattern == "sawtooth": |