From edf097e7e927640b7e4aa365649ee91b7d5e5f22 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Thu, 13 Oct 2022 20:22:51 -0700 Subject: [PATCH 1/2] Fixed recursive import --- src/Mod/Path/Path/Tool/Controller.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Mod/Path/Path/Tool/Controller.py b/src/Mod/Path/Path/Tool/Controller.py index 794f0ea5ab..e8c2c1da0a 100644 --- a/src/Mod/Path/Path/Tool/Controller.py +++ b/src/Mod/Path/Path/Tool/Controller.py @@ -318,6 +318,7 @@ def Create( obj.Proxy = ToolController(obj, assignTool) if FreeCAD.GuiUp and assignViewProvider: + from Path.Tool.Gui.Controller import ViewProvider ViewProvider(obj.ViewObject) if assignTool: @@ -345,9 +346,4 @@ def FromTemplate(template, assignViewProvider=True): FreeCAD.ActiveDocument.removeObject(obj.Name) return None - -if FreeCAD.GuiUp: - # need ViewProvider class in this file to support loading of old files - from Path.Tool.Gui.Controller import ViewProvider - FreeCAD.Console.PrintLog("Loading Path.Tool.Gui.Controller... done\n") From 5dce28ae8bee3abf6eb99491ceb140a3d737223a Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Thu, 13 Oct 2022 22:19:46 -0700 Subject: [PATCH 2/2] Fixed typo in UI test case --- src/Mod/Path/PathTests/TestPathAdaptive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/PathTests/TestPathAdaptive.py b/src/Mod/Path/PathTests/TestPathAdaptive.py index 62b0322ca3..8d66517ea5 100644 --- a/src/Mod/Path/PathTests/TestPathAdaptive.py +++ b/src/Mod/Path/PathTests/TestPathAdaptive.py @@ -29,7 +29,7 @@ import Path.Main.Job as PathJob from PathTests.PathTestUtils import PathTestBase if FreeCAD.GuiUp: - import Path.Main.gui.Job as PathJobGui + import Path.Main.Gui.Job as PathJobGui import Path.Op.Gui.Adaptive as PathAdaptiveGui