* autofill to fillstitch

* remove too complex warning for fillstitch
* some marker adjustments

3 files changed, 7 insertions, 8 deletions

diff --git a/lib/extensions/base.py b/lib/extensions/base.py
index cf846324..949f947e 100644
--- a/lib/extensions/base.py
+++ b/lib/extensions/base.py
@@ -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 has_marker(node, 'pattern'):
+            elif (node.tag in EMBROIDERABLE_TAGS or is_clone(node)) and not has_marker(node):
                 nodes.append(node)
-            # add images, text and patterns for the troubleshoot extension
-            elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or has_marker(node, 'pattern')):
+            # add images, text and elements with a marker for the troubleshoot extension
+            elif troubleshoot and (node.tag in NOT_EMBROIDERABLE_TAGS or has_marker(node)):
                 nodes.append(node)
 
         return nodes
diff --git a/lib/extensions/cleanup.py b/lib/extensions/cleanup.py
index ae95041b..4c350d62 100644
--- a/lib/extensions/cleanup.py
+++ b/lib/extensions/cleanup.py
@@ -5,7 +5,7 @@
 
 from inkex import NSS, Boolean, errormsg
 
-from ..elements import AutoFill, Stroke
+from ..elements import FillStitch, Stroke
 from ..i18n import _
 from .base import InkstitchExtension
 
@@ -38,7 +38,7 @@ class Cleanup(InkstitchExtension):
             return
 
         for element in self.elements:
-            if (isinstance(element, AutoFill) and self.rm_fill and element.shape.area < self.fill_threshold):
+            if (isinstance(element, FillStitch) and self.rm_fill and element.shape.area < self.fill_threshold):
                 element.node.getparent().remove(element.node)
                 count += 1
             if (isinstance(element, Stroke) and self.rm_stroke and
diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 55963625..69a559ce 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -15,7 +15,7 @@ import wx
 from wx.lib.scrolledpanel import ScrolledPanel
 
 from ..commands import is_command, is_command_symbol
-from ..elements import (AutoFill, Clone, EmbroideryElement, Polyline,
+from ..elements import (FillStitch, Clone, EmbroideryElement, Polyline,
                         SatinColumn, Stroke)
 from ..elements.clone import is_clone
 from ..gui import PresetsPanel, SimulatorPreview, WarningPanel
@@ -606,8 +606,7 @@ class Params(InkstitchExtension):
                 classes.append(Clone)
             else:
                 if element.get_style("fill", 'black') and not element.get_style("fill-opacity", 1) == "0":
-                    classes.append(AutoFill)
-                    # classes.append(Fill)
+                    classes.append(FillStitch)
                 if element.get_style("stroke") is not None:
                     classes.append(Stroke)
                     if element.get_style("stroke-dasharray") is None: