Merge pull request #6974 from agren/restore-path-drilling-retract-behaviour

Path: Restore drilling op retract value to user supplied Retract Height
2022-07-02 12:20:54 -05:00
parent e844c4d20b 25242430f4
commit fcdec28716
3 changed files with 46 additions and 3 deletions
--- a/src/Mod/Path/PathScripts/PathDrilling.py
+++ b/src/Mod/Path/PathScripts/PathDrilling.py
@@ -233,7 +233,9 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp):
            repeat = 1  # technical debt:  Add a repeat property for user control

            try:
-                drillcommands = generator.generate(edge, dwelltime, peckdepth, repeat)
+                drillcommands = generator.generate(
+                    edge, dwelltime, peckdepth, repeat, obj.RetractHeight.Value
+                )

            except ValueError as e:  # any targets that fail the generator are ignored
                PathLog.info(e)