tangential->contour, fix legacy, remove unused params

6 files changed, 36 insertions, 58 deletions

diff --git a/lib/elements/element.py b/lib/elements/element.py
index ee4eadbb..3f5c6f4a 100644
--- a/lib/elements/element.py
+++ b/lib/elements/element.py
@@ -208,7 +208,7 @@ class EmbroideryElement(object):
            # L10N options to allow lock stitch before and after objects
            options=[_("Both"), _("Before"), _("After"), _("Neither")],
            default=0,
-           sort_index=4)
+           sort_index=10)
     @cache
     def ties(self):
         return self.get_int_param("ties", 0)
@@ -220,7 +220,7 @@ class EmbroideryElement(object):
                      'even if the distance to the next object is shorter than defined by the collapse length value in the Ink/Stitch preferences.'),
            type='boolean',
            default=False,
-           sort_index=5)
+           sort_index=10)
     @cache
     def force_lock_stitches(self):
         return self.get_boolean_param('force_lock_stitches', False)
diff --git a/lib/elements/fill_stitch.py b/lib/elements/fill_stitch.py
index d7b859b5..c1bba7b8 100644
--- a/lib/elements/fill_stitch.py
+++ b/lib/elements/fill_stitch.py
@@ -15,7 +15,7 @@ from shapely.validation import explain_validity
 from ..i18n import _
 from ..marker import get_marker_elements
 from ..stitch_plan import StitchGroup
-from ..stitches import tangential_fill, auto_fill, legacy_fill, guided_fill
+from ..stitches import contour_fill, auto_fill, legacy_fill, guided_fill
 from ..svg import PIXELS_PER_MM
 from ..svg.tags import INKSCAPE_LABEL
 from ..utils import cache, version
@@ -96,34 +96,29 @@ class FillStitch(EmbroideryElement):
 
     @property
     @param('fill_method', _('Fill method'), type='dropdown', default=0,
-           options=[_("Auto Fill"), _("Tangential"), _("Guided Fill"), _("Legacy Fill")], sort_index=2)
+           options=[_("Auto Fill"), _("Contour Fill"), _("Guided Fill"), _("Legacy Fill")], sort_index=2)
     def fill_method(self):
         return self.get_int_param('fill_method', 0)
 
     @property
-    @param('tangential_strategy', _('Tangential strategy'), type='dropdown', default=1,
-           options=[_("Inner to Outer"), _("Single spiral"), _("Double spiral")], select_items=[('fill_method', 1)], sort_index=2)
-    def tangential_strategy(self):
-        return self.get_int_param('tangential_strategy', 1)
+    @param('contour_strategy', _('Contour Fill Strategy'), type='dropdown', default=1,
+           options=[_("Inner to Outer"), _("Single spiral"), _("Double spiral")], select_items=[('fill_method', 1)], sort_index=3)
+    def contour_strategy(self):
+        return self.get_int_param('contour_strategy', 1)
 
     @property
     @param('join_style', _('Join Style'), type='dropdown', default=0,
-           options=[_("Round"), _("Mitered"), _("Beveled")], select_items=[('fill_method', 1)], sort_index=2)
+           options=[_("Round"), _("Mitered"), _("Beveled")], select_items=[('fill_method', 1)], sort_index=4)
     def join_style(self):
         return self.get_int_param('join_style', 0)
 
     @property
-    @param('interlaced', _('Interlaced'), type='boolean', default=True, select_items=[('fill_method', 1), ('fill_method', 2)], sort_index=2)
-    def interlaced(self):
-        return self.get_boolean_param('interlaced', True)
-
-    @property
-    @param('avoid_self_crossing', _('Avoid self-crossing'), type='boolean', default=False, select_items=[('fill_method', 1)], sort_index=2)
+    @param('avoid_self_crossing', _('Avoid self-crossing'), type='boolean', default=False, select_items=[('fill_method', 1)], sort_index=5)
     def avoid_self_crossing(self):
         return self.get_boolean_param('avoid_self_crossing', False)
 
     @property
-    @param('clockwise', _('Clockwise'), type='boolean', default=True, select_items=[('fill_method', 1), ('fill_method', 2)], sort_index=2)
+    @param('clockwise', _('Clockwise'), type='boolean', default=True, select_items=[('fill_method', 1)], sort_index=5)
     def clockwise(self):
         return self.get_boolean_param('clockwise', True)
 
@@ -133,7 +128,7 @@ class FillStitch(EmbroideryElement):
            tooltip=_('The angle increases in a counter-clockwise direction.  0 is horizontal.  Negative angles are allowed.'),
            unit='deg',
            type='float',
-           sort_index=4,
+           sort_index=6,
            select_items=[('fill_method', 0), ('fill_method', 3)],
            default=0)
     @cache
@@ -152,7 +147,7 @@ class FillStitch(EmbroideryElement):
         tooltip=_('The last stitch in each row is quite close to the first stitch in the next row.  '
                   'Skipping it decreases stitch count and density.'),
         type='boolean',
-        sort_index=4,
+        sort_index=6,
         select_items=[('fill_method', 0), ('fill_method', 2),
                       ('fill_method', 3)],
         default=False)
@@ -166,7 +161,7 @@ class FillStitch(EmbroideryElement):
         tooltip=_('The flip option can help you with routing your stitch path.  '
                   'When you enable flip, stitching goes from right-to-left instead of left-to-right.'),
         type='boolean',
-        sort_index=4,
+        sort_index=7,
         select_items=[('fill_method', 0), ('fill_method', 2),
                       ('fill_method', 3)],
         default=False)
@@ -178,7 +173,7 @@ class FillStitch(EmbroideryElement):
            _('Spacing between rows'),
            tooltip=_('Distance between rows of stitches.'),
            unit='mm',
-           sort_index=4,
+           sort_index=6,
            type='float',
            default=0.25)
     def row_spacing(self):
@@ -194,32 +189,18 @@ class FillStitch(EmbroideryElement):
            tooltip=_(
                'The length of each stitch in a row.  Shorter stitch may be used at the start or end of a row.'),
            unit='mm',
-           sort_index=4,
+           sort_index=6,
            type='float',
            default=3.0)
     def max_stitch_length(self):
         return max(self.get_float_param("max_stitch_length_mm", 3.0), 0.1 * PIXELS_PER_MM)
 
     @property
-    @param('min_stitch_length_mm',
-           _('Minimum fill stitch length'),
-           tooltip=_(
-               'The minimum length of a stitches in a row. Larger values might introduce deviations from the desired path.'
-               'Shorter stitch may be used at the start or end of a row.'),
-           unit='mm',
-           sort_index=4,
-           select_items=[('fill_method', 1), ('fill_method', 2)],
-           type='float',
-           default=0.0)
-    def min_stitch_length(self):
-        return self.get_float_param("min_stitch_length_mm", 0.0)
-
-    @property
     @param('staggers',
            _('Stagger rows this many times before repeating'),
            tooltip=_('Setting this dictates how many rows apart the stitches will be before they fall in the same column position.'),
            type='int',
-           sort_index=4,
+           sort_index=6,
            select_items=[('fill_method', 0), ('fill_method', 3)],
            default=4)
     def staggers(self):
@@ -339,7 +320,7 @@ class FillStitch(EmbroideryElement):
            type='float',
            default=1.5,
            select_items=[('fill_method', 0), ('fill_method', 2)],
-           sort_index=4)
+           sort_index=6)
     def running_stitch_length(self):
         return max(self.get_float_param("running_stitch_length_mm", 1.5), 0.01)
 
@@ -505,14 +486,11 @@ class FillStitch(EmbroideryElement):
                     underlay_stitch_groups, start = self.do_underlay(start)
                     stitch_groups.extend(underlay_stitch_groups)
                 if self.fill_method == 0:
-                    stitch_groups.extend(
-                        self.do_auto_fill(last_patch, start, end))
+                    stitch_groups.extend(self.do_auto_fill(last_patch, start, end))
                 if self.fill_method == 1:
-                    stitch_groups.extend(
-                        self.do_tangential_fill(last_patch, start))
+                    stitch_groups.extend(self.do_contour_fill(last_patch, start))
                 elif self.fill_method == 2:
-                    stitch_groups.extend(
-                        self.do_guided_fill(last_patch, start, end))
+                    stitch_groups.extend(self.do_guided_fill(last_patch, start, end))
             except Exception:
                 self.fatal_fill_error()
 
@@ -569,32 +547,32 @@ class FillStitch(EmbroideryElement):
                 self.underpath))
         return [stitch_group]
 
-    def do_tangential_fill(self, last_patch, starting_point):
+    def do_contour_fill(self, last_patch, starting_point):
         if not starting_point:
             starting_point = (0, 0)
         starting_point = shgeo.Point(starting_point)
 
         stitch_groups = []
         for polygon in self.fill_shape.geoms:
-            tree = tangential_fill.offset_polygon(polygon, self.row_spacing, self.join_style + 1, self.clockwise)
+            tree = contour_fill.offset_polygon(polygon, self.row_spacing, self.join_style + 1, self.clockwise)
 
             stitches = []
-            if self.tangential_strategy == 0:
-                stitches = tangential_fill.inner_to_outer(
+            if self.contour_strategy == 0:
+                stitches = contour_fill.inner_to_outer(
                     tree,
                     self.row_spacing,
                     self.max_stitch_length,
                     starting_point,
                     self.avoid_self_crossing
                 )
-            elif self.tangential_strategy == 1:
-                stitches = tangential_fill.single_spiral(
+            elif self.contour_strategy == 1:
+                stitches = contour_fill.single_spiral(
                     tree,
                     self.max_stitch_length,
                     starting_point
                 )
-            elif self.tangential_strategy == 2:
-                stitches = tangential_fill.double_spiral(
+            elif self.contour_strategy == 2:
+                stitches = contour_fill.double_spiral(
                     tree,
                     self.max_stitch_length,
                     starting_point
diff --git a/lib/stitches/auto_fill.py b/lib/stitches/auto_fill.py
index 630178c4..b3b9434f 100644
--- a/lib/stitches/auto_fill.py
+++ b/lib/stitches/auto_fill.py
@@ -59,7 +59,8 @@ def auto_fill(shape,
               ending_point=None,
               underpath=True):
     try:
-        segments = intersect_region_with_grating(shape, angle, row_spacing, end_row_spacing)
+        rows = intersect_region_with_grating(shape, angle, row_spacing, end_row_spacing)
+        segments = [segment for row in rows for segment in row]
         fill_stitch_graph = build_fill_stitch_graph(shape, segments, starting_point, ending_point)
     except ValueError:
         # Small shapes will cause the graph to fail - min() arg is an empty sequence through insert node
@@ -390,7 +391,8 @@ def process_travel_edges(graph, fill_stitch_graph, shape, travel_edges):
 
 
 def travel_grating(shape, angle, row_spacing):
-    segments = intersect_region_with_grating(shape, angle, row_spacing)
+    rows = intersect_region_with_grating(shape, angle, row_spacing)
+    segments = [segment for row in rows for segment in row]
 
     return shgeo.MultiLineString(list(segments))
 
diff --git a/lib/stitches/tangential_fill.py b/lib/stitches/contour_fill.py
index 833f9db3..916285d8 100644
--- a/lib/stitches/tangential_fill.py
+++ b/lib/stitches/contour_fill.py
@@ -451,7 +451,6 @@ def _interpolate_linear_rings(ring1, ring2, max_stitch_length, start=None):
     points = (ring1_resampled * (1.0 - weights)) + (ring2_resampled * weights)
     result = LineString(points)
 
-    # TODO: remove when rastering is cheaper
     return result.simplify(constants.simplification_threshold, False)
 
 
diff --git a/lib/stitches/fill.py b/lib/stitches/fill.py
index 94df3f77..d5a983f9 100644
--- a/lib/stitches/fill.py
+++ b/lib/stitches/fill.py
@@ -162,7 +162,7 @@ def intersect_region_with_grating(shape, angle, row_spacing, end_row_spacing=Non
                 runs.reverse()
                 runs = [tuple(reversed(run)) for run in runs]
 
-            yield from runs
+            yield runs
 
         if end_row_spacing:
             current_row_y += row_spacing + \
@@ -225,6 +225,7 @@ def pull_runs(rows, shape, row_spacing):
 
     # print >>sys.stderr, "\n".join(str(len(row)) for row in rows)
 
+    rows = list(rows)
     runs = []
     count = 0
     while (len(rows) > 0):
diff --git a/lib/svg/tags.py b/lib/svg/tags.py
index 0c5ffd3d..d78ba678 100644
--- a/lib/svg/tags.py
+++ b/lib/svg/tags.py
@@ -59,9 +59,8 @@ inkstitch_attribs = [
     'angle',
     'auto_fill',
     'fill_method',
-    'tangential_strategy',
+    'contour_strategy',
     'join_style',
-    'interlaced',
     'avoid_self_crossing',
     'clockwise',
     'expand_mm',
@@ -72,7 +71,6 @@ inkstitch_attribs = [
     'fill_underlay_row_spacing_mm',
     'fill_underlay_skip_last',
     'max_stitch_length_mm',
-    'min_stitch_length_mm',
     'row_spacing_mm',
     'end_row_spacing_mm',
     'skip_last',