* autofill to fillstitch

* remove too complex warning for fillstitch
* some marker adjustments

1 files changed, 5 insertions, 8 deletions

diff --git a/lib/elements/utils.py b/lib/elements/utils.py
index 9b9b8f14..561188aa 100644
--- a/lib/elements/utils.py
+++ b/lib/elements/utils.py
@@ -7,12 +7,12 @@ from ..commands import is_command
 from ..marker import has_marker
 from ..svg.tags import (EMBROIDERABLE_TAGS, SVG_IMAGE_TAG, SVG_PATH_TAG,
                         SVG_POLYLINE_TAG, SVG_TEXT_TAG)
-from .auto_fill import AutoFill
+from .fill_stitch import FillStitch
 from .clone import Clone, is_clone
 from .element import EmbroideryElement
 from .empty_d_object import EmptyDObject
 from .image import ImageObject
-from .pattern import PatternObject
+from .marker import MarkerObject
 from .polyline import Polyline
 from .satin_column import SatinColumn
 from .stroke import Stroke
@@ -29,8 +29,8 @@ def node_to_elements(node):  # noqa: C901
     elif node.tag == SVG_PATH_TAG and not node.get('d', ''):
         return [EmptyDObject(node)]
 
-    elif has_marker(node, 'pattern'):
-        return [PatternObject(node)]
+    elif has_marker(node):
+        return [MarkerObject(node)]
 
     elif node.tag in EMBROIDERABLE_TAGS:
         element = EmbroideryElement(node)
@@ -40,10 +40,7 @@ def node_to_elements(node):  # noqa: C901
         else:
             elements = []
             if element.get_style("fill", "black") and not element.get_style('fill-opacity', 1) == "0":
-                # if element.get_boolean_param("auto_fill", True):
-                elements.append(AutoFill(node))
-                # else:
-                #    elements.append(Fill(node))
+                elements.append(FillStitch(node))
             if element.get_style("stroke"):
                 if not is_command(element.node):
                     elements.append(Stroke(node))