diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 06076ec361..40c5558f27 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -58,7 +58,7 @@ SET(PathPythonBaseGui_SRCS SET(PathPythonDressup_SRCS Path/Dressup/__init__.py Path/Dressup/Utils.py - Path/Dressup/PathBoundary.py + Path/Dressup/Boundary.py Path/Dressup/Tags.py ) @@ -68,7 +68,7 @@ SET(PathPythonDressupGui_SRCS Path/Dressup/Gui/Dogbone.py Path/Dressup/Gui/Dragknife.py Path/Dressup/Gui/LeadInOut.py - Path/Dressup/Gui/PathBoundary.py + Path/Dressup/Gui/Boundary.py Path/Dressup/Gui/Preferences.py Path/Dressup/Gui/RampEntry.py Path/Dressup/Gui/Tags.py @@ -76,6 +76,25 @@ SET(PathPythonDressupGui_SRCS Path/Dressup/Gui/ZCorrect.py ) +SET(PathPythonMain_SRCS + Path/Main/__init__.py + Path/Main/Job.py + Path/Main/Stock.py +) + +SET(PathPythonMainGui_SRCS + Path/Main/Gui/__init__.py + Path/Main/Gui/Camotics.py + Path/Main/Gui/Fixture.py + Path/Main/Gui/Inspect.py + Path/Main/Gui/Job.py + Path/Main/Gui/JobCmd.py + Path/Main/Gui/JobDlg.py + Path/Main/Gui/PreferencesJob.py + Path/Main/Gui/Sanity.py + Path/Main/Gui/Simulator.py +) + SET(PathPythonTools_SRCS Path/Tool/__init__.py Path/Tool/Bit.py @@ -195,17 +214,6 @@ SET(PathPythonOpGui_SRCS ) SET(PathScripts_SRCS - PathScripts/PathCamoticsGui.py - PathScripts/PathFixture.py - PathScripts/PathInspect.py - PathScripts/PathJob.py - PathScripts/PathJobCmd.py - PathScripts/PathJobDlg.py - PathScripts/PathJobGui.py - PathScripts/PathPreferencesPathJob.py - PathScripts/PathSanity.py - PathScripts/PathSimulatorGui.py - PathScripts/PathStock.py PathScripts/PathUtils.py PathScripts/PathUtilsGui.py PathScripts/__init__.py @@ -347,6 +355,8 @@ SET(all_files ${PathPythonBaseGenerator_SRCS} ${PathPythonDressup_SRCS} ${PathPythonDressupGui_SRCS} + ${PathPythonMain_SRCS} + ${PathPythonMainGui_SRCS} ${PathPythonOp_SRCS} ${PathPythonOpGui_SRCS} ${PathPythonPost_SRCS} @@ -427,6 +437,19 @@ INSTALL( Mod/Path/Path/Dressup/Gui ) +INSTALL( + FILES + ${PathPythonMain_SRCS} + DESTINATION + Mod/Path/Path/Main +) +INSTALL( + FILES + ${PathPythonMainGui_SRCS} + DESTINATION + Mod/Path/Path/Main/Gui +) + INSTALL( FILES ${PathPythonOp_SRCS} diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 292c5d2082..8e0e6770fc 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -59,8 +59,8 @@ class PathWorkbench(Workbench): global PathCommandGroup # Add preferences pages - before loading PathGui to properly order pages of Path group - from PathScripts import PathPreferencesPathJob import Path.Dressup.Gui.Preferences as PathPreferencesPathDressup + import Path.Main.Gui.PreferencesJob as PathPreferencesPathJob translate = FreeCAD.Qt.translate @@ -78,8 +78,8 @@ class PathWorkbench(Workbench): FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addIconPath(":/icons") import Path.GuiInit - from PathScripts import PathJobCmd + from Path.Main.Gui import JobCmd as PathJobCmd from Path.Tool.Gui import BitCmd as PathToolBitCmd from Path.Tool.Gui import BitLibraryCmd as PathToolBitLibraryCmd diff --git a/src/Mod/Path/Path/Dressup/PathBoundary.py b/src/Mod/Path/Path/Dressup/Boundary.py similarity index 99% rename from src/Mod/Path/Path/Dressup/PathBoundary.py rename to src/Mod/Path/Path/Dressup/Boundary.py index 896e4a164a..9194b0d6d7 100644 --- a/src/Mod/Path/Path/Dressup/PathBoundary.py +++ b/src/Mod/Path/Path/Dressup/Boundary.py @@ -25,7 +25,7 @@ import FreeCAD import Path import Path.Base.Util as PathUtil import Path.Dressup.Utils as PathDressup -import PathScripts.PathStock as PathStock +import Path.Main.Stock as PathStock import PathScripts.PathUtils as PathUtils if False: diff --git a/src/Mod/Path/Path/Dressup/Gui/PathBoundary.py b/src/Mod/Path/Path/Dressup/Gui/Boundary.py similarity index 97% rename from src/Mod/Path/Path/Dressup/Gui/PathBoundary.py rename to src/Mod/Path/Path/Dressup/Gui/Boundary.py index 3a4ae36e94..0947f271b9 100644 --- a/src/Mod/Path/Path/Dressup/Gui/PathBoundary.py +++ b/src/Mod/Path/Path/Dressup/Gui/Boundary.py @@ -25,7 +25,7 @@ from PySide.QtCore import QT_TRANSLATE_NOOP import FreeCAD import FreeCADGui import Path -import Path.Dressup.PathBoundary as PathDressupPathBoundary +import Path.Dressup.Boundary as PathDressupPathBoundary import PathGui if False: @@ -112,8 +112,8 @@ class TaskPanel(object): self.setClean() def updateStockEditor(self, index, force=False): - import PathScripts.PathJobGui as PathJobGui - import PathScripts.PathStock as PathStock + import Path.Main.Gui.Job as PathJobGui + import Path.Main.Stock as PathStock def setupFromBaseEdit(): Path.Log.track(index, force) @@ -289,9 +289,9 @@ class CommandPathDressupPathBoundary: # everything ok! FreeCAD.ActiveDocument.openTransaction("Create Path Boundary Dress-up") - FreeCADGui.addModule("Path.Dressup.Gui.PathBoundary") + FreeCADGui.addModule("Path.Dressup.Gui.Boundary") FreeCADGui.doCommand( - "Path.Dressup.Gui.PathBoundary.Create(App.ActiveDocument.%s)" + "Path.Dressup.Gui.Boundary.Create(App.ActiveDocument.%s)" % baseObject.Name ) # FreeCAD.ActiveDocument.commitTransaction() # Final `commitTransaction()` called via TaskPanel.accept() diff --git a/src/Mod/Path/Path/Dressup/Utils.py b/src/Mod/Path/Path/Dressup/Utils.py index cec69a65fc..3927f77bdf 100644 --- a/src/Mod/Path/Path/Dressup/Utils.py +++ b/src/Mod/Path/Path/Dressup/Utils.py @@ -21,7 +21,7 @@ # *************************************************************************** import FreeCAD -import PathScripts.PathJob as PathJob +import Path.Main.Job as PathJob def selection(): diff --git a/src/Mod/Path/Path/GuiInit.py b/src/Mod/Path/Path/GuiInit.py index 265f6b9710..b57207240b 100644 --- a/src/Mod/Path/Path/GuiInit.py +++ b/src/Mod/Path/Path/GuiInit.py @@ -44,10 +44,16 @@ def Startup(): from Path.Dressup.Gui import Dogbone from Path.Dressup.Gui import Dragknife from Path.Dressup.Gui import LeadInOut - from Path.Dressup.Gui import PathBoundary + from Path.Dressup.Gui import Boundary from Path.Dressup.Gui import RampEntry from Path.Dressup.Gui import Tags from Path.Dressup.Gui import ZCorrect + + from Path.Main.Gui import Fixture + from Path.Main.Gui import Inspect + from Path.Main.Gui import Sanity + from Path.Main.Gui import Simulator + from Path.Op.Gui import Adaptive from Path.Op.Gui import Array from Path.Op.Gui import Comment @@ -71,10 +77,6 @@ def Startup(): from Path.Tool import Controller from Path.Tool.Gui import Controller - from PathScripts import PathFixture - from PathScripts import PathInspect - from PathScripts import PathSanity - from PathScripts import PathSimulatorGui from PathScripts import PathUtilsGui from packaging.version import Version, parse @@ -91,7 +93,7 @@ def Startup(): v = parse(r.decode("utf-8")) if v >= Version("1.2.2"): - from PathScripts import PathCamoticsGui + from Path.Main.Gui import Camotics except (FileNotFoundError, ModuleNotFoundError): pass diff --git a/src/Mod/Path/PathScripts/PathCamoticsGui.py b/src/Mod/Path/Path/Main/Gui/Camotics.py similarity index 99% rename from src/Mod/Path/PathScripts/PathCamoticsGui.py rename to src/Mod/Path/Path/Main/Gui/Camotics.py index 5cfa941baf..04416d9fc3 100644 --- a/src/Mod/Path/PathScripts/PathCamoticsGui.py +++ b/src/Mod/Path/Path/Main/Gui/Camotics.py @@ -322,7 +322,7 @@ class CommandCamoticsSimulate: return False try: job = FreeCADGui.Selection.getSelectionEx()[0].Object - return isinstance(job.Proxy, PathScripts.PathJob.ObjectJob) + return isinstance(job.Proxy, Path.Main.Job.ObjectJob) except: return False diff --git a/src/Mod/Path/PathScripts/PathFixture.py b/src/Mod/Path/Path/Main/Gui/Fixture.py similarity index 97% rename from src/Mod/Path/PathScripts/PathFixture.py rename to src/Mod/Path/Path/Main/Gui/Fixture.py index 4a847306ff..ed98c73d29 100644 --- a/src/Mod/Path/PathScripts/PathFixture.py +++ b/src/Mod/Path/Path/Main/Gui/Fixture.py @@ -165,16 +165,16 @@ class CommandPathFixture: def Activated(self): FreeCAD.ActiveDocument.openTransaction("Create a Fixture Offset") - FreeCADGui.addModule("PathScripts.PathFixture") + FreeCADGui.addModule("Path.Main.Gui.Fixture") snippet = """ import Path import PathScripts from PathScripts import PathUtils prjexists = False obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","Fixture") -PathScripts.PathFixture.Fixture(obj) +Path.Main.Gui.Fixture.Fixture(obj) obj.Active = True -PathScripts.PathFixture._ViewProviderFixture(obj.ViewObject) +Path.Main.Gui.Fixture._ViewProviderFixture(obj.ViewObject) PathUtils.addToJob(obj) diff --git a/src/Mod/Path/PathScripts/PathInspect.py b/src/Mod/Path/Path/Main/Gui/Inspect.py similarity index 98% rename from src/Mod/Path/PathScripts/PathInspect.py rename to src/Mod/Path/Path/Main/Gui/Inspect.py index be63084b7c..63d4e6f7d6 100644 --- a/src/Mod/Path/PathScripts/PathInspect.py +++ b/src/Mod/Path/Path/Main/Gui/Inspect.py @@ -285,9 +285,9 @@ class CommandPathInspect: return # if everything is ok, execute - FreeCADGui.addModule("PathScripts.PathInspect") + FreeCADGui.addModule("Path.Main.Gui.Inspect") FreeCADGui.doCommand( - "PathScripts.PathInspect.show(FreeCAD.ActiveDocument." + "Path.Main.Gui.Inspect.show(FreeCAD.ActiveDocument." + selection[0].Name + ")" ) diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/Path/Main/Gui/Job.py similarity index 99% rename from src/Mod/Path/PathScripts/PathJobGui.py rename to src/Mod/Path/Path/Main/Gui/Job.py index 6a03526b9c..c8cd3285d4 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/Path/Main/Gui/Job.py @@ -31,12 +31,12 @@ import Path import Path.Base.Gui.SetupSheet as PathSetupSheetGui import Path.Base.Util as PathUtil import Path.GuiInit as PathGuiInit +import Path.Main.Gui.JobCmd as PathJobCmd +import Path.Main.Gui.JobDlg as PathJobDlg +import Path.Main.Job as PathJob +import Path.Main.Stock as PathStock import Path.Tool.Gui.Bit as PathToolBitGui import Path.Tool.Gui.Controller as PathToolControllerGui -import PathScripts.PathJob as PathJob -import PathScripts.PathJobCmd as PathJobCmd -import PathScripts.PathJobDlg as PathJobDlg -import PathScripts.PathStock as PathStock import PathScripts.PathUtils as PathUtils import json import math @@ -1627,7 +1627,7 @@ class TaskPanel: def Create(base, template=None, openTaskPanel=True): """Create(base, template) ... creates a job instance for the given base object using template to configure it.""" - FreeCADGui.addModule("PathScripts.PathJob") + FreeCADGui.addModule("Path.Main.Job") FreeCAD.ActiveDocument.openTransaction("Create Job") try: obj = PathJob.Create("Job", base, template) diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/Path/Main/Gui/JobCmd.py similarity index 96% rename from src/Mod/Path/PathScripts/PathJobCmd.py rename to src/Mod/Path/Path/Main/Gui/JobCmd.py index 0c0c820d1c..33ca911867 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/Path/Main/Gui/JobCmd.py @@ -26,9 +26,9 @@ import FreeCAD import FreeCADGui import Path import Path.Base.Util as PathUtil -import PathScripts.PathJob as PathJob -import PathScripts.PathJobDlg as PathJobDlg -import PathScripts.PathStock as PathStock +import Path.Main.Gui.JobDlg as PathJobDlg +import Path.Main.Job as PathJob +import Path.Main.Stock as PathStock import json import os @@ -75,13 +75,13 @@ class CommandJobCreate: @classmethod def Execute(cls, base, template): - FreeCADGui.addModule("PathScripts.PathJobGui") + FreeCADGui.addModule("Path.Main.Gui.Job") if template: template = "'%s'" % template else: template = "None" FreeCADGui.doCommand( - "PathScripts.PathJobGui.Create(%s, %s)" % ([o.Name for o in base], template) + "Path.Main.Gui.Job.Create(%s, %s)" % ([o.Name for o in base], template) ) diff --git a/src/Mod/Path/PathScripts/PathJobDlg.py b/src/Mod/Path/Path/Main/Gui/JobDlg.py similarity index 99% rename from src/Mod/Path/PathScripts/PathJobDlg.py rename to src/Mod/Path/Path/Main/Gui/JobDlg.py index daf63c7fff..4476dc0a00 100644 --- a/src/Mod/Path/PathScripts/PathJobDlg.py +++ b/src/Mod/Path/Path/Main/Gui/JobDlg.py @@ -26,8 +26,8 @@ import FreeCAD import FreeCADGui import Path import Path.Base.Util as PathUtil -import PathScripts.PathJob as PathJob -import PathScripts.PathStock as PathStock +import Path.Main.Job as PathJob +import Path.Main.Stock as PathStock import glob import os diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/Path/Main/Gui/PreferencesJob.py similarity index 99% rename from src/Mod/Path/PathScripts/PathPreferencesPathJob.py rename to src/Mod/Path/Path/Main/Gui/PreferencesJob.py index 400454c3ba..7d3d3c0b8a 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/Path/Main/Gui/PreferencesJob.py @@ -22,8 +22,8 @@ import FreeCAD import Path +import Path.Main.Stock as PathStock import Path.Post.Processor as PostProcessor -import PathScripts.PathStock as PathStock import json from FreeCAD import Units diff --git a/src/Mod/Path/PathScripts/PathSanity.py b/src/Mod/Path/Path/Main/Gui/Sanity.py similarity index 99% rename from src/Mod/Path/PathScripts/PathSanity.py rename to src/Mod/Path/Path/Main/Gui/Sanity.py index fe9fc1472e..d3cc8f8935 100644 --- a/src/Mod/Path/PathScripts/PathSanity.py +++ b/src/Mod/Path/Path/Main/Gui/Sanity.py @@ -110,7 +110,7 @@ class CommandPathSanity: def IsActive(self): obj = FreeCADGui.Selection.getSelectionEx()[0].Object - return isinstance(obj.Proxy, PathScripts.PathJob.ObjectJob) + return isinstance(obj.Proxy, Path.Main.Job.ObjectJob) def Activated(self): # if everything is ok, execute @@ -551,7 +551,7 @@ class CommandPathSanity: m = 0 for i in obj.Document.Objects: if hasattr(i, "Proxy"): - if isinstance(i.Proxy, PathScripts.PathJob.ObjectJob): + if isinstance(i.Proxy, Path.Main.Job.ObjectJob): m += 1 if i is obj: n = m diff --git a/src/Mod/Path/PathScripts/PathSimulatorGui.py b/src/Mod/Path/Path/Main/Gui/Simulator.py similarity index 99% rename from src/Mod/Path/PathScripts/PathSimulatorGui.py rename to src/Mod/Path/Path/Main/Gui/Simulator.py index c3731e4730..430f12b559 100644 --- a/src/Mod/Path/PathScripts/PathSimulatorGui.py +++ b/src/Mod/Path/Path/Main/Gui/Simulator.py @@ -24,8 +24,8 @@ import FreeCAD import Path import Path.Base.Util as PathUtil import Path.Dressup.Utils as PathDressup +import Path.Main.Job as PathJob import PathGui -import PathScripts.PathJob as PathJob import PathSimulator import math import os diff --git a/src/Mod/Path/Path/Main/Gui/__init__.py b/src/Mod/Path/Path/Main/Gui/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/Path/Main/Job.py similarity index 99% rename from src/Mod/Path/PathScripts/PathJob.py rename to src/Mod/Path/Path/Main/Job.py index ff99602856..a758232cc4 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/Path/Main/Job.py @@ -20,15 +20,15 @@ # * * # *************************************************************************** +from Path.Post.Processor import PostProcessor from PySide import QtCore from PySide.QtCore import QT_TRANSLATE_NOOP import FreeCAD import Path import Path.Base.SetupSheet as PathSetupSheet import Path.Base.Util as PathUtil -from Path.Post.Processor import PostProcessor +import Path.Main.Stock as PathStock import Path.Tool.Controller as PathToolController -import PathScripts.PathStock as PathStock import json import time diff --git a/src/Mod/Path/PathScripts/PathStock.py b/src/Mod/Path/Path/Main/Stock.py similarity index 100% rename from src/Mod/Path/PathScripts/PathStock.py rename to src/Mod/Path/Path/Main/Stock.py diff --git a/src/Mod/Path/Path/Main/__init__.py b/src/Mod/Path/Path/Main/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Path/Path/Op/Gui/Base.py b/src/Mod/Path/Path/Op/Gui/Base.py index cc240ed37f..9f61f5d5cf 100644 --- a/src/Mod/Path/Path/Op/Gui/Base.py +++ b/src/Mod/Path/Path/Op/Gui/Base.py @@ -27,10 +27,10 @@ import Path.Base.Gui.GetPoint as PathGetPoint import Path.Base.Gui.Util as PathGuiUtil import Path.Base.SetupSheet as PathSetupSheet import Path.Base.Util as PathUtil +import Path.Main.Job as PathJob import Path.Op.Base as PathOp import Path.Op.Gui.Selection as PathSelection import PathGui -import PathScripts.PathJob as PathJob import PathScripts.PathUtils as PathUtils import importlib from PySide.QtCore import QT_TRANSLATE_NOOP diff --git a/src/Mod/Path/Path/Post/Command.py b/src/Mod/Path/Path/Post/Command.py index b0733580d3..324412c415 100644 --- a/src/Mod/Path/Path/Post/Command.py +++ b/src/Mod/Path/Path/Post/Command.py @@ -28,7 +28,7 @@ import FreeCAD import FreeCADGui import Path import Path.Base.Util as PathUtil -import PathScripts.PathJob as PathJob +import Path.Main.Job as PathJob import PathScripts.PathUtils as PathUtils import os import re diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index dd06227c6a..11ce84ad09 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -25,7 +25,7 @@ import FreeCAD from FreeCAD import Vector from PySide import QtCore import Path -import PathScripts.PathJob as PathJob +import Path.Main.Job as PathJob import math from numpy import linspace diff --git a/src/Mod/Path/PathScripts/PathUtilsGui.py b/src/Mod/Path/PathScripts/PathUtilsGui.py index 06a8d6ec82..8e27ecc2c1 100644 --- a/src/Mod/Path/PathScripts/PathUtilsGui.py +++ b/src/Mod/Path/PathScripts/PathUtilsGui.py @@ -23,9 +23,9 @@ import FreeCADGui import FreeCAD import Path +import Path.Main.Gui.JobCmd as PathJobCmd import Path.Tool.Controller as PathToolController import PathGui -import PathScripts.PathJobCmd as PathJobCmd import PathScripts.PathUtils as PathUtils from PySide import QtGui diff --git a/src/Mod/Path/PathScripts/README.md b/src/Mod/Path/PathScripts/README.md index b1ada3c2d6..7ce3416f40 100644 --- a/src/Mod/Path/PathScripts/README.md +++ b/src/Mod/Path/PathScripts/README.md @@ -1,3 +1,9 @@ +This is a legacy directory. The remaining files in here should either get refactored so +they can move into the new structure or removed. + +The PropertyBag diversion files are here in order to keep existing ToolBit files working. +They might get removed in future versions. + ### Assigned Accel Keys: * `P,I` ... Launch Path Inspector * `P,J` ... Create Job diff --git a/src/Mod/Path/PathTests/TestPathAdaptive.py b/src/Mod/Path/PathTests/TestPathAdaptive.py index 4805ba7856..62b0322ca3 100644 --- a/src/Mod/Path/PathTests/TestPathAdaptive.py +++ b/src/Mod/Path/PathTests/TestPathAdaptive.py @@ -25,12 +25,12 @@ import FreeCAD import Part import Path.Op.Adaptive as PathAdaptive -import PathScripts.PathJob as PathJob +import Path.Main.Job as PathJob from PathTests.PathTestUtils import PathTestBase if FreeCAD.GuiUp: + import Path.Main.gui.Job as PathJobGui import Path.Op.Gui.Adaptive as PathAdaptiveGui - import PathScripts.PathJobGui as PathJobGui class TestPathAdaptive(PathTestBase): diff --git a/src/Mod/Path/PathTests/TestPathDressupDogbone.py b/src/Mod/Path/PathTests/TestPathDressupDogbone.py index f41260ace5..aea96e434c 100644 --- a/src/Mod/Path/PathTests/TestPathDressupDogbone.py +++ b/src/Mod/Path/PathTests/TestPathDressupDogbone.py @@ -23,7 +23,7 @@ import FreeCAD import Path import Path.Dressup.Gui.Dogbone as PathDressupDogbone -import PathScripts.PathJob as PathJob +import Path.Main.Job as PathJob import Path.Op.Profile as PathProfile from PathTests.PathTestUtils import PathTestBase diff --git a/src/Mod/Path/PathTests/TestPathHelix.py b/src/Mod/Path/PathTests/TestPathHelix.py index fc630f28bd..69ce117a0d 100644 --- a/src/Mod/Path/PathTests/TestPathHelix.py +++ b/src/Mod/Path/PathTests/TestPathHelix.py @@ -23,8 +23,8 @@ import Draft import FreeCAD import Path +import Path.Main.Job as PathJob import Path.Op.Helix as PathHelix -import PathScripts.PathJob as PathJob import PathTests.PathTestUtils as PathTestUtils Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) diff --git a/src/Mod/Path/PathTests/TestPathStock.py b/src/Mod/Path/PathTests/TestPathStock.py index e7293e9092..bc2ab0060c 100644 --- a/src/Mod/Path/PathTests/TestPathStock.py +++ b/src/Mod/Path/PathTests/TestPathStock.py @@ -21,7 +21,7 @@ # *************************************************************************** import FreeCAD -import PathScripts.PathStock as PathStock +import Path.Main.Stock as PathStock from PathTests.PathTestUtils import PathTestBase