From 353ec4a646aeaf62269ff6a17f45b75c95b995c6 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Sat, 25 Aug 2018 14:51:18 -0700 Subject: [PATCH] Added name parameter to operation proxy constructor. --- src/Mod/Path/PathScripts/PathChamfer.py | 2 +- src/Mod/Path/PathScripts/PathDrilling.py | 2 +- src/Mod/Path/PathScripts/PathEngrave.py | 2 +- src/Mod/Path/PathScripts/PathHelix.py | 2 +- src/Mod/Path/PathScripts/PathMillFace.py | 2 +- src/Mod/Path/PathScripts/PathOp.py | 2 +- src/Mod/Path/PathScripts/PathPocket.py | 2 +- src/Mod/Path/PathScripts/PathPocketShape.py | 2 +- src/Mod/Path/PathScripts/PathProfileContour.py | 2 +- src/Mod/Path/PathScripts/PathProfileEdges.py | 2 +- src/Mod/Path/PathScripts/PathProfileFaces.py | 2 +- src/Mod/Path/PathScripts/PathSetupSheetGui.py | 4 ++-- src/Mod/Path/PathScripts/PathSurface.py | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathChamfer.py b/src/Mod/Path/PathScripts/PathChamfer.py index d8778771bb..2966827b1c 100644 --- a/src/Mod/Path/PathScripts/PathChamfer.py +++ b/src/Mod/Path/PathScripts/PathChamfer.py @@ -122,6 +122,6 @@ class ObjectChamfer(PathEngraveBase.ObjectOp): def Create(name): '''Create(name) ... Creates and returns a Chamfer operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectChamfer(obj) + proxy = ObjectChamfer(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 4a3a872c19..45e82a1ba6 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -123,7 +123,7 @@ class ObjectDrilling(PathCircularHoleBase.ObjectOp): def Create(name): '''Create(name) ... Creates and returns a Drilling operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectDrilling(obj) + proxy = ObjectDrilling(obj, name) if obj.Proxy: proxy.findAllHoles(obj) return obj diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index b855fdb101..93d4d36c00 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -153,6 +153,6 @@ class ObjectEngrave(PathEngraveBase.ObjectOp): def Create(name): '''Create(name) ... Creates and returns an Engrave operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectEngrave(obj) + proxy = ObjectEngrave(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathHelix.py b/src/Mod/Path/PathScripts/PathHelix.py index 367f83927e..ed047840df 100644 --- a/src/Mod/Path/PathScripts/PathHelix.py +++ b/src/Mod/Path/PathScripts/PathHelix.py @@ -195,7 +195,7 @@ class ObjectHelix(PathCircularHoleBase.ObjectOp): def Create(name): '''Create(name) ... Creates and returns a Helix operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectHelix(obj) + proxy = ObjectHelix(obj, name) if obj.Proxy: proxy.findAllHoles(obj) return obj diff --git a/src/Mod/Path/PathScripts/PathMillFace.py b/src/Mod/Path/PathScripts/PathMillFace.py index fb3f605ef3..6ab5bb2346 100644 --- a/src/Mod/Path/PathScripts/PathMillFace.py +++ b/src/Mod/Path/PathScripts/PathMillFace.py @@ -143,5 +143,5 @@ class ObjectFace(PathPocketBase.ObjectPocket): def Create(name): '''Create(name) ... Creates and returns a Mill Facing operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectFace(obj) + proxy = ObjectFace(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py index 3bc5ca5493..ade41b93ab 100644 --- a/src/Mod/Path/PathScripts/PathOp.py +++ b/src/Mod/Path/PathScripts/PathOp.py @@ -114,7 +114,7 @@ class ObjectOp(object): obj.addProperty("App::PropertyDistance", "OpStockZMin", "Op Values", QtCore.QT_TRANSLATE_NOOP("PathOp", "Holds the min Z value of Stock")) obj.setEditorMode('OpStockZMin', 1) # read-only - def __init__(self, obj): + def __init__(self, obj, name): PathLog.track() obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("PathOp", "Make False, to prevent operation from generating code")) diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py index 2441f150b2..ea97c976be 100644 --- a/src/Mod/Path/PathScripts/PathPocket.py +++ b/src/Mod/Path/PathScripts/PathPocket.py @@ -96,5 +96,5 @@ class ObjectPocket(PathPocketBase.ObjectPocket): def Create(name): '''Create(name) ... Creates and returns a Pocket operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectPocket(obj) + proxy = ObjectPocket(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathPocketShape.py b/src/Mod/Path/PathScripts/PathPocketShape.py index 879357d667..1cf2a80216 100644 --- a/src/Mod/Path/PathScripts/PathPocketShape.py +++ b/src/Mod/Path/PathScripts/PathPocketShape.py @@ -170,5 +170,5 @@ def Create(name, obj=None): '''Create(name) ... Creates and returns a Pocket operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectPocket(obj) + proxy = ObjectPocket(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathProfileContour.py b/src/Mod/Path/PathScripts/PathProfileContour.py index 3eb2b0490c..f992c5ea5e 100644 --- a/src/Mod/Path/PathScripts/PathProfileContour.py +++ b/src/Mod/Path/PathScripts/PathProfileContour.py @@ -112,5 +112,5 @@ class ObjectContour(PathProfileBase.ObjectProfile): def Create(name): '''Create(name) ... Creates and returns a Contour operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectContour(obj) + proxy = ObjectContour(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py index d7b3b3ae32..0e62c7b2c4 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ b/src/Mod/Path/PathScripts/PathProfileEdges.py @@ -103,5 +103,5 @@ class ObjectProfile(PathProfileBase.ObjectProfile): def Create(name): '''Create(name) ... Creates and returns a Profile based on edges operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectProfile(obj) + proxy = ObjectProfile(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathProfileFaces.py b/src/Mod/Path/PathScripts/PathProfileFaces.py index a3c4f2a26e..25157aa914 100644 --- a/src/Mod/Path/PathScripts/PathProfileFaces.py +++ b/src/Mod/Path/PathScripts/PathProfileFaces.py @@ -141,5 +141,5 @@ class ObjectProfile(PathProfileBase.ObjectProfile): def Create(name): '''Create(name) ... Creates and returns a Profile based on faces operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectProfile(obj) + proxy = ObjectProfile(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathSetupSheetGui.py b/src/Mod/Path/PathScripts/PathSetupSheetGui.py index e624ca16b9..745978fe45 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetGui.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetGui.py @@ -290,8 +290,8 @@ class TaskPanel: def Create(name = 'SetupSheet'): '''Create(name = 'SetupSheet') ... creates a new setup sheet''' FreeCAD.ActiveDocument.openTransaction(translate("Path_Job", "Create Job")) - ssheet = SetupSheet.Create(name) - PathIconViewProvider.Attach(ssheet) + ssheet = PathSetupSheet.Create(name) + PathIconViewProvider.Attach(ssheet, name) return ssheet PathIconViewProvider.RegisterViewProvider('SetupSheet', ViewProvider) diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index b324029440..d73fe6102e 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -323,5 +323,5 @@ class ObjectSurface(PathOp.ObjectOp): def Create(name): '''Create(name) ... Creates and returns a Surface operation.''' obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectSurface(obj) + proxy = ObjectSurface(obj, name) return obj