Auto route for running stitch (#1638)

* add auto route for running stitch
* introduce free motion commands

Co-authored-by: Lex Neva <github.com@lexneva.name>

4 files changed, 17 insertions, 20 deletions

diff --git a/lib/elements/pattern.py b/lib/elements/marker.py
index 4b92d366..574ce91e 100644
--- a/lib/elements/pattern.py
+++ b/lib/elements/marker.py
@@ -10,24 +10,23 @@ from .element import EmbroideryElement
 from .validation import ObjectTypeWarning
 
 
-class PatternWarning(ObjectTypeWarning):
-    name = _("Pattern Element")
+class MarkerWarning(ObjectTypeWarning):
+    name = _("Marker Element")
     description = _("This element will not be embroidered. "
-                    "It will appear as a pattern applied to objects in the same group as it.  "
-                    "Objects in sub-groups will be ignored.")
+                    "It will be applied to objects in the same group. Objects in sub-groups will be ignored.")
     steps_to_solve = [
-        _("To disable pattern mode, remove the pattern marker:"),
+        _("Turn back to normal embroidery element mode, remove the marker:"),
         _('* Open the Fill and Stroke panel (Objects > Fill and Stroke)'),
         _('* Go to the Stroke style tab'),
         _('* Under "Markers" choose the first (empty) option in the first dropdown list.')
     ]
 
 
-class PatternObject(EmbroideryElement):
+class MarkerObject(EmbroideryElement):
 
     def validation_warnings(self):
         repr_point = next(inkex.Path(self.parse_path()).end_points)
-        yield PatternWarning(repr_point)
+        yield MarkerWarning(repr_point)
 
     def to_stitch_groups(self, last_patch):
         return []
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index a30f16d4..83080003 100644
--- a/lib/elements/satin_column.py
+++ b/lib/elements/satin_column.py
@@ -216,10 +216,7 @@ class SatinColumn(EmbroideryElement):
         # This isn't used for satins at all, but other parts of the code
         # may need to know the general shape of a satin column.
 
-        flattened = self.flatten(self.parse_path())
-        line_strings = [shgeo.LineString(path) for path in flattened]
-
-        return shgeo.MultiLineString(line_strings)
+        return shgeo.MultiLineString(self.flattened_rails).convex_hull
 
     @property
     @cache
diff --git a/lib/elements/stroke.py b/lib/elements/stroke.py
index 307c78b8..6f8d8bb1 100644
--- a/lib/elements/stroke.py
+++ b/lib/elements/stroke.py
@@ -87,7 +87,7 @@ class Stroke(EmbroideryElement):
 
         # manipulate invalid path
         if len(flattened[0]) == 1:
-            return [[[flattened[0][0][0], flattened[0][0][1]], [flattened[0][0][0]+1.0, flattened[0][0][1]]]]
+            return [[[flattened[0][0][0], flattened[0][0][1]], [flattened[0][0][0] + 1.0, flattened[0][0][1]]]]
 
         if self.manual_stitch_mode:
             return [self.strip_control_points(subpath) for subpath in path]
@@ -97,12 +97,13 @@ class Stroke(EmbroideryElement):
     @property
     @cache
     def shape(self):
+        return self.as_multi_line_string().convex_hull
+
+    @cache
+    def as_multi_line_string(self):
         line_strings = [shapely.geometry.LineString(path) for path in self.paths]
 
-        # Using convex_hull here is an important optimization.  Otherwise
-        # complex paths cause operations on the shape to take a long time.
-        # This especially happens when importing machine embroidery files.
-        return shapely.geometry.MultiLineString(line_strings).convex_hull
+        return shapely.geometry.MultiLineString(line_strings)
 
     @property
     @param('manual_stitch',
diff --git a/lib/elements/utils.py b/lib/elements/utils.py
index 99df7002..960f5b07 100644
--- a/lib/elements/utils.py
+++ b/lib/elements/utils.py
@@ -4,7 +4,7 @@
 # Licensed under the GNU GPL version 3.0 or later.  See the file LICENSE for details.
 
 from ..commands import is_command
-from ..patterns import is_pattern
+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
@@ -13,7 +13,7 @@ from .element import EmbroideryElement
 from .empty_d_object import EmptyDObject
 from .fill import Fill
 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
@@ -30,8 +30,8 @@ def node_to_elements(node):  # noqa: C901
     elif node.tag == SVG_PATH_TAG and not node.get('d', ''):
         return [EmptyDObject(node)]
 
-    elif is_pattern(node):
-        return [PatternObject(node)]
+    elif has_marker(node):
+        return [MarkerObject(node)]
 
     elif node.tag in EMBROIDERABLE_TAGS:
         element = EmbroideryElement(node)