Merge pull request #12665 from Ondsel-Development/pathrename

Rename the Path Workbench to CAM

src/Mod/AddonManager/Addon.py

@@ -56,7 +56,7 @@ INTERNAL_WORKBENCHES = {
     "openscad": "OpenSCAD",
     "part": "Part",
     "partdesign": "PartDesign",
-    "path": "Path",
+    "cam": "CAM",
     "plot": "Plot",
     "points": "Points",
     "robot": "Robot",

src/Mod/AddonManager/AddonManagerTest/app/test_addon.py

@@ -217,7 +217,7 @@ class TestAddon(unittest.TestCase):
         addonA.requires.add("AddonB")
         addonB.requires.add("AddonC")
         addonB.requires.add("AddonD")
-        addonD.requires.add("Path")
+        addonD.requires.add("CAM")
 
         all_addons = {
             addonA.name: addonA,
@@ -244,8 +244,8 @@ class TestAddon(unittest.TestCase):
             "AddonD not in required dependencies, and it should be.",
         )
         self.assertTrue(
-            "Path" in deps.internal_workbenches,
-            "Path not in workbench dependencies, and it should be.",
+            "CAM" in deps.internal_workbenches,
+            "CAM not in workbench dependencies, and it should be.",
         )
 
     def test_internal_workbench_list(self):

src/Mod/AddonManager/AddonManagerTest/data/depends_on_all_workbenches.xml

@@ -21,7 +21,7 @@
 			<depend>OpenSCAD Workbench</depend>
 			<depend>Part WORKBENCH</depend>
 			<depend>PartDesign WB</depend>
-			<depend>path</depend>
+			<depend>CAM</depend>
 			<depend>Plot</depend>
 			<depend>POINTS</depend>
 			<depend>ROBOTWB</depend>

src/Mod/CAM/App/Area.cpp

@@ -75,8 +75,8 @@
 #include <Mod/Part/App/CrossSection.h>
 #include <Mod/Part/App/FaceMakerBullseye.h>
 #include <Mod/Part/App/PartFeature.h>
-#include <Mod/Path/App/PathSegmentWalker.h>
-#include <Mod/Path/libarea/Area.h>
+#include <Mod/CAM/App/PathSegmentWalker.h>
+#include <Mod/CAM/libarea/Area.h>
 
 #include "Area.h"
 

src/Mod/CAM/App/Area.h

@@ -30,7 +30,7 @@
 
 #include <TopoDS.hxx>
 
-#include <Mod/Path/PathGlobal.h>
+#include <Mod/CAM/PathGlobal.h>
 #include <Mod/Part/App/PartPyCXX.h>
 #include <Mod/Part/App/TopoShape.h>
 

src/Mod/CAM/App/AreaPy.xml

@@ -5,7 +5,7 @@
       Name="AreaPy"
       Twin="Area"
       TwinPointer="Area"
-      Include="Mod/Path/App/Area.h"
+      Include="Mod/CAM/App/Area.h"
       Namespace="Path"
       FatherInclude="Base/BaseClassPy.h"
       FatherNamespace="Base"

src/Mod/CAM/App/CMakeLists.txt

@@ -142,7 +142,7 @@ if(FREECAD_USE_PCH)
     ADD_MSVC_PRECOMPILED_HEADER(Path PreCompiled.h PreCompiled.cpp Path_CPP_SRCS)
 endif(FREECAD_USE_PCH)
 
-SET_BIN_DIR(Path PathApp /Mod/Path)
+SET_BIN_DIR(Path PathApp /Mod/CAM)
 SET_PYTHON_PREFIX_SUFFIX(Path)
 
 INSTALL(TARGETS Path DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/Mod/CAM/App/Command.h

@@ -29,7 +29,7 @@
 #include <Base/Persistence.h>
 #include <Base/Placement.h>
 #include <Base/Vector3D.h>
-#include <Mod/Path/PathGlobal.h>
+#include <Mod/CAM/PathGlobal.h>
 
 namespace Path
 {

src/Mod/CAM/App/CommandPy.xml

@@ -5,7 +5,7 @@
         Name="CommandPy"
         Twin="Command"
         TwinPointer="Command"
-        Include="Mod/Path/App/Command.h"
+        Include="Mod/CAM/App/Command.h"
         Namespace="Path"
         FatherInclude="Base/PersistencePy.h"
         FatherNamespace="Base"

src/Mod/CAM/App/FeatureAreaPy.xml

@@ -5,7 +5,7 @@
         Name="FeatureAreaPy"
         Twin="FeatureArea"
         TwinPointer="FeatureArea"
-        Include="Mod/Path/App/FeatureArea.h"
+        Include="Mod/CAM/App/FeatureArea.h"
         Namespace="Path"
         FatherInclude="App/DocumentObjectPy.h"
         FatherNamespace="App">

src/Mod/CAM/App/FeaturePathCompoundPy.xml

@@ -5,7 +5,7 @@
         Name="FeaturePathCompoundPy"
         Twin="FeaturePathCompound"
         TwinPointer="FeatureCompound"
-        Include="Mod/Path/App/FeaturePathCompound.h"
+        Include="Mod/CAM/App/FeaturePathCompound.h"
         Namespace="Path"
         FatherInclude="App/DocumentObjectPy.h"
         FatherNamespace="App">

src/Mod/CAM/App/ParamsHelper.h

@@ -50,15 +50,15 @@
  * double check your macro definition of the parameter is correctly, not missing
  * or having extra parenthesis or comma.  Then, you can use the CMake
  * intermediate file target to get the preprocessor output for checking. For
- * example, for a file located at \c src/Mod/Path/App/Area.cpp,
+ * example, for a file located at \c src/Mod/CAM/App/Area.cpp,
  * \code{.sh}
- *     cd <your_build_dir>/src/Mod/Path/App
+ *     cd <your_build_dir>/src/Mod/CAM/App
  *     make Area.cpp.i
  * \endcode
  *
  * The preprocessed intermediate output will be at,
  * \code{.sh}
- *     <your_build_dir>/src/Mod/Path/App.CMakeFiles/Path.dir/Area.cpp.i
+ *     <your_build_dir>/src/Mod/CAM/App.CMakeFiles/Path.dir/Area.cpp.i
  * \endcode
  *
  * \section Introduction of Boost.Preprocessor

src/Mod/CAM/App/Path.cpp

@@ -27,7 +27,7 @@
 #include <Base/Reader.h>
 #include <Base/Stream.h>
 #include <Base/Writer.h>
-#include <Mod/Path/App/PathSegmentWalker.h>
+#include <Mod/CAM/App/PathSegmentWalker.h>
 
 #include "Path.h"
 
@@ -141,7 +141,7 @@ double Toolpath::getCycleTime(double hFeed, double vFeed, double hRapid, double
 {
     // check the feedrates are set
     if ((hFeed == 0) || (vFeed == 0)) {
-        ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Path");
+        ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM");
         if (!hGrp->GetBool("WarningsSuppressAllSpeeds", true)) {
             Base::Console().Warning("Feed Rate Error: Check Tool Controllers have Feed Rates");
         }

src/Mod/CAM/App/PathPy.xml

@@ -5,7 +5,7 @@
       Name="PathPy"
       Twin="Toolpath"
       TwinPointer="Toolpath"
-      Include="Mod/Path/App/Path.h"
+      Include="Mod/CAM/App/Path.h"
       Namespace="Path"
       FatherInclude="Base/PersistencePy.h"
       FatherNamespace="Base"

src/Mod/CAM/App/Voronoi.h

@@ -28,7 +28,7 @@
 #include <Base/BaseClass.h>
 #include <Base/Handle.h>
 #include <Base/Vector3D.h>
-#include <Mod/Path/PathGlobal.h>
+#include <Mod/CAM/PathGlobal.h>
 
 #include <boost/polygon/polygon.hpp>
 #include <boost/polygon/voronoi.hpp>

src/Mod/CAM/App/VoronoiCellPy.xml

@@ -6,7 +6,7 @@
         PythonName="Path.Voronoi.Cell"
         Twin="VoronoiCell"
         TwinPointer="VoronoiCell"
-        Include="Mod/Path/App/VoronoiCell.h"
+        Include="Mod/CAM/App/VoronoiCell.h"
         FatherInclude="Base/BaseClassPy.h"
         Namespace="Path"
         FatherNamespace="Base"

src/Mod/CAM/App/VoronoiEdgePy.xml

@@ -6,7 +6,7 @@
         PythonName="Path.Voronoi.Edge"
         Twin="VoronoiEdge"
         TwinPointer="VoronoiEdge"
-        Include="Mod/Path/App/VoronoiEdge.h"
+        Include="Mod/CAM/App/VoronoiEdge.h"
         FatherInclude="Base/BaseClassPy.h"
         Namespace="Path"
         FatherNamespace="Base"

src/Mod/CAM/App/VoronoiPy.xml

@@ -6,7 +6,7 @@
         PythonName="Path.Voronoi.Diagram"
         Twin="Voronoi"
         TwinPointer="Voronoi"
-        Include="Mod/Path/App/Voronoi.h"
+        Include="Mod/CAM/App/Voronoi.h"
         Namespace="Path"
         FatherInclude="Base/BaseClassPy.h"
         FatherNamespace="Base"

src/Mod/CAM/App/VoronoiVertexPy.xml

@@ -6,7 +6,7 @@
         PythonName="Path.Voronoi.Vertex"
         Twin="VoronoiVertex"
         TwinPointer="VoronoiVertex"
-        Include="Mod/Path/App/VoronoiVertex.h"
+        Include="Mod/CAM/App/VoronoiVertex.h"
         FatherInclude="Base/BaseClassPy.h"
         Namespace="Path"
         FatherNamespace="Base"

src/Mod/CAM/CMakeLists.txt

@@ -9,7 +9,7 @@ endif(BUILD_GUI)
 set(Path_Scripts
     Init.py
     PathCommands.py
-    TestPathApp.py
+    TestCAMApp.py
 )
 
 if(BUILD_GUI)
@@ -20,7 +20,7 @@ INSTALL(
     FILES
         ${Path_Scripts}
     DESTINATION
-        Mod/Path
+        Mod/CAM
 )
 
 SET(PathPython_SRCS
@@ -206,7 +206,6 @@ SET(PathPythonOpGui_SRCS
     Path/Op/Gui/Engrave.py
     Path/Op/Gui/FeatureExtension.py
     Path/Op/Gui/Helix.py
-    Path/Op/Gui/Hop.py
     Path/Op/Gui/MillFace.py
     Path/Op/Gui/Pocket.py
     Path/Op/Gui/PocketBase.py
@@ -277,65 +276,65 @@ SET(Tools_Shape_SRCS
     Tools/Shape/v-bit.fcstd
 )
 
-SET(PathTests_SRCS
-    PathTests/__init__.py
-    PathTests/boxtest.fcstd
-    PathTests/boxtest1.fcstd
-    PathTests/Drilling_1.FCStd
-    PathTests/drill_test1.FCStd
-    PathTests/PathTestUtils.py
-    PathTests/test_adaptive.fcstd
-    PathTests/test_profile.fcstd
-    PathTests/test_centroid_00.ngc
-    PathTests/test_filenaming.fcstd
-    PathTests/test_geomop.fcstd
-    PathTests/test_holes00.fcstd
-    PathTests/TestCentroidPost.py
-    PathTests/TestGrblPost.py
-    PathTests/TestLinuxCNCPost.py
-    PathTests/TestMach3Mach4Post.py
-    PathTests/TestPathAdaptive.py
-    PathTests/TestPathCore.py
-    PathTests/TestPathDepthParams.py
-    PathTests/TestPathDressupDogbone.py
-    PathTests/TestPathDressupDogboneII.py
-    PathTests/TestPathDressupHoldingTags.py
-    PathTests/TestPathDrillGenerator.py
-    PathTests/TestPathDrillable.py
-    PathTests/TestPathGeneratorDogboneII.py
-    PathTests/TestPathGeom.py
-    PathTests/TestPathHelix.py
-    PathTests/TestPathHelpers.py
-    PathTests/TestPathHelixGenerator.py
-    PathTests/TestPathLanguage.py
-    PathTests/TestPathLog.py
-    PathTests/TestPathOpDeburr.py
-    PathTests/TestPathOpUtil.py
-    PathTests/TestPathPost.py
-    PathTests/TestPathPreferences.py
-    PathTests/TestPathProfile.py
-    PathTests/TestPathPropertyBag.py
-    PathTests/TestPathRotationGenerator.py
-    PathTests/TestPathSetupSheet.py
-    PathTests/TestPathStock.py
-    PathTests/TestPathToolChangeGenerator.py
-    PathTests/TestPathThreadMilling.py
-    PathTests/TestPathThreadMillingGenerator.py
-    PathTests/TestPathToolBit.py
-    PathTests/TestPathToolController.py
-    PathTests/TestPathUtil.py
-    PathTests/TestPathVcarve.py
-    PathTests/TestPathVoronoi.py
-    PathTests/TestRefactoredCentroidPost.py
-    PathTests/TestRefactoredGrblPost.py
-    PathTests/TestRefactoredLinuxCNCPost.py
-    PathTests/TestRefactoredMach3Mach4Post.py
-    PathTests/TestRefactoredTestPost.py
-    PathTests/TestRefactoredTestPostGCodes.py
-    PathTests/TestRefactoredTestPostMCodes.py
-    PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
-    PathTests/Tools/Library/test-path-tool-bit-library-00.fctl
-    PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
+SET(Tests_SRCS
+    Tests/__init__.py
+    Tests/boxtest.fcstd
+    Tests/boxtest1.fcstd
+    Tests/Drilling_1.FCStd
+    Tests/drill_test1.FCStd
+    Tests/PathTestUtils.py
+    Tests/test_adaptive.fcstd
+    Tests/test_profile.fcstd
+    Tests/test_centroid_00.ngc
+    Tests/test_filenaming.fcstd
+    Tests/test_geomop.fcstd
+    Tests/test_holes00.fcstd
+    Tests/TestCentroidPost.py
+    Tests/TestGrblPost.py
+    Tests/TestLinuxCNCPost.py
+    Tests/TestMach3Mach4Post.py
+    Tests/TestPathAdaptive.py
+    Tests/TestPathCore.py
+    Tests/TestPathDepthParams.py
+    Tests/TestPathDressupDogbone.py
+    Tests/TestPathDressupDogboneII.py
+    Tests/TestPathDressupHoldingTags.py
+    Tests/TestPathDrillGenerator.py
+    Tests/TestPathDrillable.py
+    Tests/TestPathGeneratorDogboneII.py
+    Tests/TestPathGeom.py
+    Tests/TestPathHelix.py
+    Tests/TestPathHelpers.py
+    Tests/TestPathHelixGenerator.py
+    Tests/TestPathLanguage.py
+    Tests/TestPathLog.py
+    Tests/TestPathOpDeburr.py
+    Tests/TestPathOpUtil.py
+    Tests/TestPathPost.py
+    Tests/TestPathPreferences.py
+    Tests/TestPathProfile.py
+    Tests/TestPathPropertyBag.py
+    Tests/TestPathRotationGenerator.py
+    Tests/TestPathSetupSheet.py
+    Tests/TestPathStock.py
+    Tests/TestPathToolChangeGenerator.py
+    Tests/TestPathThreadMilling.py
+    Tests/TestPathThreadMillingGenerator.py
+    Tests/TestPathToolBit.py
+    Tests/TestPathToolController.py
+    Tests/TestPathUtil.py
+    Tests/TestPathVcarve.py
+    Tests/TestPathVoronoi.py
+    Tests/TestRefactoredCentroidPost.py
+    Tests/TestRefactoredGrblPost.py
+    Tests/TestRefactoredLinuxCNCPost.py
+    Tests/TestRefactoredMach3Mach4Post.py
+    Tests/TestRefactoredTestPost.py
+    Tests/TestRefactoredTestPostGCodes.py
+    Tests/TestRefactoredTestPostMCodes.py
+    Tests/Tools/Bit/test-path-tool-bit-bit-00.fctb
+    Tests/Tools/Library/test-path-tool-bit-library-00.fctl
+    Tests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
 )
 
 SET(PathImages_Ops
@@ -398,131 +397,131 @@ ADD_CUSTOM_TARGET(PathScripts ALL
 
 SET(test_files
   ${Path_Scripts}
-  ${PathTests_SRCS}
+  ${Tests_SRCS}
 )
 
-ADD_CUSTOM_TARGET(PathTests ALL
+ADD_CUSTOM_TARGET(Tests ALL
     SOURCES ${test_files}
 )
 
-fc_copy_sources(PathScripts "${CMAKE_BINARY_DIR}/Mod/Path" ${all_files})
-fc_copy_sources(PathTests "${CMAKE_BINARY_DIR}/Mod/Path" ${test_files})
+fc_copy_sources(PathScripts "${CMAKE_BINARY_DIR}/Mod/CAM" ${all_files})
+fc_copy_sources(Tests "${CMAKE_BINARY_DIR}/Mod/CAM" ${test_files})
 
 INSTALL(
     FILES
         ${PathScripts_SRCS}
     DESTINATION
-        Mod/Path/PathScripts
+        Mod/CAM/PathScripts
 )
 
 INSTALL(
     FILES
         ${PathPython_SRCS}
     DESTINATION
-        Mod/Path/Path
+        Mod/CAM/Path
 )
 
 INSTALL(
     FILES
         ${PathPythonBase_SRCS}
     DESTINATION
-        Mod/Path/Path/Base
+        Mod/CAM/Path/Base
 )
 
 INSTALL(
     FILES
         ${PathPythonBaseGenerator_SRCS}
     DESTINATION
-        Mod/Path/Path/Base/Generator
+        Mod/CAM/Path/Base/Generator
 )
 
 INSTALL(
     FILES
         ${PathPythonBaseGui_SRCS}
     DESTINATION
-        Mod/Path/Path/Base/Gui
+        Mod/CAM/Path/Base/Gui
 )
 
 INSTALL(
     FILES
         ${PathPythonDressup_SRCS}
     DESTINATION
-        Mod/Path/Path/Dressup
+        Mod/CAM/Path/Dressup
 )
 
 INSTALL(
     FILES
         ${PathPythonDressupGui_SRCS}
     DESTINATION
-        Mod/Path/Path/Dressup/Gui
+        Mod/CAM/Path/Dressup/Gui
 )
 
 INSTALL(
     FILES
         ${PathPythonMain_SRCS}
     DESTINATION
-        Mod/Path/Path/Main
+        Mod/CAM/Path/Main
 )
 INSTALL(
     FILES
         ${PathPythonMainGui_SRCS}
     DESTINATION
-        Mod/Path/Path/Main/Gui
+        Mod/CAM/Path/Main/Gui
 )
 
 INSTALL(
     FILES
         ${PathPythonOp_SRCS}
     DESTINATION
-        Mod/Path/Path/Op
+        Mod/CAM/Path/Op
 )
 INSTALL(
     FILES
         ${PathPythonOpGui_SRCS}
     DESTINATION
-        Mod/Path/Path/Op/Gui
+        Mod/CAM/Path/Op/Gui
 )
 
 INSTALL(
     FILES
         ${PathPythonPost_SRCS}
     DESTINATION
-        Mod/Path/Path/Post
+        Mod/CAM/Path/Post
 )
 
 INSTALL(
     FILES
         ${PathPythonPostScripts_SRCS}
     DESTINATION
-        Mod/Path/Path/Post/scripts
+        Mod/CAM/Path/Post/scripts
 )
 
 INSTALL(
     FILES
         ${PathPythonTools_SRCS}
     DESTINATION
-        Mod/Path/Path/Tool
+        Mod/CAM/Path/Tool
 )
 
 INSTALL(
     FILES
         ${PathPythonToolsGui_SRCS}
     DESTINATION
-        Mod/Path/Path/Tool/Gui
+        Mod/CAM/Path/Tool/Gui
 )
 
 INSTALL(
     FILES
-        ${PathTests_SRCS}
+        ${Tests_SRCS}
     DESTINATION
-        Mod/Path/PathTests
+        Mod/CAM/Tests
 )
 
 INSTALL(
   DIRECTORY
-      PathTests/Tools
+      Tests/Tools
   DESTINATION
-        Mod/Path/PathTests
+        Mod/CAM/Tests
 )
 
 
@@ -530,54 +529,54 @@ INSTALL(
     FILES
         ${PathPythonGui_SRCS}
     DESTINATION
-        Mod/Path/PathPythonGui
+        Mod/CAM/PathPythonGui
 )
 
 INSTALL(
     FILES
         ${Tools_SRCS}
     DESTINATION
-        Mod/Path/Tools
+        Mod/CAM/Tools
 )
 
 INSTALL(
     FILES
         ${Tools_Bit_SRCS}
     DESTINATION
-        Mod/Path/Tools/Bit
+        Mod/CAM/Tools/Bit
 )
 
 INSTALL(
     FILES
         ${Tools_Library_SRCS}
     DESTINATION
-        Mod/Path/Tools/Library
+        Mod/CAM/Tools/Library
 )
 
 INSTALL(
     FILES
       ${Tools_Shape_SRCS}
     DESTINATION
-      Mod/Path/Tools/Shape
+      Mod/CAM/Tools/Shape
 )
 
 INSTALL(
     FILES
         ${PathImages_Ops}
     DESTINATION
-        Mod/Path/Images/Ops
+        Mod/CAM/Images/Ops
 )
 
 INSTALL(
     FILES
         ${PathImages_Tools}
     DESTINATION
-        Mod/Path/Images/Tools
+        Mod/CAM/Images/Tools
 )
 
 INSTALL(
     FILES
         ${PathData_Threads}
     DESTINATION
-        Mod/Path/Data/Threads
+        Mod/CAM/Data/Threads
 )

src/Mod/CAM/Gui/AppPathGui.cpp

@@ -87,7 +87,7 @@ PyMOD_INIT_FUNC(PathGui)
     loadPathResource();
 
     // register preferences pages
-    new Gui::PrefPageProducer<PathGui::DlgSettingsPathColor> (QT_TRANSLATE_NOOP("QObject","Path"));
+    new Gui::PrefPageProducer<PathGui::DlgSettingsPathColor> (QT_TRANSLATE_NOOP("QObject","CAM"));
 
     PyMOD_Return(mod);
 }

src/Mod/CAM/Gui/AppPathGuiPy.cpp

@@ -76,7 +76,7 @@ private:
 
         try {
             std::string path = App::Application::getHomePath();
-            path += "Mod/Path/Path/Post/scripts/";
+            path += "Mod/CAM/Path/Post/scripts/";
             QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_pre.py"));
             std::string cMacroPath = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
                 ->GetASCII("MacroPath",App::Application::getUserMacroDir().c_str());
@@ -143,7 +143,7 @@ private:
 
         try {
             std::string path = App::Application::getHomePath();
-            path += "Mod/Path/Path/Post/scripts/";
+            path += "Mod/CAM/Path/Post/scripts/";
             QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_pre.py"));
             std::string cMacroPath = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
                 ->GetASCII("MacroPath",App::Application::getUserMacroDir().c_str());
@@ -219,7 +219,7 @@ private:
                 throw Py::RuntimeError("No object to export");
 
             std::string path = App::Application::getHomePath();
-            path += "Mod/Path/Path/Post/scripts/";
+            path += "Mod/CAM/Path/Post/scripts/";
             QDir dir1(QString::fromUtf8(path.c_str()), QString::fromLatin1("*_post.py"));
             std::string cMacroPath = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
                 ->GetASCII("MacroPath",App::Application::getUserMacroDir().c_str());

src/Mod/CAM/Gui/CMakeLists.txt

@@ -80,16 +80,16 @@ if(FREECAD_USE_PCH)
 endif(FREECAD_USE_PCH)
 
 SET(PathGuiIcon_SVG
-    Resources/icons/PathWorkbench.svg
+    Resources/icons/CAMWorkbench.svg
 )
 
 add_library(PathGui SHARED ${PathGui_SRCS} ${PathGuiIcon_SVG})
 target_link_libraries(PathGui ${PathGui_LIBS})
 
-SET_BIN_DIR(PathGui PathGui /Mod/Path)
+SET_BIN_DIR(PathGui PathGui /Mod/CAM)
 SET_PYTHON_PREFIX_SUFFIX(PathGui)
 
-fc_copy_sources(PathGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Path" ${PathGuiIcon_SVG})
+fc_copy_sources(PathGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/CAM" ${PathGuiIcon_SVG})
 
 INSTALL(TARGETS PathGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL(FILES ${PathGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Path/Resources/icons")
+INSTALL(FILES ${PathGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/CAM/Resources/icons")

src/Mod/CAM/Gui/Command.cpp

@@ -31,8 +31,8 @@
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
 #include <Gui/SelectionObject.h>
-#include <Mod/Path/App/FeatureArea.h>
-#include <Mod/Path/App/FeaturePathShape.h>
+#include <Mod/CAM/App/FeatureArea.h>
+#include <Mod/CAM/App/FeaturePathShape.h>
 
 
 // Path Area  #####################################################################################################
@@ -40,15 +40,15 @@
 DEF_STD_CMD_A(CmdPathArea)
 
 CmdPathArea::CmdPathArea()
-    :Command("Path_Area")
+    :Command("CAM_Area")
 {
     sAppModule      = "Path";
     sGroup          = QT_TR_NOOP("Path");
     sMenuText       = QT_TR_NOOP("Area");
     sToolTipText    = QT_TR_NOOP("Creates a feature area from selected objects");
-    sWhatsThis      = "Path_Area";
+    sWhatsThis      = "CAM_Area";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Path_Area";
+    sPixmap         = "CAM_Area";
 }
 
 void CmdPathArea::activated(int iMsg)
@@ -122,15 +122,15 @@ bool CmdPathArea::isActive()
 DEF_STD_CMD_A(CmdPathAreaWorkplane)
 
 CmdPathAreaWorkplane::CmdPathAreaWorkplane()
-    :Command("Path_Area_Workplane")
+    :Command("CAM_Area_Workplane")
 {
     sAppModule      = "Path";
     sGroup          = QT_TR_NOOP("Path");
     sMenuText       = QT_TR_NOOP("Area workplane");
     sToolTipText    = QT_TR_NOOP("Select a workplane for a FeatureArea");
-    sWhatsThis      = "Path_Area_Workplane";
+    sWhatsThis      = "CAM_Area_Workplane";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Path_Area_Workplane";
+    sPixmap         = "CAM_Area_Workplane";
 }
 
 void CmdPathAreaWorkplane::activated(int iMsg)
@@ -212,15 +212,15 @@ bool CmdPathAreaWorkplane::isActive()
 DEF_STD_CMD_A(CmdPathCompound)
 
 CmdPathCompound::CmdPathCompound()
-    :Command("Path_Compound")
+    :Command("CAM_Compound")
 {
     sAppModule      = "Path";
     sGroup          = QT_TR_NOOP("Path");
     sMenuText       = QT_TR_NOOP("Compound");
-    sToolTipText    = QT_TR_NOOP("Creates a compound from selected paths");
-    sWhatsThis      = "Path_Compound";
+    sToolTipText    = QT_TR_NOOP("Creates a compound from selected toolpaths");
+    sWhatsThis      = "CAM_Compound";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Path_Compound";
+    sPixmap         = "CAM_Compound";
 }
 
 void CmdPathCompound::activated(int iMsg)
@@ -264,15 +264,15 @@ bool CmdPathCompound::isActive()
 DEF_STD_CMD_A(CmdPathShape)
 
 CmdPathShape::CmdPathShape()
-    :Command("Path_Shape")
+    :Command("CAM_Shape")
 {
     sAppModule      = "Path";
     sGroup          = QT_TR_NOOP("Path");
     sMenuText       = QT_TR_NOOP("From Shape");
-    sToolTipText    = QT_TR_NOOP("Creates a path from a selected shape");
-    sWhatsThis      = "Path_Shape";
+    sToolTipText    = QT_TR_NOOP("Creates a toolpath from a selected shape");
+    sWhatsThis      = "CAM_Shape";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Path_Shape";
+    sPixmap         = "CAM_Shape";
 }
 
 void CmdPathShape::activated(int iMsg)

src/Mod/CAM/Gui/DlgSettingsPathColor.ui

@@ -41,7 +41,7 @@
          <cstring>DefaultPathLineWidth</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -87,7 +87,7 @@
          <cstring>DefaultBBoxNormalColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -120,7 +120,7 @@
          <cstring>DefaultNormalPathColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -140,7 +140,7 @@
          <cstring>DefaultRapidPathColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -186,7 +186,7 @@
          <cstring>DefaultHighlightPathColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -232,7 +232,7 @@
          <cstring>DefaultPathMarkerColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -265,7 +265,7 @@
          <cstring>DefaultProbePathColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -285,7 +285,7 @@
          <cstring>DefaultBBoxSelectionColor</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
        </widget>
       </item>
@@ -329,7 +329,7 @@
          <cstring>DefaultSelectionStyle</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
         <item>
          <property name="text">
@@ -361,7 +361,7 @@
          <cstring>DefaultTaskPanelLayout</cstring>
         </property>
         <property name="prefPath" stdset="0">
-         <cstring>Mod/Path</cstring>
+         <cstring>Mod/CAM</cstring>
         </property>
         <item>
          <property name="text">

src/Mod/CAM/Gui/Resources/Path.qrc

@@ -0,0 +1,129 @@
+<RCC>
+    <qresource>
+        <file>icons/CAM_Adaptive.svg</file>
+        <file>icons/CAM_3DPocket.svg</file>
+        <file>icons/CAM_3DSurface.svg</file>
+        <file>icons/CAM_Area_View.svg</file>
+        <file>icons/CAM_Area_Workplane.svg</file>
+        <file>icons/CAM_Area.svg</file>
+        <file>icons/CAM_Array.svg</file>
+        <file>icons/CAM_BFastForward.svg</file>
+        <file>icons/CAM_BPause.svg</file>
+        <file>icons/CAM_BPlay.svg</file>
+        <file>icons/CAM_BStep.svg</file>
+        <file>icons/CAM_BStop.svg</file>
+        <file>icons/CAM_BaseGeometry.svg</file>
+        <file>icons/CAM_Camotics.svg</file>
+        <file>icons/CAM_Comment.svg</file>
+        <file>icons/CAM_Compound.svg</file>
+        <file>icons/CAM_Copy.svg</file>
+        <file>icons/CAM_Custom.svg</file>
+        <file>icons/CAM_Datums.svg</file>
+        <file>icons/CAM_Deburr.svg</file>
+        <file>icons/CAM_Depths.svg</file>
+        <file>icons/CAM_Dressup.svg</file>
+        <file>icons/CAM_Drilling.svg</file>
+        <file>icons/CAM_Engrave.svg</file>
+        <file>icons/CAM_ExportTemplate.svg</file>
+        <file>icons/CAM_Face.svg</file>
+        <file>icons/CAM_FacePocket.svg</file>
+        <file>icons/CAM_FaceProfile.svg</file>
+        <file>icons/CAM_Heights.svg</file>
+        <file>icons/CAM_Helix.svg</file>
+        <file>icons/CAM_Inspect.svg</file>
+        <file>icons/CAM_Job.svg</file>
+        <file>icons/CAM_LengthOffset.svg</file>
+        <file>icons/CAM_OpActive.svg</file>
+        <file>icons/CAM_OpCopy.svg</file>
+        <file>icons/CAM_OperationA.svg</file>
+        <file>icons/CAM_OperationB.svg</file>
+        <file>icons/CAM_Pocket.svg</file>
+        <file>icons/CAM_Post.svg</file>
+        <file>icons/CAM_Probe.svg</file>
+        <file>icons/CAM_Profile_Edges.svg</file>
+        <file>icons/CAM_Profile_Face.svg</file>
+        <file>icons/CAM_Profile.svg</file>
+        <file>icons/CAM_Sanity.svg</file>
+        <file>icons/CAM_SelectLoop.svg</file>
+        <file>icons/CAM_SetupSheet.svg</file>
+        <file>icons/CAM_Shape.svg</file>
+        <file>icons/CAM_SimpleCopy.svg</file>
+        <file>icons/CAM_Simulator.svg</file>
+        <file>icons/CAM_Slot.svg</file>
+        <file>icons/CAM_Stop.svg</file>
+        <file>icons/CAM_ThreadMilling.svg</file>
+        <file>icons/CAM_ToolBit.svg</file>
+        <file>icons/CAM_ToolChange.svg</file>
+        <file>icons/CAM_ToolController.svg</file>
+        <file>icons/CAM_ToolDuplicate.svg</file>
+        <file>icons/CAM_Toolpath.svg</file>
+        <file>icons/CAM_ToolTable.svg</file>
+        <file>icons/CAM_Vcarve.svg</file>
+        <file>icons/CAM_Waterline.svg</file>
+        <file>icons/arrow-ccw.svg</file>
+        <file>icons/arrow-cw.svg</file>
+        <file>icons/arrow-down.svg</file>
+        <file>icons/arrow-left-down.svg</file>
+        <file>icons/arrow-left-up.svg</file>
+        <file>icons/arrow-left.svg</file>
+        <file>icons/arrow-right-down.svg</file>
+        <file>icons/arrow-right-up.svg</file>
+        <file>icons/arrow-right.svg</file>
+        <file>icons/arrow-up.svg</file>
+        <file>icons/edge-join-miter-not.svg</file>
+        <file>icons/edge-join-miter.svg</file>
+        <file>icons/edge-join-round-not.svg</file>
+        <file>icons/edge-join-round.svg</file>
+        <file>icons/preferences-cam.svg</file>
+        <file>panels/AxisMapEdit.ui</file>
+        <file>panels/DlgJobCreate.ui</file>
+        <file>panels/DlgJobModelSelect.ui</file>
+        <file>panels/DlgJobTemplateExport.ui</file>
+        <file>panels/DlgSelectPostProcessor.ui</file>
+        <file>panels/DlgTCChooser.ui</file>
+        <file>panels/DlgToolControllerEdit.ui</file>
+        <file>panels/DlgToolCopy.ui</file>
+        <file>panels/DlgToolEdit.ui</file>
+        <file>panels/DogboneEdit.ui</file>
+        <file>panels/DressupPathBoundary.ui</file>
+        <file>panels/DragKnifeEdit.ui</file>
+        <file>panels/DressUpLeadInOutEdit.ui</file>
+        <file>panels/HoldingTagsEdit.ui</file>
+        <file>panels/PageBaseGeometryEdit.ui</file>
+        <file>panels/PageBaseHoleGeometryEdit.ui</file>
+        <file>panels/PageBaseLocationEdit.ui</file>
+        <file>panels/PageDepthsEdit.ui</file>
+        <file>panels/PageDiametersEdit.ui</file>
+        <file>panels/PageHeightsEdit.ui</file>
+        <file>panels/PageOpAdaptiveEdit.ui</file>
+        <file>panels/PageOpCustomEdit.ui</file>
+        <file>panels/PageOpDeburrEdit.ui</file>
+        <file>panels/PageOpDrillingEdit.ui</file>
+        <file>panels/PageOpEngraveEdit.ui</file>
+        <file>panels/PageOpHelixEdit.ui</file>
+        <file>panels/PageOpPocketExtEdit.ui</file>
+        <file>panels/PageOpPocketFullEdit.ui</file>
+        <file>panels/PageOpProbeEdit.ui</file>
+        <file>panels/PageOpProfileFullEdit.ui</file>
+        <file>panels/PageOpSlotEdit.ui</file>
+        <file>panels/PageOpSurfaceEdit.ui</file>
+        <file>panels/PageOpThreadMillingEdit.ui</file>
+        <file>panels/PageOpWaterlineEdit.ui</file>
+        <file>panels/PageOpVcarveEdit.ui</file>
+        <file>panels/PathEdit.ui</file>
+        <file>panels/PointEdit.ui</file>
+        <file>panels/PropertyBag.ui</file>
+        <file>panels/PropertyCreate.ui</file>
+        <file>panels/SetupGlobal.ui</file>
+        <file>panels/SetupOp.ui</file>
+        <file>panels/ToolBitEditor.ui</file>
+        <file>panels/ToolBitLibraryEdit.ui</file>
+        <file>panels/ToolBitSelector.ui</file>
+        <file>panels/TaskPathCamoticsSim.ui</file>
+        <file>panels/TaskPathSimulator.ui</file>
+        <file>panels/ZCorrectEdit.ui</file>
+        <file>preferences/Advanced.ui</file>
+        <file>preferences/PathDressupHoldingTags.ui</file>
+        <file>preferences/PathJob.ui</file>
+    </qresource>
+</RCC>

src/Mod/CAM/Gui/Resources/icons/CAMWorkbench.svg

@@ -355,7 +355,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/PathWorkbench.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_3DPocket.svg

@@ -14,7 +14,7 @@
    id="svg2816"
    version="1.1"
    inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="Path_3DPocket.svg">
+   sodipodi:docname="CAM_3DPocket.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -189,7 +189,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:title>Path_3DSurface</dc:title>
+        <dc:title>CAM_3DSurface</dc:title>
         <dc:date>2016-05-15</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -197,7 +197,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_3DSurface.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_Adaptive.svg

@@ -15,7 +15,7 @@
    id="svg2816"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="Path_Adaptive.svg">
+   sodipodi:docname="CAM_Adaptive.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -575,7 +575,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
-        <dc:title>Path_FaceProfile</dc:title>
+        <dc:title>CAM_Adaptive</dc:title>
         <dc:date>2016-01-19</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -583,7 +583,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_Area.svg

@@ -15,7 +15,7 @@
    id="svg2816"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="Path_Area.svg">
+   sodipodi:docname="CAM_Area.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -587,7 +587,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:title>Path_FaceProfile</dc:title>
+        <dc:title>CAM_Area</dc:title>
         <dc:date>2016-01-19</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -595,7 +595,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_Area_View.svg

@@ -15,7 +15,7 @@
    id="svg2816"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="Path_Area_View.svg">
+   sodipodi:docname="CAM_Area_View.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -587,7 +587,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:title>Path_FaceProfile</dc:title>
+        <dc:title>CAM_Area_View</dc:title>
         <dc:date>2016-01-19</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -595,7 +595,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_Area_Workplane.svg

@@ -15,7 +15,7 @@
    id="svg2816"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="Path_Area_Workplane.svg">
+   sodipodi:docname="CAM_Area_Workplane.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -609,7 +609,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:title>Path_FaceProfile</dc:title>
+        <dc:title>CAM_Area_Workplane</dc:title>
         <dc:date>2016-01-19</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -617,7 +617,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>

src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg

@@ -8,7 +8,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="Path_Camotics.svg"
+   sodipodi:docname="CAM_Camotics.svg"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    version="1.1"
    id="svg2816"
@@ -576,7 +576,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:title>Path_Drilling</dc:title>
+        <dc:title>CAM_Camotics</dc:title>
         <dc:date>2015-07-04</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -584,7 +584,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Path/Gui/Resources/icons/Path_Drilling.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>