From 2bc14f84aa76a38c712d853fa31ef808894dad2f Mon Sep 17 00:00:00 2001 From: Russell Johnson <47639332+Russ4262@users.noreply.github.com> Date: Sat, 12 Mar 2022 22:05:04 -0600 Subject: [PATCH] Path: Fix automatic `commitTransaction()` calls, issue #6149 [Bug] This commit removes the automatic committal of transactions when activated with GUI command. The committal of the transaction is executed with the `accept()` and `reject()` methods of the respective task panel. --- src/Mod/Path/PathScripts/PathDressupAxisMap.py | 2 +- src/Mod/Path/PathScripts/PathDressupDogbone.py | 2 +- src/Mod/Path/PathScripts/PathDressupDragknife.py | 2 +- src/Mod/Path/PathScripts/PathDressupLeadInOut.py | 2 +- src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py | 2 +- src/Mod/Path/PathScripts/PathDressupRampEntry.py | 2 +- src/Mod/Path/PathScripts/PathDressupTagGui.py | 2 +- src/Mod/Path/PathScripts/PathDressupZCorrect.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathDressupAxisMap.py b/src/Mod/Path/PathScripts/PathDressupAxisMap.py index 83a1871a36..b5b6b7ab9f 100644 --- a/src/Mod/Path/PathScripts/PathDressupAxisMap.py +++ b/src/Mod/Path/PathScripts/PathDressupAxisMap.py @@ -317,7 +317,7 @@ class CommandPathDressup: "Gui.ActiveDocument.getObject(base.Name).Visibility = False" ) FreeCADGui.doCommand("obj.ViewObject.Document.setEdit(obj.ViewObject, 0)") - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py index 0a22d29ad5..875e94a02a 100644 --- a/src/Mod/Path/PathScripts/PathDressupDogbone.py +++ b/src/Mod/Path/PathScripts/PathDressupDogbone.py @@ -1400,7 +1400,7 @@ class CommandDressupDogbone(object): "PathScripts.PathDressupDogbone.Create(FreeCAD.ActiveDocument.%s)" % baseObject.Name ) - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupDragknife.py b/src/Mod/Path/PathScripts/PathDressupDragknife.py index 5f7defb6f5..1f10cfc94d 100644 --- a/src/Mod/Path/PathScripts/PathDressupDragknife.py +++ b/src/Mod/Path/PathScripts/PathDressupDragknife.py @@ -660,7 +660,7 @@ class CommandDressupDragknife: FreeCADGui.doCommand("obj.pivotheight = 4") FreeCADGui.doCommand("obj.ViewObject.Document.setEdit(obj.ViewObject, 0)") - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py index 73a1b7797f..4b460da593 100644 --- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py +++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py @@ -732,7 +732,7 @@ class CommandPathDressupLeadInOut: FreeCADGui.doCommand( "Gui.ActiveDocument.getObject(base.Name).Visibility = False" ) - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py b/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py index f2893ebb55..9339ba8159 100644 --- a/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py +++ b/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py @@ -294,7 +294,7 @@ class CommandPathDressupPathBoundary: "PathScripts.PathDressupPathBoundaryGui.Create(App.ActiveDocument.%s)" % baseObject.Name ) - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py index 0e85a2a995..603b977a02 100644 --- a/src/Mod/Path/PathScripts/PathDressupRampEntry.py +++ b/src/Mod/Path/PathScripts/PathDressupRampEntry.py @@ -956,7 +956,7 @@ class CommandPathDressupRampEntry: "Gui.ActiveDocument.getObject(base.Name).Visibility = False" ) FreeCADGui.doCommand("dbo.setup(obj)") - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupTagGui.py b/src/Mod/Path/PathScripts/PathDressupTagGui.py index 0dba024a52..ff8e719bb2 100644 --- a/src/Mod/Path/PathScripts/PathDressupTagGui.py +++ b/src/Mod/Path/PathScripts/PathDressupTagGui.py @@ -593,7 +593,7 @@ class CommandPathDressupTag: "PathScripts.PathDressupTagGui.Create(App.ActiveDocument.%s)" % baseObject.Name ) - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute() diff --git a/src/Mod/Path/PathScripts/PathDressupZCorrect.py b/src/Mod/Path/PathScripts/PathDressupZCorrect.py index 1e70a04b31..e9af62107a 100644 --- a/src/Mod/Path/PathScripts/PathDressupZCorrect.py +++ b/src/Mod/Path/PathScripts/PathDressupZCorrect.py @@ -396,7 +396,7 @@ class CommandPathDressup: "Gui.ActiveDocument.getObject(obj.Base.Name).Visibility = False" ) FreeCADGui.doCommand("obj.ViewObject.Document.setEdit(obj.ViewObject, 0)") - FreeCAD.ActiveDocument.commitTransaction() + # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() FreeCAD.ActiveDocument.recompute()