diff --git a/dbus/select_elements.py b/dbus/select_elements.py index 2b663aed5..ad0167511 100644 --- a/dbus/select_elements.py +++ b/dbus/select_elements.py @@ -49,7 +49,7 @@ class DBusActions: # start dbus dbus = DBusActions() # give it some time to start -sleep(0.2) +sleep(0.5) # clear previous selection dbus.run_action('select-clear', None) # select with the list of ids diff --git a/lib/extensions/select_elements.py b/lib/extensions/select_elements.py index 8fa9ca9d5..896e04b0a 100644 --- a/lib/extensions/select_elements.py +++ b/lib/extensions/select_elements.py @@ -21,6 +21,7 @@ class SelectElements(InkstitchExtension): pars.add_argument("--info", type=str, dest="info") pars.add_argument("--select-running-stitch", type=Boolean, dest="running", default=False) + pars.add_argument("--running-stitch-condition", type=str, dest="running_stitch_condition", default="all") 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) @@ -101,7 +102,7 @@ class SelectElements(InkstitchExtension): def _select_stroke(self, element): select = False method = element.stroke_method - if self.options.running and method == 'running_stitch': + if self.options.running and method == 'running_stitch' and self._running_condition(element): select = True if self.options.ripples and method == 'ripple_stitch': select = True @@ -130,6 +131,11 @@ class SelectElements(InkstitchExtension): select = True return select + def _running_condition(self, element): + element_id = element.node.get_id() or '' + conditions = {'all': True, 'autorun-top': element_id.startswith('autorun'), 'autorun-underpath': element_id.startswith('underpath')} + return conditions[self.options.running_stitch_condition] + def _select_fill_underlay(self, element): underlay = {'all': True, 'no': not element.fill_underlay, 'yes': element.fill_underlay} return underlay[self.options.fill_underlay] diff --git a/templates/select_elements.xml b/templates/select_elements.xml index fee1f467f..a4ed148ad 100644 --- a/templates/select_elements.xml +++ b/templates/select_elements.xml @@ -8,7 +8,15 @@ + false + + + + + + false false false @@ -53,7 +61,7 @@ - +