summaryrefslogtreecommitdiff
path: root/lib/extensions
diff options
context:
space:
mode:
authorKaalleen <reni@allenka.de>2022-01-29 09:53:50 +0100
committerKaalleen <reni@allenka.de>2022-05-04 19:04:44 +0200
commit82216b184c669d6dea26672e5c0771146e62ca39 (patch)
tree4ce9324418a71557c24c445afe1e0e388d4985c3 /lib/extensions
parent95a933161616e5860862435d4b999db49b8e50a5 (diff)
remove some pattern and marker mixups and some style issues
Diffstat (limited to 'lib/extensions')
-rw-r--r--lib/extensions/base.py6
-rw-r--r--lib/extensions/params.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/extensions/base.py b/lib/extensions/base.py
index 56385458..cf846324 100644
--- a/lib/extensions/base.py
+++ b/lib/extensions/base.py
@@ -16,7 +16,7 @@ from ..commands import is_command, layer_commands
from ..elements import EmbroideryElement, nodes_to_elements
from ..elements.clone import is_clone
from ..i18n import _
-from ..patterns import is_pattern
+from ..marker import has_marker
from ..svg import generate_unique_id
from ..svg.tags import (CONNECTOR_TYPE, EMBROIDERABLE_TAGS, INKSCAPE_GROUPMODE,
NOT_EMBROIDERABLE_TAGS, SVG_DEFS_TAG, SVG_GROUP_TAG)
@@ -161,10 +161,10 @@ class InkstitchExtension(inkex.Effect):
if selected:
if node.tag == SVG_GROUP_TAG:
pass
- elif (node.tag in EMBROIDERABLE_TAGS or is_clone(node)) and not is_pattern(node):
+ elif (node.tag in EMBROIDERABLE_TAGS or is_clone(node)) and not has_marker(node, 'pattern'):
nodes.append(node)
# add images, text and patterns for the troubleshoot extension
- elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or is_pattern(node)):
+ elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or has_marker(node, 'pattern')):
nodes.append(node)
return nodes
diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 30f6ba1d..55963625 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -296,7 +296,7 @@ class ParamsTab(ScrolledPanel):
widgets[3].Show(True)
choice["last_initialized_choice"] = current_selection
- def __do_layout(self, only_settings_grid=False):
+ def __do_layout(self, only_settings_grid=False): # noqa: C901
# just to add space around the settings
box = wx.BoxSizer(wx.VERTICAL)