meerk40t 0.9.7020__py2.py3-none-any.whl → 0.9.7030__py2.py3-none-any.whl

meerk40t/core/node/node.py

@@ -499,9 +499,12 @@ class Node:
             node_copy._parent = copied_parent
             copied_parent._children.append(node_copy)
             if node.type == "reference":
-                original_referenced, copied_referenced = links[id(node.node)]
-                node_copy.node = copied_referenced
-                copied_referenced._references.append(node_copy)
+                try:
+                    original_referenced, copied_referenced = links[id(node.node)]
+                    node_copy.node = copied_referenced
+                    copied_referenced._references.append(node_copy)
+                except KeyError:
+                    pass
 
     def _validate_tree(self):
         for c in self._children:

meerk40t/core/planner.py

@@ -181,6 +181,29 @@ def plugin(kernel, lifecycle=None):
                 "section": "_20_Reducing Movements",
                 "conditional": (context, "opt_reduce_travel"),
             },
+            {
+                "attr": "opt_stitching",
+                "object": context,
+                "default": False,
+                "type": bool,
+                "label": _("Combine path segments"),
+                "tip": 
+                    _("Stitch segments together that are very close (ideally having joint start/end points).") + "\n" +
+                    _("Only inside a single cut/engrave operation."),
+                "page": "Optimisations",
+                "section": "_05_Stitching",
+            },
+            {
+                "attr": "opt_stitch_tolerance",
+                "object": context,
+                "default": "0",
+                "type": Length,
+                "label": _("Tolerance"),
+                "tip": _("Tolerance to decide whether two path segments should be joined."),
+                "page": "Optimisations",
+                "section": "_05_Stitching",
+                "conditional": (context, "opt_stitching"),
+            },
             {
                 "attr": "opt_inner_first",
                 "object": context,

meerk40t/core/undos.py

@@ -81,7 +81,7 @@ class Undo:
             elif self._undo_index < len(self._undo_stack) and self._undo_stack[self._undo_index].hold:
                 # Just add another one on top of it
                 self._undo_index += 1
-            elif self._undo_stack[self._undo_index].message == self.LAST_STATE:
+            elif self._undo_index < len(self._undo_stack) and self._undo_stack[self._undo_index].message == self.LAST_STATE:
                 # Will be overwritten
                 pass
             elif self._undo_index < len(self._undo_stack) - 1 and self._undo_stack[self._undo_index + 1].message != self.LAST_STATE:

meerk40t/core/wordlist.py

@@ -394,6 +394,7 @@ class Wordlist:
 
     def load_csv_file(self, filename, force_header=None):
         self.empty_csv()
+        ct = 0
         headers = []
         decoder = EncodingDetectFile()
         result = decoder.load(filename)

meerk40t/dxf/dxf_io.py

@@ -251,6 +251,8 @@ class DXFProcessor:
         elif dxftype == "ELLIPSE":
             center = (entity.dxf.center)  # Center point of the ellipse (3D, but we'll use x,y)
             major_axis = entity.dxf.major_axis  # Vector representing the major axis
+            minor_axis = entity.minor_axis  # Vector representing the minor axis
+            # They should have the same sign, if they are different then they are mirrored?!
             ratio = entity.dxf.ratio  # Ratio of minor to major axis
             start_angle, end_angle = get_angles(entity)
 
@@ -262,6 +264,10 @@ class DXFProcessor:
                 major_axis[0] ** 2 + major_axis[1] ** 2
             )  # Length of the major axis (in XY plane)
             b = a * ratio  # Length of the minor axis
+            # Different signs? Inverse
+            if major_axis[0] * minor_axis[1] < 0:
+                b *= -1
+
             # geom = Geomstr.ellipse(
             #     start_t=start_angle,
             #     end_t=end_angle,