Merge pull request #2284 from inkstitch/kaalleen/various-fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/elements/fill_stitch.py b/lib/elements/fill_stitch.py
index 912f3ba6..91cad563 100644
--- a/lib/elements/fill_stitch.py
+++ b/lib/elements/fill_stitch.py
@@ -352,14 +352,14 @@ class FillStitch(EmbroideryElement):
                      'Also used for meander and circular fill.'),
            unit='mm',
            type='float',
-           default=1.5,
+           default=2.5,
            select_items=[('fill_method', 'auto_fill'),
                          ('fill_method', 'guided_fill'),
                          ('fill_method', 'meander_fill'),
                          ('fill_method', 'circular_fill')],
            sort_index=31)
     def running_stitch_length(self):
-        return max(self.get_float_param("running_stitch_length_mm", 1.5), 0.01)
+        return max(self.get_float_param("running_stitch_length_mm", 2.5), 0.01)
 
     @property
     @param('running_stitch_tolerance_mm',
@@ -607,13 +607,13 @@ class FillStitch(EmbroideryElement):
     def validation_errors(self):
         if not self.shape_is_valid(self.shape):
             why = explain_validity(self.shape)
-            message, x, y = re.findall(r".+?(?=\[)|-?\d+(?:\.\d+)?", why)
+            message, x, y = re.match(r"(?P<message>.+)\[(?P<x>.+)\s(?P<y>.+)\]", why).groups()
             yield InvalidShapeError((x, y))
 
     def validation_warnings(self):  # noqa: C901
         if not self.shape_is_valid(self.original_shape):
             why = explain_validity(self.original_shape)
-            message, x, y = re.findall(r".+?(?=\[)|-?\d+(?:\.\d+)?", why)
+            message, x, y = re.match(r"(?P<message>.+)\[(?P<x>.+)\s(?P<y>.+)\]", why).groups()
             if "Hole lies outside shell" in message:
                 yield UnconnectedWarning((x, y))
             else: