From d6a20be9992ddf7ffb9dfe68d76ef80258dbbec4 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 2 Jul 2019 21:03:28 -0700 Subject: [PATCH 1/3] Fixed typo and py3 exception printing --- src/Mod/Path/PathScripts/PathJob.py | 2 +- src/Mod/Path/PathScripts/PathJobGui.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index ed90b7d74f..d9efa5c17e 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -392,7 +392,7 @@ class ObjectJob: @classmethod def baseCandidates(cls): '''Answer all objects in the current document which could serve as a Base for a job.''' - return sorted([obj for obj in FreeCAD.ActiveDocuemnt.Objects if cls.isBaseCandidate(obj)], key=lambda o: o.Label) + return sorted([obj for obj in FreeCAD.ActiveDocument.Objects if cls.isBaseCandidate(obj)], key=lambda o: o.Label) @classmethod def isBaseCandidate(cls, obj): diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 7decce2427..3ab218b8ed 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -1313,7 +1313,7 @@ def Create(base, template=None): return obj except Exception as exc: # pylint: disable=broad-except PathLog.error(exc) - traceback.print_exc(exc) + traceback.print_exc() FreeCAD.ActiveDocument.abortTransaction() From 4527f7651b01d263a6f46c898a05a95f51607041 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 2 Jul 2019 21:16:38 -0700 Subject: [PATCH 2/3] Fixed Job creation --- src/Mod/Path/PathScripts/PathJobGui.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 3ab218b8ed..f071359547 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -95,7 +95,6 @@ def selectionEx(): class ViewProvider: def __init__(self, vobj): - vobj.Proxy = self mode = 2 vobj.setEditorMode('BoundingBox', mode) vobj.setEditorMode('DisplayMode', mode) @@ -1306,7 +1305,7 @@ def Create(base, template=None): FreeCAD.ActiveDocument.openTransaction(translate("Path_Job", "Create Job")) try: obj = PathJob.Create('Job', base, template) - ViewProvider(obj.ViewObject) + obj.ViewObject.Proxy = ViewProvider(obj.ViewObject) FreeCAD.ActiveDocument.commitTransaction() obj.Document.recompute() obj.ViewObject.Proxy.editObject(obj.Stock) From 6a7cd2c4030a000fbc24acd91a2118dc7f13aa9b Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 2 Jul 2019 21:16:53 -0700 Subject: [PATCH 3/3] Fixed import of PostUtils --- src/Mod/Path/PathScripts/post/centroid_post.py | 2 +- src/Mod/Path/PathScripts/post/comparams_post.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/post/centroid_post.py b/src/Mod/Path/PathScripts/post/centroid_post.py index a0f92b7b7e..3dc4ebb5cf 100644 --- a/src/Mod/Path/PathScripts/post/centroid_post.py +++ b/src/Mod/Path/PathScripts/post/centroid_post.py @@ -25,7 +25,7 @@ import FreeCAD from FreeCAD import Units import datetime import PathScripts -PostUtils = PathScripts.PostUtils +import PathScripts.PostUtils as PostUtils TOOLTIP = ''' This is a postprocessor file for the Path workbench. It is used to diff --git a/src/Mod/Path/PathScripts/post/comparams_post.py b/src/Mod/Path/PathScripts/post/comparams_post.py index 2476118959..e7644bd96b 100644 --- a/src/Mod/Path/PathScripts/post/comparams_post.py +++ b/src/Mod/Path/PathScripts/post/comparams_post.py @@ -24,7 +24,7 @@ import FreeCAD import Path import PathScripts -PostUtils = PathScripts.PostUtils +import PathScripts.PostUtils as PostUtils TOOLTIP = ''' Example Post, using Path.Commands instead of Path.toGCode strings for Path gcode output. '''