pass endVectorin PathAreaOp and clean up gcode generation

2020-04-22 10:37:24 -05:00
parent 8beef0566d
commit 396f03ea9b
2 changed files with 24 additions and 9 deletions
--- a/src/Mod/Path/PathScripts/PathAreaOp.py
+++ b/src/Mod/Path/PathScripts/PathAreaOp.py
@@ -476,8 +476,9 @@ class ObjectOp(PathOp.ObjectOp):
                sims.append(sim)
            # Eif

-            if self.areaOpRetractTool(obj):
-                self.endVector = None # pylint: disable=attribute-defined-outside-init
+            if self.areaOpRetractTool(obj) and self.endVector is not None:
+                self.endVector[2] = obj.ClearanceHeight.Value
+                self.commandlist.append(Path.Command('G0', {'Z': obj.ClearanceHeight.Value, 'F': self.vertRapid}))

        # Raise cutter to safe height and rotate back to original orientation
        if self.rotateFlag is True: