From b53ec3bd4e6ffd4b8c5e517aff168b72ef5fd682 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Wed, 1 Sep 2021 12:22:43 -0500 Subject: [PATCH] Black reformat --- src/Mod/Path/PathScripts/PathJob.py | 1 + src/Mod/Path/PathScripts/PathJobGui.py | 6 +++--- src/Mod/Path/PathScripts/PathOp.py | 5 ++++- src/Mod/Path/PathScripts/PathProfile.py | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index 2d7aec834a..983a4a7473 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -102,6 +102,7 @@ Notification = NotificationClass() class ObjectJob: + def __init__(self, obj, models, templateFile=None): self.obj = obj obj.addProperty( diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index ea28162790..209004f193 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -32,20 +32,20 @@ import traceback import FreeCAD import FreeCADGui -import PathScripts.PathGeom as PathGeom -import PathScripts.PathGuiInit as PathGuiInit import PathScripts.PathJob as PathJob import PathScripts.PathJobCmd as PathJobCmd import PathScripts.PathJobDlg as PathJobDlg +import PathScripts.PathGeom as PathGeom +import PathScripts.PathGuiInit as PathGuiInit import PathScripts.PathLog as PathLog import PathScripts.PathPreferences as PathPreferences import PathScripts.PathSetupSheetGui as PathSetupSheetGui import PathScripts.PathStock as PathStock -import PathScripts.PathToolBitGui as PathToolBitGui import PathScripts.PathToolControllerGui as PathToolControllerGui import PathScripts.PathToolLibraryEditor as PathToolLibraryEditor import PathScripts.PathUtil as PathUtil import PathScripts.PathUtils as PathUtils +import PathScripts.PathToolBitGui as PathToolBitGui # lazily loaded modules from lazy_loader.lazy_loader import LazyLoader diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py index 371c978ffd..44b7252c13 100644 --- a/src/Mod/Path/PathScripts/PathOp.py +++ b/src/Mod/Path/PathScripts/PathOp.py @@ -494,7 +494,10 @@ class ObjectOp(object): def setDefaultValues(self, obj): """setDefaultValues(obj) ... base implementation. Do not overwrite, overwrite opSetDefaultValues() instead.""" - job = PathUtils.addToJob(obj) + if self.job: + job = self.job + else: + job = PathUtils.addToJob(obj) obj.Active = True diff --git a/src/Mod/Path/PathScripts/PathProfile.py b/src/Mod/Path/PathScripts/PathProfile.py index 3df587319d..dc6a4745ae 100644 --- a/src/Mod/Path/PathScripts/PathProfile.py +++ b/src/Mod/Path/PathScripts/PathProfile.py @@ -1446,9 +1446,9 @@ def SetupProperties(): return setup -def Create(name, obj=None): +def Create(name, obj=None, parentJob=None): """Create(name) ... Creates and returns a Profile based on faces operation.""" if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - obj.Proxy = ObjectProfile(obj, name) + obj.Proxy = ObjectProfile(obj, name, parentJob) return obj