diff --git a/src/Mod/Path/.flake8 b/src/Mod/CAM/.flake8 similarity index 100% rename from src/Mod/Path/.flake8 rename to src/Mod/CAM/.flake8 diff --git a/src/Mod/Path/App/AppPath.cpp b/src/Mod/CAM/App/AppPath.cpp similarity index 100% rename from src/Mod/Path/App/AppPath.cpp rename to src/Mod/CAM/App/AppPath.cpp diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/CAM/App/AppPathPy.cpp similarity index 100% rename from src/Mod/Path/App/AppPathPy.cpp rename to src/Mod/CAM/App/AppPathPy.cpp diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/CAM/App/Area.cpp similarity index 99% rename from src/Mod/Path/App/Area.cpp rename to src/Mod/CAM/App/Area.cpp index 39fbc884af..291aef72e5 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/CAM/App/Area.cpp @@ -75,8 +75,8 @@ #include #include #include -#include -#include +#include +#include #include "Area.h" diff --git a/src/Mod/Path/App/Area.h b/src/Mod/CAM/App/Area.h similarity index 99% rename from src/Mod/Path/App/Area.h rename to src/Mod/CAM/App/Area.h index e79a62577d..89c397d40e 100644 --- a/src/Mod/Path/App/Area.h +++ b/src/Mod/CAM/App/Area.h @@ -30,7 +30,7 @@ #include -#include +#include #include #include diff --git a/src/Mod/Path/App/AreaParams.h b/src/Mod/CAM/App/AreaParams.h similarity index 100% rename from src/Mod/Path/App/AreaParams.h rename to src/Mod/CAM/App/AreaParams.h diff --git a/src/Mod/Path/App/AreaPy.xml b/src/Mod/CAM/App/AreaPy.xml similarity index 99% rename from src/Mod/Path/App/AreaPy.xml rename to src/Mod/CAM/App/AreaPy.xml index a38a84aec1..a237957a20 100644 --- a/src/Mod/Path/App/AreaPy.xml +++ b/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" diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/CAM/App/AreaPyImp.cpp similarity index 100% rename from src/Mod/Path/App/AreaPyImp.cpp rename to src/Mod/CAM/App/AreaPyImp.cpp diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt similarity index 99% rename from src/Mod/Path/App/CMakeLists.txt rename to src/Mod/CAM/App/CMakeLists.txt index e26fbab6a6..84c6dcd232 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/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}) diff --git a/src/Mod/Path/App/Command.cpp b/src/Mod/CAM/App/Command.cpp similarity index 100% rename from src/Mod/Path/App/Command.cpp rename to src/Mod/CAM/App/Command.cpp diff --git a/src/Mod/Path/App/Command.h b/src/Mod/CAM/App/Command.h similarity index 99% rename from src/Mod/Path/App/Command.h rename to src/Mod/CAM/App/Command.h index bbd1301657..28cc449e3d 100644 --- a/src/Mod/Path/App/Command.h +++ b/src/Mod/CAM/App/Command.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace Path { diff --git a/src/Mod/Path/App/CommandPy.xml b/src/Mod/CAM/App/CommandPy.xml similarity index 98% rename from src/Mod/Path/App/CommandPy.xml rename to src/Mod/CAM/App/CommandPy.xml index 01da6a0587..e0500ec9b0 100644 --- a/src/Mod/Path/App/CommandPy.xml +++ b/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" diff --git a/src/Mod/Path/App/CommandPyImp.cpp b/src/Mod/CAM/App/CommandPyImp.cpp similarity index 100% rename from src/Mod/Path/App/CommandPyImp.cpp rename to src/Mod/CAM/App/CommandPyImp.cpp diff --git a/src/Mod/Path/App/FeatureArea.cpp b/src/Mod/CAM/App/FeatureArea.cpp similarity index 100% rename from src/Mod/Path/App/FeatureArea.cpp rename to src/Mod/CAM/App/FeatureArea.cpp diff --git a/src/Mod/Path/App/FeatureArea.h b/src/Mod/CAM/App/FeatureArea.h similarity index 100% rename from src/Mod/Path/App/FeatureArea.h rename to src/Mod/CAM/App/FeatureArea.h diff --git a/src/Mod/Path/App/FeatureAreaPy.xml b/src/Mod/CAM/App/FeatureAreaPy.xml similarity index 97% rename from src/Mod/Path/App/FeatureAreaPy.xml rename to src/Mod/CAM/App/FeatureAreaPy.xml index fda7b500d0..c167df2b4f 100644 --- a/src/Mod/Path/App/FeatureAreaPy.xml +++ b/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"> diff --git a/src/Mod/Path/App/FeatureAreaPyImp.cpp b/src/Mod/CAM/App/FeatureAreaPyImp.cpp similarity index 100% rename from src/Mod/Path/App/FeatureAreaPyImp.cpp rename to src/Mod/CAM/App/FeatureAreaPyImp.cpp diff --git a/src/Mod/Path/App/FeaturePath.cpp b/src/Mod/CAM/App/FeaturePath.cpp similarity index 100% rename from src/Mod/Path/App/FeaturePath.cpp rename to src/Mod/CAM/App/FeaturePath.cpp diff --git a/src/Mod/Path/App/FeaturePath.h b/src/Mod/CAM/App/FeaturePath.h similarity index 100% rename from src/Mod/Path/App/FeaturePath.h rename to src/Mod/CAM/App/FeaturePath.h diff --git a/src/Mod/Path/App/FeaturePathCompound.cpp b/src/Mod/CAM/App/FeaturePathCompound.cpp similarity index 100% rename from src/Mod/Path/App/FeaturePathCompound.cpp rename to src/Mod/CAM/App/FeaturePathCompound.cpp diff --git a/src/Mod/Path/App/FeaturePathCompound.h b/src/Mod/CAM/App/FeaturePathCompound.h similarity index 100% rename from src/Mod/Path/App/FeaturePathCompound.h rename to src/Mod/CAM/App/FeaturePathCompound.h diff --git a/src/Mod/Path/App/FeaturePathCompoundPy.xml b/src/Mod/CAM/App/FeaturePathCompoundPy.xml similarity index 95% rename from src/Mod/Path/App/FeaturePathCompoundPy.xml rename to src/Mod/CAM/App/FeaturePathCompoundPy.xml index 180b707ee2..886c471f8e 100644 --- a/src/Mod/Path/App/FeaturePathCompoundPy.xml +++ b/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"> diff --git a/src/Mod/Path/App/FeaturePathCompoundPyImp.cpp b/src/Mod/CAM/App/FeaturePathCompoundPyImp.cpp similarity index 100% rename from src/Mod/Path/App/FeaturePathCompoundPyImp.cpp rename to src/Mod/CAM/App/FeaturePathCompoundPyImp.cpp diff --git a/src/Mod/Path/App/FeaturePathShape.cpp b/src/Mod/CAM/App/FeaturePathShape.cpp similarity index 100% rename from src/Mod/Path/App/FeaturePathShape.cpp rename to src/Mod/CAM/App/FeaturePathShape.cpp diff --git a/src/Mod/Path/App/FeaturePathShape.h b/src/Mod/CAM/App/FeaturePathShape.h similarity index 100% rename from src/Mod/Path/App/FeaturePathShape.h rename to src/Mod/CAM/App/FeaturePathShape.h diff --git a/src/Mod/Path/App/ParamsHelper.h b/src/Mod/CAM/App/ParamsHelper.h similarity index 99% rename from src/Mod/Path/App/ParamsHelper.h rename to src/Mod/CAM/App/ParamsHelper.h index df49eb5d03..c479817531 100644 --- a/src/Mod/Path/App/ParamsHelper.h +++ b/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 /src/Mod/Path/App + * cd /src/Mod/CAM/App * make Area.cpp.i * \endcode * * The preprocessed intermediate output will be at, * \code{.sh} - * /src/Mod/Path/App.CMakeFiles/Path.dir/Area.cpp.i + * /src/Mod/CAM/App.CMakeFiles/Path.dir/Area.cpp.i * \endcode * * \section Introduction of Boost.Preprocessor diff --git a/src/Mod/Path/App/Path.cpp b/src/Mod/CAM/App/Path.cpp similarity index 99% rename from src/Mod/Path/App/Path.cpp rename to src/Mod/CAM/App/Path.cpp index 52cfab2bc2..cb61089bc6 100644 --- a/src/Mod/Path/App/Path.cpp +++ b/src/Mod/CAM/App/Path.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #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"); } diff --git a/src/Mod/Path/App/Path.h b/src/Mod/CAM/App/Path.h similarity index 100% rename from src/Mod/Path/App/Path.h rename to src/Mod/CAM/App/Path.h diff --git a/src/Mod/Path/App/PathPy.xml b/src/Mod/CAM/App/PathPy.xml similarity index 99% rename from src/Mod/Path/App/PathPy.xml rename to src/Mod/CAM/App/PathPy.xml index 7a9f8ed42b..d0d6dac98c 100644 --- a/src/Mod/Path/App/PathPy.xml +++ b/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" diff --git a/src/Mod/Path/App/PathPyImp.cpp b/src/Mod/CAM/App/PathPyImp.cpp similarity index 100% rename from src/Mod/Path/App/PathPyImp.cpp rename to src/Mod/CAM/App/PathPyImp.cpp diff --git a/src/Mod/Path/App/PathSegmentWalker.cpp b/src/Mod/CAM/App/PathSegmentWalker.cpp similarity index 100% rename from src/Mod/Path/App/PathSegmentWalker.cpp rename to src/Mod/CAM/App/PathSegmentWalker.cpp diff --git a/src/Mod/Path/App/PathSegmentWalker.h b/src/Mod/CAM/App/PathSegmentWalker.h similarity index 100% rename from src/Mod/Path/App/PathSegmentWalker.h rename to src/Mod/CAM/App/PathSegmentWalker.h diff --git a/src/Mod/Path/App/PreCompiled.cpp b/src/Mod/CAM/App/PreCompiled.cpp similarity index 100% rename from src/Mod/Path/App/PreCompiled.cpp rename to src/Mod/CAM/App/PreCompiled.cpp diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/CAM/App/PreCompiled.h similarity index 100% rename from src/Mod/Path/App/PreCompiled.h rename to src/Mod/CAM/App/PreCompiled.h diff --git a/src/Mod/Path/App/PropertyPath.cpp b/src/Mod/CAM/App/PropertyPath.cpp similarity index 100% rename from src/Mod/Path/App/PropertyPath.cpp rename to src/Mod/CAM/App/PropertyPath.cpp diff --git a/src/Mod/Path/App/PropertyPath.h b/src/Mod/CAM/App/PropertyPath.h similarity index 100% rename from src/Mod/Path/App/PropertyPath.h rename to src/Mod/CAM/App/PropertyPath.h diff --git a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/CAM/App/Voronoi.cpp similarity index 100% rename from src/Mod/Path/App/Voronoi.cpp rename to src/Mod/CAM/App/Voronoi.cpp diff --git a/src/Mod/Path/App/Voronoi.h b/src/Mod/CAM/App/Voronoi.h similarity index 99% rename from src/Mod/Path/App/Voronoi.h rename to src/Mod/CAM/App/Voronoi.h index 48d0fa9578..84136175ea 100644 --- a/src/Mod/Path/App/Voronoi.h +++ b/src/Mod/CAM/App/Voronoi.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Mod/Path/App/VoronoiCell.cpp b/src/Mod/CAM/App/VoronoiCell.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiCell.cpp rename to src/Mod/CAM/App/VoronoiCell.cpp diff --git a/src/Mod/Path/App/VoronoiCell.h b/src/Mod/CAM/App/VoronoiCell.h similarity index 100% rename from src/Mod/Path/App/VoronoiCell.h rename to src/Mod/CAM/App/VoronoiCell.h diff --git a/src/Mod/Path/App/VoronoiCellPy.xml b/src/Mod/CAM/App/VoronoiCellPy.xml similarity index 98% rename from src/Mod/Path/App/VoronoiCellPy.xml rename to src/Mod/CAM/App/VoronoiCellPy.xml index 1d439da46a..71c5df4b30 100644 --- a/src/Mod/Path/App/VoronoiCellPy.xml +++ b/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" diff --git a/src/Mod/Path/App/VoronoiCellPyImp.cpp b/src/Mod/CAM/App/VoronoiCellPyImp.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiCellPyImp.cpp rename to src/Mod/CAM/App/VoronoiCellPyImp.cpp diff --git a/src/Mod/Path/App/VoronoiEdge.cpp b/src/Mod/CAM/App/VoronoiEdge.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiEdge.cpp rename to src/Mod/CAM/App/VoronoiEdge.cpp diff --git a/src/Mod/Path/App/VoronoiEdge.h b/src/Mod/CAM/App/VoronoiEdge.h similarity index 100% rename from src/Mod/Path/App/VoronoiEdge.h rename to src/Mod/CAM/App/VoronoiEdge.h diff --git a/src/Mod/Path/App/VoronoiEdgePy.xml b/src/Mod/CAM/App/VoronoiEdgePy.xml similarity index 99% rename from src/Mod/Path/App/VoronoiEdgePy.xml rename to src/Mod/CAM/App/VoronoiEdgePy.xml index 5d92739411..a554957cc2 100644 --- a/src/Mod/Path/App/VoronoiEdgePy.xml +++ b/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" diff --git a/src/Mod/Path/App/VoronoiEdgePyImp.cpp b/src/Mod/CAM/App/VoronoiEdgePyImp.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiEdgePyImp.cpp rename to src/Mod/CAM/App/VoronoiEdgePyImp.cpp diff --git a/src/Mod/Path/App/VoronoiPy.xml b/src/Mod/CAM/App/VoronoiPy.xml similarity index 99% rename from src/Mod/Path/App/VoronoiPy.xml rename to src/Mod/CAM/App/VoronoiPy.xml index bf170fad18..c54b4cccd0 100644 --- a/src/Mod/Path/App/VoronoiPy.xml +++ b/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" diff --git a/src/Mod/Path/App/VoronoiPyImp.cpp b/src/Mod/CAM/App/VoronoiPyImp.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiPyImp.cpp rename to src/Mod/CAM/App/VoronoiPyImp.cpp diff --git a/src/Mod/Path/App/VoronoiVertex.cpp b/src/Mod/CAM/App/VoronoiVertex.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiVertex.cpp rename to src/Mod/CAM/App/VoronoiVertex.cpp diff --git a/src/Mod/Path/App/VoronoiVertex.h b/src/Mod/CAM/App/VoronoiVertex.h similarity index 100% rename from src/Mod/Path/App/VoronoiVertex.h rename to src/Mod/CAM/App/VoronoiVertex.h diff --git a/src/Mod/Path/App/VoronoiVertexPy.xml b/src/Mod/CAM/App/VoronoiVertexPy.xml similarity index 97% rename from src/Mod/Path/App/VoronoiVertexPy.xml rename to src/Mod/CAM/App/VoronoiVertexPy.xml index dc049bf0dd..a04cba6e1b 100644 --- a/src/Mod/Path/App/VoronoiVertexPy.xml +++ b/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" diff --git a/src/Mod/Path/App/VoronoiVertexPyImp.cpp b/src/Mod/CAM/App/VoronoiVertexPyImp.cpp similarity index 100% rename from src/Mod/Path/App/VoronoiVertexPyImp.cpp rename to src/Mod/CAM/App/VoronoiVertexPyImp.cpp diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/CAM/CMakeLists.txt similarity index 93% rename from src/Mod/Path/CMakeLists.txt rename to src/Mod/CAM/CMakeLists.txt index 897eda3355..5aa2012c26 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/CAM/CMakeLists.txt @@ -20,7 +20,7 @@ INSTALL( FILES ${Path_Scripts} DESTINATION - Mod/Path + Mod/CAM ) SET(PathPython_SRCS @@ -404,124 +404,124 @@ ADD_CUSTOM_TARGET(PathTests 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(PathTests "${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} DESTINATION - Mod/Path/PathTests + Mod/CAM/PathTests ) INSTALL( DIRECTORY PathTests/Tools DESTINATION - Mod/Path/PathTests + Mod/CAM/PathTests ) @@ -529,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 ) diff --git a/src/Mod/Path/Data/Threads/imperial-external-2A.csv b/src/Mod/CAM/Data/Threads/imperial-external-2A.csv similarity index 100% rename from src/Mod/Path/Data/Threads/imperial-external-2A.csv rename to src/Mod/CAM/Data/Threads/imperial-external-2A.csv diff --git a/src/Mod/Path/Data/Threads/imperial-external-3A.csv b/src/Mod/CAM/Data/Threads/imperial-external-3A.csv similarity index 100% rename from src/Mod/Path/Data/Threads/imperial-external-3A.csv rename to src/Mod/CAM/Data/Threads/imperial-external-3A.csv diff --git a/src/Mod/Path/Data/Threads/imperial-internal-2B.csv b/src/Mod/CAM/Data/Threads/imperial-internal-2B.csv similarity index 100% rename from src/Mod/Path/Data/Threads/imperial-internal-2B.csv rename to src/Mod/CAM/Data/Threads/imperial-internal-2B.csv diff --git a/src/Mod/Path/Data/Threads/imperial-internal-3B.csv b/src/Mod/CAM/Data/Threads/imperial-internal-3B.csv similarity index 100% rename from src/Mod/Path/Data/Threads/imperial-internal-3B.csv rename to src/Mod/CAM/Data/Threads/imperial-internal-3B.csv diff --git a/src/Mod/Path/Data/Threads/metric-external-4G6G.csv b/src/Mod/CAM/Data/Threads/metric-external-4G6G.csv similarity index 100% rename from src/Mod/Path/Data/Threads/metric-external-4G6G.csv rename to src/Mod/CAM/Data/Threads/metric-external-4G6G.csv diff --git a/src/Mod/Path/Data/Threads/metric-external-6G.csv b/src/Mod/CAM/Data/Threads/metric-external-6G.csv similarity index 100% rename from src/Mod/Path/Data/Threads/metric-external-6G.csv rename to src/Mod/CAM/Data/Threads/metric-external-6G.csv diff --git a/src/Mod/Path/Data/Threads/metric-internal-6H.csv b/src/Mod/CAM/Data/Threads/metric-internal-6H.csv similarity index 100% rename from src/Mod/Path/Data/Threads/metric-internal-6H.csv rename to src/Mod/CAM/Data/Threads/metric-internal-6H.csv diff --git a/src/Mod/Path/Data/Threads/sources.txt b/src/Mod/CAM/Data/Threads/sources.txt similarity index 100% rename from src/Mod/Path/Data/Threads/sources.txt rename to src/Mod/CAM/Data/Threads/sources.txt diff --git a/src/Mod/Path/DemoParts/hole_puzzle.fcstd b/src/Mod/CAM/DemoParts/hole_puzzle.fcstd similarity index 100% rename from src/Mod/Path/DemoParts/hole_puzzle.fcstd rename to src/Mod/CAM/DemoParts/hole_puzzle.fcstd diff --git a/src/Mod/Path/DemoParts/motor_mount_inch.fcstd b/src/Mod/CAM/DemoParts/motor_mount_inch.fcstd similarity index 100% rename from src/Mod/Path/DemoParts/motor_mount_inch.fcstd rename to src/Mod/CAM/DemoParts/motor_mount_inch.fcstd diff --git a/src/Mod/Path/DemoParts/strange_part_with_holes.fcstd b/src/Mod/CAM/DemoParts/strange_part_with_holes.fcstd similarity index 100% rename from src/Mod/Path/DemoParts/strange_part_with_holes.fcstd rename to src/Mod/CAM/DemoParts/strange_part_with_holes.fcstd diff --git a/src/Mod/Path/GCode-description.md b/src/Mod/CAM/GCode-description.md similarity index 100% rename from src/Mod/Path/GCode-description.md rename to src/Mod/CAM/GCode-description.md diff --git a/src/Mod/Path/Gui/AppPathGui.cpp b/src/Mod/CAM/Gui/AppPathGui.cpp similarity index 100% rename from src/Mod/Path/Gui/AppPathGui.cpp rename to src/Mod/CAM/Gui/AppPathGui.cpp diff --git a/src/Mod/Path/Gui/AppPathGuiPy.cpp b/src/Mod/CAM/Gui/AppPathGuiPy.cpp similarity index 98% rename from src/Mod/Path/Gui/AppPathGuiPy.cpp rename to src/Mod/CAM/Gui/AppPathGuiPy.cpp index ea49fdda68..e484c4ab80 100644 --- a/src/Mod/Path/Gui/AppPathGuiPy.cpp +++ b/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()); diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/CAM/Gui/CMakeLists.txt similarity index 95% rename from src/Mod/Path/Gui/CMakeLists.txt rename to src/Mod/CAM/Gui/CMakeLists.txt index bd26bdbf6f..bfa71d5079 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/CAM/Gui/CMakeLists.txt @@ -86,10 +86,10 @@ SET(PathGuiIcon_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") diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/CAM/Gui/Command.cpp similarity index 99% rename from src/Mod/Path/Gui/Command.cpp rename to src/Mod/CAM/Gui/Command.cpp index 055cbe5402..d31526b160 100644 --- a/src/Mod/Path/Gui/Command.cpp +++ b/src/Mod/CAM/Gui/Command.cpp @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include // Path Area ##################################################################################################### diff --git a/src/Mod/Path/Gui/DlgJobChooser.ui b/src/Mod/CAM/Gui/DlgJobChooser.ui similarity index 100% rename from src/Mod/Path/Gui/DlgJobChooser.ui rename to src/Mod/CAM/Gui/DlgJobChooser.ui diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.cpp b/src/Mod/CAM/Gui/DlgProcessorChooser.cpp similarity index 100% rename from src/Mod/Path/Gui/DlgProcessorChooser.cpp rename to src/Mod/CAM/Gui/DlgProcessorChooser.cpp diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.h b/src/Mod/CAM/Gui/DlgProcessorChooser.h similarity index 100% rename from src/Mod/Path/Gui/DlgProcessorChooser.h rename to src/Mod/CAM/Gui/DlgProcessorChooser.h diff --git a/src/Mod/Path/Gui/DlgProcessorChooser.ui b/src/Mod/CAM/Gui/DlgProcessorChooser.ui similarity index 100% rename from src/Mod/Path/Gui/DlgProcessorChooser.ui rename to src/Mod/CAM/Gui/DlgProcessorChooser.ui diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.cpp b/src/Mod/CAM/Gui/DlgSettingsPathColor.cpp similarity index 100% rename from src/Mod/Path/Gui/DlgSettingsPathColor.cpp rename to src/Mod/CAM/Gui/DlgSettingsPathColor.cpp diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.h b/src/Mod/CAM/Gui/DlgSettingsPathColor.h similarity index 100% rename from src/Mod/Path/Gui/DlgSettingsPathColor.h rename to src/Mod/CAM/Gui/DlgSettingsPathColor.h diff --git a/src/Mod/Path/Gui/DlgSettingsPathColor.ui b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui similarity index 97% rename from src/Mod/Path/Gui/DlgSettingsPathColor.ui rename to src/Mod/CAM/Gui/DlgSettingsPathColor.ui index a43fc80a68..390d36b78e 100644 --- a/src/Mod/Path/Gui/DlgSettingsPathColor.ui +++ b/src/Mod/CAM/Gui/DlgSettingsPathColor.ui @@ -41,7 +41,7 @@ DefaultPathLineWidth - Mod/Path + Mod/CAM @@ -87,7 +87,7 @@ DefaultBBoxNormalColor - Mod/Path + Mod/CAM @@ -120,7 +120,7 @@ DefaultNormalPathColor - Mod/Path + Mod/CAM @@ -140,7 +140,7 @@ DefaultRapidPathColor - Mod/Path + Mod/CAM @@ -186,7 +186,7 @@ DefaultHighlightPathColor - Mod/Path + Mod/CAM @@ -232,7 +232,7 @@ DefaultPathMarkerColor - Mod/Path + Mod/CAM @@ -265,7 +265,7 @@ DefaultProbePathColor - Mod/Path + Mod/CAM @@ -285,7 +285,7 @@ DefaultBBoxSelectionColor - Mod/Path + Mod/CAM @@ -329,7 +329,7 @@ DefaultSelectionStyle - Mod/Path + Mod/CAM @@ -361,7 +361,7 @@ DefaultTaskPanelLayout - Mod/Path + Mod/CAM diff --git a/src/Mod/Path/Gui/PreCompiled.cpp b/src/Mod/CAM/Gui/PreCompiled.cpp similarity index 100% rename from src/Mod/Path/Gui/PreCompiled.cpp rename to src/Mod/CAM/Gui/PreCompiled.cpp diff --git a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/CAM/Gui/PreCompiled.h similarity index 100% rename from src/Mod/Path/Gui/PreCompiled.h rename to src/Mod/CAM/Gui/PreCompiled.h diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/CAM/Gui/Resources/Path.qrc similarity index 100% rename from src/Mod/Path/Gui/Resources/Path.qrc rename to src/Mod/CAM/Gui/Resources/Path.qrc diff --git a/src/Mod/Path/Gui/Resources/icons/CAMWorkbench.svg b/src/Mod/CAM/Gui/Resources/icons/CAMWorkbench.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAMWorkbench.svg rename to src/Mod/CAM/Gui/Resources/icons/CAMWorkbench.svg index 3870d468ee..714280eb8c 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAMWorkbench.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAMWorkbench.svg @@ -355,7 +355,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/PathWorkbench.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_3DPocket.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_3DPocket.svg index d8f0e25b82..f9d0e005ad 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_3DPocket.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_3DPocket.svg @@ -197,7 +197,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg index de06dbefe7..f9c19b9615 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg @@ -55,7 +55,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_3DSurface.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_3DSurface.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Adaptive.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Adaptive.svg index 42a999c693..8eb864ce67 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Adaptive.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Adaptive.svg @@ -583,7 +583,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Area.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Area.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Area.svg index b5c29b3da8..1ac79d83e0 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Area.svg @@ -595,7 +595,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Area_View.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Area_View.svg index aae2306401..385a501022 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area_View.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Area_View.svg @@ -595,7 +595,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Area_Workplane.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Area_Workplane.svg index 195f543aac..9b6f1dd2d2 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Area_Workplane.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Area_Workplane.svg @@ -617,7 +617,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Array.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Array.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Array.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Array.svg index 1d943ce39e..86d33636f3 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Array.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Array.svg @@ -119,7 +119,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Array.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Array.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BFastForward.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BFastForward.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_BFastForward.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BFastForward.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BPause.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BPause.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_BPause.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BPause.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BPlay.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BPlay.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_BPlay.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BPlay.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BStep.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BStep.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_BStep.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BStep.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BStop.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BStop.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_BStop.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BStop.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_BaseGeometry.svg similarity index 97% rename from src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_BaseGeometry.svg index 278d1f82bb..7b5444d2dc 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_BaseGeometry.svg @@ -29,7 +29,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_BaseGeometry.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_BaseGeometry.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg index 88b7aac68b..0d07bd55be 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg @@ -584,7 +584,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Camotics.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Camotics.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Comment.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Comment.svg index 5a819b1c0d..0ff607852d 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Comment.svg @@ -113,7 +113,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Comment.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Comment.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Compound.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Compound.svg index a1c9ea1212..7a3eb12c3c 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Compound.svg @@ -162,7 +162,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Compound.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Compound.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Copy.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Copy.svg index 5ae4f1bff8..49eb262541 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Copy.svg @@ -132,7 +132,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Copy.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Copy.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Custom.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Custom.svg index 75b068f21f..85979b0084 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Custom.svg @@ -102,7 +102,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Custom.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Custom.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Datums.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Datums.svg index e9a938f5bd..3b0ca7952d 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Datums.svg @@ -56,7 +56,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Datums.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Datums.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Deburr.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Deburr.svg index b0624a0a3f..0b2d104463 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Deburr.svg @@ -604,7 +604,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Deburr.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Deburr.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Depths.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Depths.svg index a39eb9379b..00ca3a10cc 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Depths.svg @@ -54,7 +54,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Depths.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Depths.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Dressup.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Dressup.svg index ccd72f8790..a92b64f1b6 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Dressup.svg @@ -138,7 +138,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Dressup.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Dressup.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Drilling.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Drilling.svg index 4a427b1f15..0756431bfc 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Drilling.svg @@ -119,7 +119,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Drilling.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Drilling.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Engrave.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Engrave.svg index 2cfc9c5184..ebefdf959f 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Engrave.svg @@ -120,7 +120,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Engrave.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Engrave.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ExportTemplate.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ExportTemplate.svg index 62b8f5d431..a024c78591 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ExportTemplate.svg @@ -1089,7 +1089,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ExportTemplate.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ExportTemplate.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Face.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Face.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Face.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Face.svg index 6f769cd719..e08a357f4d 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Face.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Face.svg @@ -174,7 +174,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_FacePocket.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_FacePocket.svg index 6c5586eb33..05103cd79c 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_FacePocket.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_FacePocket.svg @@ -125,7 +125,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_FaceProfile.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_FaceProfile.svg index 7ad8646363..43fd932553 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_FaceProfile.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_FaceProfile.svg @@ -125,7 +125,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Heights.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Heights.svg index 326847ed7b..6e64c78fc3 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Heights.svg @@ -39,7 +39,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Heights.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Heights.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Helix.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Helix.svg index 4998b4b7e8..c67cfcf23e 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Helix.svg @@ -1407,7 +1407,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Helix.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Helix.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_InactiveOp.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_InactiveOp.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_InactiveOp.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Inspect.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Inspect.svg index 9406f85bcd..0c6f17df15 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Inspect.svg @@ -198,7 +198,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Inspect.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Inspect.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Job.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Job.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Job.svg index 59dcff85a0..27f2d06a3e 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Job.svg @@ -1129,7 +1129,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Job.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Job.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_LengthOffset.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_LengthOffset.svg index 70586c4513..eb056b49e1 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_LengthOffset.svg @@ -105,7 +105,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_LengthOffset.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_LengthOffset.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Machine.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Machine.svg index 6256f6b20f..441c300927 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Machine.svg @@ -126,7 +126,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Machine.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_MachineLathe.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_MachineLathe.svg index 9be1adde9b..f7f6733232 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_MachineLathe.svg @@ -69,7 +69,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_MachineLathe.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_MachineLathe.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_MachineMill.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_MachineMill.svg index 547f21e00f..3c53f413f6 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_MachineMill.svg @@ -46,7 +46,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_MachineMill.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_MachineMill.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Machine_test1.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Machine_test1.svg index 9c6c22f1bf..4b37ded5ae 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Machine_test1.svg @@ -144,7 +144,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine_test1.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Machine_test1.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_OpActive.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_OpActive.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_OpActive.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_OpCopy.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_OpCopy.svg index 57aa6b5172..2a3479cef2 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_OpCopy.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_OpCopy.svg @@ -613,7 +613,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OperationA.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_OperationA.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_OperationA.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_OperationA.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_OperationB.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_OperationB.svg index 9f9623270e..afd8232b7f 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_OperationB.svg @@ -66,7 +66,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_OperationB.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_OperationB.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Pocket.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Pocket.svg index a91da6098e..7299e0b1bb 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Pocket.svg @@ -133,7 +133,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Pocket.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Pocket.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Post.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Post.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Post.svg index 048d4f2520..3db66463c2 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Post.svg @@ -217,7 +217,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Post.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Post.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Probe.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Probe.svg index e8160d79ea..b8304c163d 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Probe.svg @@ -585,7 +585,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Probe.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Probe.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Profile.svg index e389c453c1..5ef63b5fa2 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile.svg @@ -146,7 +146,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Profile.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Edges.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Edges.svg index a12181771e..047910fb89 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Edges.svg @@ -151,7 +151,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Edges_Edges.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Edges_Edges.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Face.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Face.svg index 128a440cfc..9c0ee85866 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Face.svg @@ -146,7 +146,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Profile_Face_ + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Profile_Face_ FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Sanity.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Sanity.svg index 4e3761405c..05b2b5d220 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Sanity.svg @@ -8,7 +8,7 @@ CAM_Sanity - 2016-05-15https://www.freecad.org/wiki/index.php?title=ArtworkFreeCADFreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Sanity.svgFreeCAD LGPL2+https://www.gnu.org/copyleft/lesser.html[agryson] Alexander Gryson + 2016-05-15https://www.freecad.org/wiki/index.php?title=ArtworkFreeCADFreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Sanity.svgFreeCAD LGPL2+https://www.gnu.org/copyleft/lesser.html[agryson] Alexander Gryson diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_SelectLoop.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_SelectLoop.svg index 80bcfcd18d..4fa1dd201a 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_SelectLoop.svg @@ -117,7 +117,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_SelectLoop.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_SelectLoop.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_SetupSheet.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_SetupSheet.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/CAM_SetupSheet.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_SetupSheet.svg diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Shape.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Shape.svg index 75fbaddd98..b9e8325f18 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Shape.svg @@ -126,7 +126,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Shape.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Shape.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_SimpleCopy.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_SimpleCopy.svg index 6055d145bb..dae43dfb0d 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_SimpleCopy.svg @@ -122,7 +122,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_SimpleCopy.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_SimpleCopy.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Simulator.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Simulator.svg index db8edda064..ca2c9ad092 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Simulator.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Simulator.svg @@ -1291,7 +1291,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Machine.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Machine.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Slot.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Slot.svg index dad7d0ecc6..484174384a 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Slot.svg @@ -632,7 +632,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Slot.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Slot.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Speed.svg similarity index 98% rename from src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Speed.svg index 005ee9ae87..192050d971 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Speed.svg @@ -51,7 +51,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Speed.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Speed.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Stop.svg similarity index 97% rename from src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Stop.svg index 16541ba809..c874f4a613 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Stop.svg @@ -25,7 +25,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Stop.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Stop.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Tags.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Tags.svg index 5701464485..2be202f328 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Tags.svg @@ -131,7 +131,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Tags.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Tags.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ThreadMilling.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ThreadMilling.svg index 675e0b8439..4e2496b6d6 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ThreadMilling.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ThreadMilling.svg @@ -1453,7 +1453,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/Path-Helix.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolBit.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ToolBit.svg index 51308dc30f..75a95ae19e 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolBit.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolBit.svg @@ -874,7 +874,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ToolTable.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolChange.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ToolChange.svg index 8dd11e3c20..0d72e029e7 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolChange.svg @@ -159,7 +159,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ToolChange.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolController.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ToolController.svg index d8bf136645..7f9914dbef 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolController.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolController.svg @@ -121,7 +121,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_LoadTool.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_LoadTool.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolDuplicate.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ToolDuplicate.svg index 15fd95e65c..a1f3ad3bc5 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolDuplicate.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolDuplicate.svg @@ -745,7 +745,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolChange.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ToolChange.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolTable.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_ToolTable.svg index ec73a7511c..8f3d56967b 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_ToolTable.svg @@ -182,7 +182,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_ToolTable.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_ToolTable.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Toolpath.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Toolpath.svg index 7ffddf4e3e..218877f5a9 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Toolpath.svg @@ -124,7 +124,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Toolpath.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Toolpath.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Vcarve.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Vcarve.svg index 74f9e44253..0f269e8db0 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Vcarve.svg @@ -604,7 +604,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Vcarve.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Vcarve.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg b/src/Mod/CAM/Gui/Resources/icons/CAM_Waterline.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg rename to src/Mod/CAM/Gui/Resources/icons/CAM_Waterline.svg index dde6ab9b9e..8a0c496289 100644 --- a/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg +++ b/src/Mod/CAM/Gui/Resources/icons/CAM_Waterline.svg @@ -184,7 +184,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Waterline.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Waterline.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-ccw.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-ccw.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-ccw.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-ccw.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-cw.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-cw.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-cw.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-cw.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-down.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-down.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-down.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-down.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-left-down.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-left-down.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-left-down.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-left-down.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-left-up.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-left-up.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-left-up.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-left-up.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-left.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-left.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-left.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-left.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-right-down.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-right-down.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-right-down.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-right-down.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-right-up.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-right-up.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-right-up.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-right-up.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-right.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-right.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-right.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-right.svg diff --git a/src/Mod/Path/Gui/Resources/icons/arrow-up.svg b/src/Mod/CAM/Gui/Resources/icons/arrow-up.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/arrow-up.svg rename to src/Mod/CAM/Gui/Resources/icons/arrow-up.svg diff --git a/src/Mod/Path/Gui/Resources/icons/camotics-logo.png b/src/Mod/CAM/Gui/Resources/icons/camotics-logo.png similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/camotics-logo.png rename to src/Mod/CAM/Gui/Resources/icons/camotics-logo.png diff --git a/src/Mod/Path/Gui/Resources/icons/edge-join-miter-not.svg b/src/Mod/CAM/Gui/Resources/icons/edge-join-miter-not.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/edge-join-miter-not.svg rename to src/Mod/CAM/Gui/Resources/icons/edge-join-miter-not.svg diff --git a/src/Mod/Path/Gui/Resources/icons/edge-join-miter.svg b/src/Mod/CAM/Gui/Resources/icons/edge-join-miter.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/edge-join-miter.svg rename to src/Mod/CAM/Gui/Resources/icons/edge-join-miter.svg diff --git a/src/Mod/Path/Gui/Resources/icons/edge-join-round-not.svg b/src/Mod/CAM/Gui/Resources/icons/edge-join-round-not.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/edge-join-round-not.svg rename to src/Mod/CAM/Gui/Resources/icons/edge-join-round-not.svg diff --git a/src/Mod/Path/Gui/Resources/icons/edge-join-round.svg b/src/Mod/CAM/Gui/Resources/icons/edge-join-round.svg similarity index 100% rename from src/Mod/Path/Gui/Resources/icons/edge-join-round.svg rename to src/Mod/CAM/Gui/Resources/icons/edge-join-round.svg diff --git a/src/Mod/Path/Gui/Resources/icons/preferences-cam.svg b/src/Mod/CAM/Gui/Resources/icons/preferences-cam.svg similarity index 99% rename from src/Mod/Path/Gui/Resources/icons/preferences-cam.svg rename to src/Mod/CAM/Gui/Resources/icons/preferences-cam.svg index 111e032f79..f904d562c7 100644 --- a/src/Mod/Path/Gui/Resources/icons/preferences-cam.svg +++ b/src/Mod/CAM/Gui/Resources/icons/preferences-cam.svg @@ -128,7 +128,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/preferences-path.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/preferences-path.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui b/src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/AxisMapEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/AxisMapEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgJobCreate.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgJobCreate.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgJobModelSelect.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgJobModelSelect.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgJobModelSelect.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui b/src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgJobTemplateExport.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgJobTemplateExport.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgSelectPostProcessor.ui b/src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgSelectPostProcessor.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgSelectPostProcessor.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgTCChooser.ui b/src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgTCChooser.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgTCChooser.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgToolControllerEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgToolControllerEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolCopy.ui b/src/Mod/CAM/Gui/Resources/panels/DlgToolCopy.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgToolCopy.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgToolCopy.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DlgToolEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DlgToolEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/DlgToolEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/DogboneEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DragKnifeEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/DragKnifeEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui b/src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DressUpLeadInOutEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/DressUpLeadInOutEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui b/src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/DressupPathBoundary.ui rename to src/Mod/CAM/Gui/Resources/panels/DressupPathBoundary.ui diff --git a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/HoldingTagsEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageBaseGeometryEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageBaseHoleGeometryEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageBaseLocationEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageBaseLocationEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageDepthsEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageDiametersEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageDiametersEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageHeightsEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpAdaptiveEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpAdaptiveEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpCustomEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpCustomEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpDeburrEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpDeburrEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpDrillingEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpEngraveEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpEngraveEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpHelixEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpHelixEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpPocketExtEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpPocketExtEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpPocketFullEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpPocketFullEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpProbeEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpProfileFullEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpProfileFullEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpSlotEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpSlotEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpSurfaceEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpThreadMillingEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpThreadMillingEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpVcarveEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpVcarveEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PathEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PathEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PathEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PointEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PointEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PointEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/PointEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PropertyBag.ui b/src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PropertyBag.ui rename to src/Mod/CAM/Gui/Resources/panels/PropertyBag.ui diff --git a/src/Mod/Path/Gui/Resources/panels/PropertyCreate.ui b/src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/PropertyCreate.ui rename to src/Mod/CAM/Gui/Resources/panels/PropertyCreate.ui diff --git a/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui b/src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui rename to src/Mod/CAM/Gui/Resources/panels/SetupGlobal.ui diff --git a/src/Mod/Path/Gui/Resources/panels/SetupOp.ui b/src/Mod/CAM/Gui/Resources/panels/SetupOp.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/SetupOp.ui rename to src/Mod/CAM/Gui/Resources/panels/SetupOp.ui diff --git a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/SurfaceEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/TaskPathCamoticsSim.ui b/src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/TaskPathCamoticsSim.ui rename to src/Mod/CAM/Gui/Resources/panels/TaskPathCamoticsSim.ui diff --git a/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui b/src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui rename to src/Mod/CAM/Gui/Resources/panels/TaskPathSimulator.ui diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/ToolBitEditor.ui rename to src/Mod/CAM/Gui/Resources/panels/ToolBitEditor.ui diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/ToolBitLibraryEdit.ui diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui b/src/Mod/CAM/Gui/Resources/panels/ToolBitSelector.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui rename to src/Mod/CAM/Gui/Resources/panels/ToolBitSelector.ui diff --git a/src/Mod/Path/Gui/Resources/panels/ToolEditor.ui b/src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/ToolEditor.ui rename to src/Mod/CAM/Gui/Resources/panels/ToolEditor.ui diff --git a/src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui b/src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui rename to src/Mod/CAM/Gui/Resources/panels/ZCorrectEdit.ui diff --git a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui b/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui similarity index 96% rename from src/Mod/Path/Gui/Resources/preferences/Advanced.ui rename to src/Mod/CAM/Gui/Resources/preferences/Advanced.ui index ffd8d2ea74..b8cb82864e 100644 --- a/src/Mod/Path/Gui/Resources/preferences/Advanced.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/Advanced.ui @@ -35,7 +35,7 @@ WarningSuppressAllSpeeds - Mod/Path + Mod/CAM @@ -54,7 +54,7 @@ WarningSuppressRapidSpeeds - Mod/Path + Mod/CAM @@ -73,7 +73,7 @@ WarningSuppressVelocity - Mod/Path + Mod/CAM @@ -92,7 +92,7 @@ WarningSuppressSelectionMode - Mod/Path + Mod/CAM @@ -130,7 +130,7 @@ EnableAdvancedOCLFeatures - Mod/Path + Mod/CAM @@ -149,7 +149,7 @@ WarningSuppressOpenCamLib - Mod/Path + Mod/CAM diff --git a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui similarity index 100% rename from src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui rename to src/Mod/CAM/Gui/Resources/preferences/PathDressupHoldingTags.ui diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui similarity index 99% rename from src/Mod/Path/Gui/Resources/preferences/PathJob.ui rename to src/Mod/CAM/Gui/Resources/preferences/PathJob.ui index 86f5d8c5e0..9222e495f4 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/CAM/Gui/Resources/preferences/PathJob.ui @@ -315,7 +315,7 @@ See the file save policy below on how to deal with name conflicts. DefaultPostProcessor - Mod/Path + Mod/CAM @@ -335,7 +335,7 @@ See the file save policy below on how to deal with name conflicts. DefaultPostProcessorArgs - Mod/Path + Mod/CAM diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/CAM/Gui/TaskDlgPathCompound.cpp similarity index 100% rename from src/Mod/Path/Gui/TaskDlgPathCompound.cpp rename to src/Mod/CAM/Gui/TaskDlgPathCompound.cpp diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.h b/src/Mod/CAM/Gui/TaskDlgPathCompound.h similarity index 98% rename from src/Mod/Path/Gui/TaskDlgPathCompound.h rename to src/Mod/CAM/Gui/TaskDlgPathCompound.h index 4ced6cca33..7ddb9a0679 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.h +++ b/src/Mod/CAM/Gui/TaskDlgPathCompound.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include "ViewProviderPathCompound.h" diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.ui b/src/Mod/CAM/Gui/TaskDlgPathCompound.ui similarity index 100% rename from src/Mod/Path/Gui/TaskDlgPathCompound.ui rename to src/Mod/CAM/Gui/TaskDlgPathCompound.ui diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/CAM/Gui/ViewProviderArea.cpp similarity index 99% rename from src/Mod/Path/Gui/ViewProviderArea.cpp rename to src/Mod/CAM/Gui/ViewProviderArea.cpp index 60063e51f1..2254445318 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.cpp +++ b/src/Mod/CAM/Gui/ViewProviderArea.cpp @@ -23,7 +23,7 @@ #include "PreCompiled.h" #include -#include +#include #include "ViewProviderArea.h" diff --git a/src/Mod/Path/Gui/ViewProviderArea.h b/src/Mod/CAM/Gui/ViewProviderArea.h similarity index 99% rename from src/Mod/Path/Gui/ViewProviderArea.h rename to src/Mod/CAM/Gui/ViewProviderArea.h index 22d458e554..6877beae96 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.h +++ b/src/Mod/CAM/Gui/ViewProviderArea.h @@ -25,7 +25,7 @@ #include #include -#include +#include namespace PathGui { diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/CAM/Gui/ViewProviderPath.cpp similarity index 98% rename from src/Mod/Path/Gui/ViewProviderPath.cpp rename to src/Mod/CAM/Gui/ViewProviderPath.cpp index d874c6d26f..0be6dd03af 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/CAM/Gui/ViewProviderPath.cpp @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include "ViewProviderPath.h" @@ -135,7 +135,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderPath, Gui::ViewProviderGeometryObject) ViewProviderPath::ViewProviderPath() :pt0Index(-1),blockPropertyChange(false),edgeStart(-1),coordStart(-1),coordEnd(-1) { - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Path"); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM"); unsigned long lcol = hGrp->GetUnsigned("DefaultNormalPathColor",11141375UL); // dark green (0,170,0) float lr,lg,lb; lr = ((lcol >> 24) & 0xff) / 255.0; lg = ((lcol >> 16) & 0xff) / 255.0; lb = ((lcol >> 8) & 0xff) / 255.0; @@ -339,7 +339,7 @@ void ViewProviderPath::onChanged(const App::Property* prop) } else if (prop == &NormalColor) { if (!colorindex.empty() && coordStart>=0 && coordStart<(int)colorindex.size()) { const App::Color& c = NormalColor.getValue(); - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Path"); + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/CAM"); unsigned long rcol = hGrp->GetUnsigned("DefaultRapidPathColor",2852126975UL); // dark red (170,0,0) float rr,rg,rb; rr = ((rcol >> 24) & 0xff) / 255.0; rg = ((rcol >> 16) & 0xff) / 255.0; rb = ((rcol >> 8) & 0xff) / 255.0; @@ -401,7 +401,7 @@ void ViewProviderPath::showBoundingBox(bool show) { } unsigned long ViewProviderPath::getBoundColor() const { - 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(SelectionStyle.getValue() == 0 || !Selectable.getValue()) return hGrp->GetUnsigned("DefaultBBoxNormalColor",4294967295UL); // white (255,255,255) else diff --git a/src/Mod/Path/Gui/ViewProviderPath.h b/src/Mod/CAM/Gui/ViewProviderPath.h similarity index 99% rename from src/Mod/Path/Gui/ViewProviderPath.h rename to src/Mod/CAM/Gui/ViewProviderPath.h index 8d9f3864ec..e8bed73f27 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.h +++ b/src/Mod/CAM/Gui/ViewProviderPath.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include class SoCoordinate3; diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/CAM/Gui/ViewProviderPathCompound.cpp similarity index 100% rename from src/Mod/Path/Gui/ViewProviderPathCompound.cpp rename to src/Mod/CAM/Gui/ViewProviderPathCompound.cpp diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.h b/src/Mod/CAM/Gui/ViewProviderPathCompound.h similarity index 100% rename from src/Mod/Path/Gui/ViewProviderPathCompound.h rename to src/Mod/CAM/Gui/ViewProviderPathCompound.h diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/CAM/Gui/ViewProviderPathShape.cpp similarity index 99% rename from src/Mod/Path/Gui/ViewProviderPathShape.cpp rename to src/Mod/CAM/Gui/ViewProviderPathShape.cpp index d3f5fe6d20..d4bd7f7bca 100644 --- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp +++ b/src/Mod/CAM/Gui/ViewProviderPathShape.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "ViewProviderPathShape.h" diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.h b/src/Mod/CAM/Gui/ViewProviderPathShape.h similarity index 100% rename from src/Mod/Path/Gui/ViewProviderPathShape.h rename to src/Mod/CAM/Gui/ViewProviderPathShape.h diff --git a/src/Mod/Path/Images/Ops/chamfer.svg b/src/Mod/CAM/Images/Ops/chamfer.svg similarity index 100% rename from src/Mod/Path/Images/Ops/chamfer.svg rename to src/Mod/CAM/Images/Ops/chamfer.svg diff --git a/src/Mod/Path/Images/Tools/drill.svg b/src/Mod/CAM/Images/Tools/drill.svg similarity index 100% rename from src/Mod/Path/Images/Tools/drill.svg rename to src/Mod/CAM/Images/Tools/drill.svg diff --git a/src/Mod/Path/Images/Tools/endmill.svg b/src/Mod/CAM/Images/Tools/endmill.svg similarity index 100% rename from src/Mod/Path/Images/Tools/endmill.svg rename to src/Mod/CAM/Images/Tools/endmill.svg diff --git a/src/Mod/Path/Images/Tools/reamer.svg b/src/Mod/CAM/Images/Tools/reamer.svg similarity index 100% rename from src/Mod/Path/Images/Tools/reamer.svg rename to src/Mod/CAM/Images/Tools/reamer.svg diff --git a/src/Mod/Path/Images/Tools/v-bit.svg b/src/Mod/CAM/Images/Tools/v-bit.svg similarity index 100% rename from src/Mod/Path/Images/Tools/v-bit.svg rename to src/Mod/CAM/Images/Tools/v-bit.svg diff --git a/src/Mod/Path/Init.py b/src/Mod/CAM/Init.py similarity index 100% rename from src/Mod/Path/Init.py rename to src/Mod/CAM/Init.py diff --git a/src/Mod/Path/InitGui.py b/src/Mod/CAM/InitGui.py similarity index 99% rename from src/Mod/Path/InitGui.py rename to src/Mod/CAM/InitGui.py index 1e71c99eb2..d8b7979f45 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/CAM/InitGui.py @@ -50,7 +50,7 @@ class CAMWorkbench(Workbench): def __init__(self): self.__class__.Icon = ( - FreeCAD.getResourceDir() + "Mod/Path/Resources/icons/CAMWorkbench.svg" + FreeCAD.getResourceDir() + "Mod/CAM/Resources/icons/CAMWorkbench.svg" ) self.__class__.MenuText = "CAM" self.__class__.ToolTip = "CAM workbench" diff --git a/src/Mod/Path/Path/Base/Drillable.py b/src/Mod/CAM/Path/Base/Drillable.py similarity index 100% rename from src/Mod/Path/Path/Base/Drillable.py rename to src/Mod/CAM/Path/Base/Drillable.py diff --git a/src/Mod/Path/Path/Base/FeedRate.py b/src/Mod/CAM/Path/Base/FeedRate.py similarity index 100% rename from src/Mod/Path/Path/Base/FeedRate.py rename to src/Mod/CAM/Path/Base/FeedRate.py diff --git a/src/Mod/Path/Path/Base/Generator/__init__.py b/src/Mod/CAM/Path/Base/Generator/__init__.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/__init__.py rename to src/Mod/CAM/Path/Base/Generator/__init__.py diff --git a/src/Mod/Path/Path/Base/Generator/dogboneII.py b/src/Mod/CAM/Path/Base/Generator/dogboneII.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/dogboneII.py rename to src/Mod/CAM/Path/Base/Generator/dogboneII.py diff --git a/src/Mod/Path/Path/Base/Generator/drill.py b/src/Mod/CAM/Path/Base/Generator/drill.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/drill.py rename to src/Mod/CAM/Path/Base/Generator/drill.py diff --git a/src/Mod/Path/Path/Base/Generator/helix.py b/src/Mod/CAM/Path/Base/Generator/helix.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/helix.py rename to src/Mod/CAM/Path/Base/Generator/helix.py diff --git a/src/Mod/Path/Path/Base/Generator/rotation.py b/src/Mod/CAM/Path/Base/Generator/rotation.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/rotation.py rename to src/Mod/CAM/Path/Base/Generator/rotation.py diff --git a/src/Mod/Path/Path/Base/Generator/threadmilling.py b/src/Mod/CAM/Path/Base/Generator/threadmilling.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/threadmilling.py rename to src/Mod/CAM/Path/Base/Generator/threadmilling.py diff --git a/src/Mod/Path/Path/Base/Generator/toolchange.py b/src/Mod/CAM/Path/Base/Generator/toolchange.py similarity index 100% rename from src/Mod/Path/Path/Base/Generator/toolchange.py rename to src/Mod/CAM/Path/Base/Generator/toolchange.py diff --git a/src/Mod/Path/Path/Base/Gui/GetPoint.py b/src/Mod/CAM/Path/Base/Gui/GetPoint.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/GetPoint.py rename to src/Mod/CAM/Path/Base/Gui/GetPoint.py diff --git a/src/Mod/Path/Path/Base/Gui/IconViewProvider.py b/src/Mod/CAM/Path/Base/Gui/IconViewProvider.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/IconViewProvider.py rename to src/Mod/CAM/Path/Base/Gui/IconViewProvider.py diff --git a/src/Mod/Path/Path/Base/Gui/PreferencesAdvanced.py b/src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/PreferencesAdvanced.py rename to src/Mod/CAM/Path/Base/Gui/PreferencesAdvanced.py diff --git a/src/Mod/Path/Path/Base/Gui/PropertyBag.py b/src/Mod/CAM/Path/Base/Gui/PropertyBag.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/PropertyBag.py rename to src/Mod/CAM/Path/Base/Gui/PropertyBag.py diff --git a/src/Mod/Path/Path/Base/Gui/PropertyEditor.py b/src/Mod/CAM/Path/Base/Gui/PropertyEditor.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/PropertyEditor.py rename to src/Mod/CAM/Path/Base/Gui/PropertyEditor.py diff --git a/src/Mod/Path/Path/Base/Gui/SetupSheet.py b/src/Mod/CAM/Path/Base/Gui/SetupSheet.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/SetupSheet.py rename to src/Mod/CAM/Path/Base/Gui/SetupSheet.py diff --git a/src/Mod/Path/Path/Base/Gui/SetupSheetOpPrototype.py b/src/Mod/CAM/Path/Base/Gui/SetupSheetOpPrototype.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/SetupSheetOpPrototype.py rename to src/Mod/CAM/Path/Base/Gui/SetupSheetOpPrototype.py diff --git a/src/Mod/Path/Path/Base/Gui/Util.py b/src/Mod/CAM/Path/Base/Gui/Util.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/Util.py rename to src/Mod/CAM/Path/Base/Gui/Util.py diff --git a/src/Mod/Path/Path/Base/Gui/__init__.py b/src/Mod/CAM/Path/Base/Gui/__init__.py similarity index 100% rename from src/Mod/Path/Path/Base/Gui/__init__.py rename to src/Mod/CAM/Path/Base/Gui/__init__.py diff --git a/src/Mod/Path/Path/Base/Language.py b/src/Mod/CAM/Path/Base/Language.py similarity index 100% rename from src/Mod/Path/Path/Base/Language.py rename to src/Mod/CAM/Path/Base/Language.py diff --git a/src/Mod/Path/Path/Base/MachineState.py b/src/Mod/CAM/Path/Base/MachineState.py similarity index 100% rename from src/Mod/Path/Path/Base/MachineState.py rename to src/Mod/CAM/Path/Base/MachineState.py diff --git a/src/Mod/Path/Path/Base/Property.py b/src/Mod/CAM/Path/Base/Property.py similarity index 100% rename from src/Mod/Path/Path/Base/Property.py rename to src/Mod/CAM/Path/Base/Property.py diff --git a/src/Mod/Path/Path/Base/PropertyBag.py b/src/Mod/CAM/Path/Base/PropertyBag.py similarity index 100% rename from src/Mod/Path/Path/Base/PropertyBag.py rename to src/Mod/CAM/Path/Base/PropertyBag.py diff --git a/src/Mod/Path/Path/Base/SetupSheet.py b/src/Mod/CAM/Path/Base/SetupSheet.py similarity index 100% rename from src/Mod/Path/Path/Base/SetupSheet.py rename to src/Mod/CAM/Path/Base/SetupSheet.py diff --git a/src/Mod/Path/Path/Base/SetupSheetOpPrototype.py b/src/Mod/CAM/Path/Base/SetupSheetOpPrototype.py similarity index 100% rename from src/Mod/Path/Path/Base/SetupSheetOpPrototype.py rename to src/Mod/CAM/Path/Base/SetupSheetOpPrototype.py diff --git a/src/Mod/Path/Path/Base/Util.py b/src/Mod/CAM/Path/Base/Util.py similarity index 100% rename from src/Mod/Path/Path/Base/Util.py rename to src/Mod/CAM/Path/Base/Util.py diff --git a/src/Mod/Path/Path/Base/__init__.py b/src/Mod/CAM/Path/Base/__init__.py similarity index 100% rename from src/Mod/Path/Path/Base/__init__.py rename to src/Mod/CAM/Path/Base/__init__.py diff --git a/src/Mod/Path/Path/Dressup/Boundary.py b/src/Mod/CAM/Path/Dressup/Boundary.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Boundary.py rename to src/Mod/CAM/Path/Dressup/Boundary.py diff --git a/src/Mod/Path/Path/Dressup/DogboneII.py b/src/Mod/CAM/Path/Dressup/DogboneII.py similarity index 100% rename from src/Mod/Path/Path/Dressup/DogboneII.py rename to src/Mod/CAM/Path/Dressup/DogboneII.py diff --git a/src/Mod/Path/Path/Dressup/Gui/AxisMap.py b/src/Mod/CAM/Path/Dressup/Gui/AxisMap.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/AxisMap.py rename to src/Mod/CAM/Path/Dressup/Gui/AxisMap.py diff --git a/src/Mod/Path/Path/Dressup/Gui/Boundary.py b/src/Mod/CAM/Path/Dressup/Gui/Boundary.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/Boundary.py rename to src/Mod/CAM/Path/Dressup/Gui/Boundary.py diff --git a/src/Mod/Path/Path/Dressup/Gui/Dogbone.py b/src/Mod/CAM/Path/Dressup/Gui/Dogbone.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/Dogbone.py rename to src/Mod/CAM/Path/Dressup/Gui/Dogbone.py diff --git a/src/Mod/Path/Path/Dressup/Gui/DogboneII.py b/src/Mod/CAM/Path/Dressup/Gui/DogboneII.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/DogboneII.py rename to src/Mod/CAM/Path/Dressup/Gui/DogboneII.py diff --git a/src/Mod/Path/Path/Dressup/Gui/Dragknife.py b/src/Mod/CAM/Path/Dressup/Gui/Dragknife.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/Dragknife.py rename to src/Mod/CAM/Path/Dressup/Gui/Dragknife.py diff --git a/src/Mod/Path/Path/Dressup/Gui/LeadInOut.py b/src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/LeadInOut.py rename to src/Mod/CAM/Path/Dressup/Gui/LeadInOut.py diff --git a/src/Mod/Path/Path/Dressup/Gui/Preferences.py b/src/Mod/CAM/Path/Dressup/Gui/Preferences.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/Preferences.py rename to src/Mod/CAM/Path/Dressup/Gui/Preferences.py diff --git a/src/Mod/Path/Path/Dressup/Gui/RampEntry.py b/src/Mod/CAM/Path/Dressup/Gui/RampEntry.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/RampEntry.py rename to src/Mod/CAM/Path/Dressup/Gui/RampEntry.py diff --git a/src/Mod/Path/Path/Dressup/Gui/TagPreferences.py b/src/Mod/CAM/Path/Dressup/Gui/TagPreferences.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/TagPreferences.py rename to src/Mod/CAM/Path/Dressup/Gui/TagPreferences.py diff --git a/src/Mod/Path/Path/Dressup/Gui/Tags.py b/src/Mod/CAM/Path/Dressup/Gui/Tags.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/Tags.py rename to src/Mod/CAM/Path/Dressup/Gui/Tags.py diff --git a/src/Mod/Path/Path/Dressup/Gui/ZCorrect.py b/src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/ZCorrect.py rename to src/Mod/CAM/Path/Dressup/Gui/ZCorrect.py diff --git a/src/Mod/Path/Path/Dressup/Gui/__init__.py b/src/Mod/CAM/Path/Dressup/Gui/__init__.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Gui/__init__.py rename to src/Mod/CAM/Path/Dressup/Gui/__init__.py diff --git a/src/Mod/Path/Path/Dressup/Tags.py b/src/Mod/CAM/Path/Dressup/Tags.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Tags.py rename to src/Mod/CAM/Path/Dressup/Tags.py diff --git a/src/Mod/Path/Path/Dressup/Utils.py b/src/Mod/CAM/Path/Dressup/Utils.py similarity index 100% rename from src/Mod/Path/Path/Dressup/Utils.py rename to src/Mod/CAM/Path/Dressup/Utils.py diff --git a/src/Mod/Path/Path/Dressup/__init__.py b/src/Mod/CAM/Path/Dressup/__init__.py similarity index 100% rename from src/Mod/Path/Path/Dressup/__init__.py rename to src/Mod/CAM/Path/Dressup/__init__.py diff --git a/src/Mod/Path/Path/Geom.py b/src/Mod/CAM/Path/Geom.py similarity index 100% rename from src/Mod/Path/Path/Geom.py rename to src/Mod/CAM/Path/Geom.py diff --git a/src/Mod/Path/Path/GuiInit.py b/src/Mod/CAM/Path/GuiInit.py similarity index 100% rename from src/Mod/Path/Path/GuiInit.py rename to src/Mod/CAM/Path/GuiInit.py diff --git a/src/Mod/Path/Path/Log.py b/src/Mod/CAM/Path/Log.py similarity index 100% rename from src/Mod/Path/Path/Log.py rename to src/Mod/CAM/Path/Log.py diff --git a/src/Mod/Path/Path/Main/Gui/Camotics.py b/src/Mod/CAM/Path/Main/Gui/Camotics.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Camotics.py rename to src/Mod/CAM/Path/Main/Gui/Camotics.py diff --git a/src/Mod/Path/Path/Main/Gui/Fixture.py b/src/Mod/CAM/Path/Main/Gui/Fixture.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Fixture.py rename to src/Mod/CAM/Path/Main/Gui/Fixture.py diff --git a/src/Mod/Path/Path/Main/Gui/Inspect.py b/src/Mod/CAM/Path/Main/Gui/Inspect.py similarity index 99% rename from src/Mod/Path/Path/Main/Gui/Inspect.py rename to src/Mod/CAM/Path/Main/Gui/Inspect.py index 50a0078724..6adfec5d08 100644 --- a/src/Mod/Path/Path/Main/Gui/Inspect.py +++ b/src/Mod/CAM/Path/Main/Gui/Inspect.py @@ -106,7 +106,7 @@ class GCodeEditorDialog(QtGui.QDialog): QtGui.QDialog.__init__(self, parent) layout = QtGui.QVBoxLayout(self) - p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") c = p.GetUnsigned("DefaultHighlightPathColor", 4286382335) Q = QtGui.QColor( int((c >> 24) & 0xFF), int((c >> 16) & 0xFF), int((c >> 8) & 0xFF) @@ -158,7 +158,7 @@ class GCodeEditorDialog(QtGui.QDialog): self.editor.selectionChanged.connect(self.highlightpath) self.finished.connect(self.cleanup) - prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") Xpos = int(prefs.GetString("inspecteditorX", "0")) Ypos = int(prefs.GetString("inspecteditorY", "0")) height = int(prefs.GetString("inspecteditorH", "500")) @@ -167,7 +167,7 @@ class GCodeEditorDialog(QtGui.QDialog): self.resize(width, height) def cleanup(self): - prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") prefs.SetString("inspecteditorX", str(self.x())) prefs.SetString("inspecteditorY", str(self.y())) prefs.SetString("inspecteditorW", str(self.width())) @@ -225,7 +225,7 @@ class GCodeEditorDialog(QtGui.QDialog): def show(obj): "show(obj): shows the G-code data of the given Path object in a dialog" - prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") # default Max Highlighter Size = 512 Ko defaultMHS = 512 * 1024 mhs = prefs.GetUnsigned("inspecteditorMaxHighlighterSize", defaultMHS) diff --git a/src/Mod/Path/Path/Main/Gui/Job.py b/src/Mod/CAM/Path/Main/Gui/Job.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Job.py rename to src/Mod/CAM/Path/Main/Gui/Job.py diff --git a/src/Mod/Path/Path/Main/Gui/JobCmd.py b/src/Mod/CAM/Path/Main/Gui/JobCmd.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/JobCmd.py rename to src/Mod/CAM/Path/Main/Gui/JobCmd.py diff --git a/src/Mod/Path/Path/Main/Gui/JobDlg.py b/src/Mod/CAM/Path/Main/Gui/JobDlg.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/JobDlg.py rename to src/Mod/CAM/Path/Main/Gui/JobDlg.py diff --git a/src/Mod/Path/Path/Main/Gui/PreferencesJob.py b/src/Mod/CAM/Path/Main/Gui/PreferencesJob.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/PreferencesJob.py rename to src/Mod/CAM/Path/Main/Gui/PreferencesJob.py diff --git a/src/Mod/Path/Path/Main/Gui/Sanity.py b/src/Mod/CAM/Path/Main/Gui/Sanity.py similarity index 99% rename from src/Mod/Path/Path/Main/Gui/Sanity.py rename to src/Mod/CAM/Path/Main/Gui/Sanity.py index d07c9a024a..4a27531dd4 100644 --- a/src/Mod/Path/Path/Main/Gui/Sanity.py +++ b/src/Mod/CAM/Path/Main/Gui/Sanity.py @@ -1053,12 +1053,12 @@ class CommandPathSanity: """ d = data["squawkData"] - TIPIcon = FreeCAD.getHomePath() + "Mod/Path/Path/Main/Gui/Sanity_Bulb.svg" - NOTEIcon = FreeCAD.getHomePath() + "Mod/Path/Path/Main/Gui/Sanity_Note.svg" + TIPIcon = FreeCAD.getHomePath() + "Mod/CAM/Path/Main/Gui/Sanity_Bulb.svg" + NOTEIcon = FreeCAD.getHomePath() + "Mod/CAM/Path/Main/Gui/Sanity_Note.svg" WARNINGIcon = ( - FreeCAD.getHomePath() + "Mod/Path/Path/Main/Gui/Sanity_Warning.svg" + FreeCAD.getHomePath() + "Mod/CAM/Path/Main/Gui/Sanity_Warning.svg" ) - CAUTIONIcon = FreeCAD.getHomePath() + "Mod/Path/Path/Main/Gui/Sanity_Stop.svg" + CAUTIONIcon = FreeCAD.getHomePath() + "Mod/CAM/Path/Main/Gui/Sanity_Stop.svg" reportHtmlTemplate += """

diff --git a/src/Mod/Path/Path/Main/Gui/Sanity_Bulb.svg b/src/Mod/CAM/Path/Main/Gui/Sanity_Bulb.svg similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Sanity_Bulb.svg rename to src/Mod/CAM/Path/Main/Gui/Sanity_Bulb.svg diff --git a/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg b/src/Mod/CAM/Path/Main/Gui/Sanity_Caution.svg similarity index 96% rename from src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg rename to src/Mod/CAM/Path/Main/Gui/Sanity_Caution.svg index ef4b4a545e..2f3ff12250 100644 --- a/src/Mod/Path/Path/Main/Gui/Sanity_Caution.svg +++ b/src/Mod/CAM/Path/Main/Gui/Sanity_Caution.svg @@ -50,7 +50,7 @@ FreeCAD - FreeCAD/src/Mod/Path/Gui/Resources/icons/CAM_Sanity_Caution.svg + FreeCAD/src/Mod/CAM/Gui/Resources/icons/CAM_Sanity_Caution.svg FreeCAD LGPL2+ diff --git a/src/Mod/Path/Path/Main/Gui/Sanity_Note.svg b/src/Mod/CAM/Path/Main/Gui/Sanity_Note.svg similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Sanity_Note.svg rename to src/Mod/CAM/Path/Main/Gui/Sanity_Note.svg diff --git a/src/Mod/Path/Path/Main/Gui/Sanity_Warning.svg b/src/Mod/CAM/Path/Main/Gui/Sanity_Warning.svg similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Sanity_Warning.svg rename to src/Mod/CAM/Path/Main/Gui/Sanity_Warning.svg diff --git a/src/Mod/Path/Path/Main/Gui/Simulator.py b/src/Mod/CAM/Path/Main/Gui/Simulator.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/Simulator.py rename to src/Mod/CAM/Path/Main/Gui/Simulator.py diff --git a/src/Mod/Path/Path/Main/Gui/__init__.py b/src/Mod/CAM/Path/Main/Gui/__init__.py similarity index 100% rename from src/Mod/Path/Path/Main/Gui/__init__.py rename to src/Mod/CAM/Path/Main/Gui/__init__.py diff --git a/src/Mod/Path/Path/Main/Job.py b/src/Mod/CAM/Path/Main/Job.py similarity index 100% rename from src/Mod/Path/Path/Main/Job.py rename to src/Mod/CAM/Path/Main/Job.py diff --git a/src/Mod/Path/Path/Main/Stock.py b/src/Mod/CAM/Path/Main/Stock.py similarity index 100% rename from src/Mod/Path/Path/Main/Stock.py rename to src/Mod/CAM/Path/Main/Stock.py diff --git a/src/Mod/Path/Path/Main/__init__.py b/src/Mod/CAM/Path/Main/__init__.py similarity index 100% rename from src/Mod/Path/Path/Main/__init__.py rename to src/Mod/CAM/Path/Main/__init__.py diff --git a/src/Mod/Path/Path/Op/Adaptive.py b/src/Mod/CAM/Path/Op/Adaptive.py similarity index 100% rename from src/Mod/Path/Path/Op/Adaptive.py rename to src/Mod/CAM/Path/Op/Adaptive.py diff --git a/src/Mod/Path/Path/Op/Area.py b/src/Mod/CAM/Path/Op/Area.py similarity index 100% rename from src/Mod/Path/Path/Op/Area.py rename to src/Mod/CAM/Path/Op/Area.py diff --git a/src/Mod/Path/Path/Op/Base.py b/src/Mod/CAM/Path/Op/Base.py similarity index 100% rename from src/Mod/Path/Path/Op/Base.py rename to src/Mod/CAM/Path/Op/Base.py diff --git a/src/Mod/Path/Path/Op/CircularHoleBase.py b/src/Mod/CAM/Path/Op/CircularHoleBase.py similarity index 100% rename from src/Mod/Path/Path/Op/CircularHoleBase.py rename to src/Mod/CAM/Path/Op/CircularHoleBase.py diff --git a/src/Mod/Path/Path/Op/Custom.py b/src/Mod/CAM/Path/Op/Custom.py similarity index 100% rename from src/Mod/Path/Path/Op/Custom.py rename to src/Mod/CAM/Path/Op/Custom.py diff --git a/src/Mod/Path/Path/Op/Deburr.py b/src/Mod/CAM/Path/Op/Deburr.py similarity index 100% rename from src/Mod/Path/Path/Op/Deburr.py rename to src/Mod/CAM/Path/Op/Deburr.py diff --git a/src/Mod/Path/Path/Op/Drilling.py b/src/Mod/CAM/Path/Op/Drilling.py similarity index 100% rename from src/Mod/Path/Path/Op/Drilling.py rename to src/Mod/CAM/Path/Op/Drilling.py diff --git a/src/Mod/Path/Path/Op/Engrave.py b/src/Mod/CAM/Path/Op/Engrave.py similarity index 100% rename from src/Mod/Path/Path/Op/Engrave.py rename to src/Mod/CAM/Path/Op/Engrave.py diff --git a/src/Mod/Path/Path/Op/EngraveBase.py b/src/Mod/CAM/Path/Op/EngraveBase.py similarity index 100% rename from src/Mod/Path/Path/Op/EngraveBase.py rename to src/Mod/CAM/Path/Op/EngraveBase.py diff --git a/src/Mod/Path/Path/Op/FeatureExtension.py b/src/Mod/CAM/Path/Op/FeatureExtension.py similarity index 100% rename from src/Mod/Path/Path/Op/FeatureExtension.py rename to src/Mod/CAM/Path/Op/FeatureExtension.py diff --git a/src/Mod/Path/Path/Op/Gui/Adaptive.py b/src/Mod/CAM/Path/Op/Gui/Adaptive.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Adaptive.py rename to src/Mod/CAM/Path/Op/Gui/Adaptive.py diff --git a/src/Mod/Path/Path/Op/Gui/Array.py b/src/Mod/CAM/Path/Op/Gui/Array.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Array.py rename to src/Mod/CAM/Path/Op/Gui/Array.py diff --git a/src/Mod/Path/Path/Op/Gui/Base.py b/src/Mod/CAM/Path/Op/Gui/Base.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Base.py rename to src/Mod/CAM/Path/Op/Gui/Base.py diff --git a/src/Mod/Path/Path/Op/Gui/CircularHoleBase.py b/src/Mod/CAM/Path/Op/Gui/CircularHoleBase.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/CircularHoleBase.py rename to src/Mod/CAM/Path/Op/Gui/CircularHoleBase.py diff --git a/src/Mod/Path/Path/Op/Gui/Comment.py b/src/Mod/CAM/Path/Op/Gui/Comment.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Comment.py rename to src/Mod/CAM/Path/Op/Gui/Comment.py diff --git a/src/Mod/Path/Path/Op/Gui/Copy.py b/src/Mod/CAM/Path/Op/Gui/Copy.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Copy.py rename to src/Mod/CAM/Path/Op/Gui/Copy.py diff --git a/src/Mod/Path/Path/Op/Gui/Custom.py b/src/Mod/CAM/Path/Op/Gui/Custom.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Custom.py rename to src/Mod/CAM/Path/Op/Gui/Custom.py diff --git a/src/Mod/Path/Path/Op/Gui/Deburr.py b/src/Mod/CAM/Path/Op/Gui/Deburr.py similarity index 99% rename from src/Mod/Path/Path/Op/Gui/Deburr.py rename to src/Mod/CAM/Path/Op/Gui/Deburr.py index 7c82781c98..35bb6868b0 100644 --- a/src/Mod/Path/Path/Op/Gui/Deburr.py +++ b/src/Mod/CAM/Path/Op/Gui/Deburr.py @@ -70,7 +70,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): return form def initPage(self, obj): - self.opImagePath = "{}Mod/Path/Images/Ops/{}".format( + self.opImagePath = "{}Mod/CAM/Images/Ops/{}".format( FreeCAD.getHomePath(), "chamfer.svg" ) self.opImage = QtGui.QPixmap(self.opImagePath) diff --git a/src/Mod/Path/Path/Op/Gui/Drilling.py b/src/Mod/CAM/Path/Op/Gui/Drilling.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Drilling.py rename to src/Mod/CAM/Path/Op/Gui/Drilling.py diff --git a/src/Mod/Path/Path/Op/Gui/Engrave.py b/src/Mod/CAM/Path/Op/Gui/Engrave.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Engrave.py rename to src/Mod/CAM/Path/Op/Gui/Engrave.py diff --git a/src/Mod/Path/Path/Op/Gui/FeatureExtension.py b/src/Mod/CAM/Path/Op/Gui/FeatureExtension.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/FeatureExtension.py rename to src/Mod/CAM/Path/Op/Gui/FeatureExtension.py diff --git a/src/Mod/Path/Path/Op/Gui/Helix.py b/src/Mod/CAM/Path/Op/Gui/Helix.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Helix.py rename to src/Mod/CAM/Path/Op/Gui/Helix.py diff --git a/src/Mod/Path/Path/Op/Gui/MillFace.py b/src/Mod/CAM/Path/Op/Gui/MillFace.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/MillFace.py rename to src/Mod/CAM/Path/Op/Gui/MillFace.py diff --git a/src/Mod/Path/Path/Op/Gui/Pocket.py b/src/Mod/CAM/Path/Op/Gui/Pocket.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Pocket.py rename to src/Mod/CAM/Path/Op/Gui/Pocket.py diff --git a/src/Mod/Path/Path/Op/Gui/PocketBase.py b/src/Mod/CAM/Path/Op/Gui/PocketBase.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/PocketBase.py rename to src/Mod/CAM/Path/Op/Gui/PocketBase.py diff --git a/src/Mod/Path/Path/Op/Gui/PocketShape.py b/src/Mod/CAM/Path/Op/Gui/PocketShape.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/PocketShape.py rename to src/Mod/CAM/Path/Op/Gui/PocketShape.py diff --git a/src/Mod/Path/Path/Op/Gui/Probe.py b/src/Mod/CAM/Path/Op/Gui/Probe.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Probe.py rename to src/Mod/CAM/Path/Op/Gui/Probe.py diff --git a/src/Mod/Path/Path/Op/Gui/Profile.py b/src/Mod/CAM/Path/Op/Gui/Profile.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Profile.py rename to src/Mod/CAM/Path/Op/Gui/Profile.py diff --git a/src/Mod/Path/Path/Op/Gui/Selection.py b/src/Mod/CAM/Path/Op/Gui/Selection.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Selection.py rename to src/Mod/CAM/Path/Op/Gui/Selection.py diff --git a/src/Mod/Path/Path/Op/Gui/SimpleCopy.py b/src/Mod/CAM/Path/Op/Gui/SimpleCopy.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/SimpleCopy.py rename to src/Mod/CAM/Path/Op/Gui/SimpleCopy.py diff --git a/src/Mod/Path/Path/Op/Gui/Slot.py b/src/Mod/CAM/Path/Op/Gui/Slot.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Slot.py rename to src/Mod/CAM/Path/Op/Gui/Slot.py diff --git a/src/Mod/Path/Path/Op/Gui/Stop.py b/src/Mod/CAM/Path/Op/Gui/Stop.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Stop.py rename to src/Mod/CAM/Path/Op/Gui/Stop.py diff --git a/src/Mod/Path/Path/Op/Gui/Surface.py b/src/Mod/CAM/Path/Op/Gui/Surface.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Surface.py rename to src/Mod/CAM/Path/Op/Gui/Surface.py diff --git a/src/Mod/Path/Path/Op/Gui/ThreadMilling.py b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py similarity index 99% rename from src/Mod/Path/Path/Op/Gui/ThreadMilling.py rename to src/Mod/CAM/Path/Op/Gui/ThreadMilling.py index 569b922a32..8acda6cfd2 100644 --- a/src/Mod/Path/Path/Op/Gui/ThreadMilling.py +++ b/src/Mod/CAM/Path/Op/Gui/ThreadMilling.py @@ -55,7 +55,7 @@ def fillThreads(form, dataFile, defaultSelect): Path.Log.debug("select = '{}'".format(select)) form.threadName.clear() with open( - "{}Mod/Path/Data/Threads/{}".format(FreeCAD.getHomePath(), dataFile) + "{}Mod/CAM/Data/Threads/{}".format(FreeCAD.getHomePath(), dataFile) ) as fp: reader = csv.DictReader(fp) for row in reader: diff --git a/src/Mod/Path/Path/Op/Gui/Vcarve.py b/src/Mod/CAM/Path/Op/Gui/Vcarve.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Vcarve.py rename to src/Mod/CAM/Path/Op/Gui/Vcarve.py diff --git a/src/Mod/Path/Path/Op/Gui/Waterline.py b/src/Mod/CAM/Path/Op/Gui/Waterline.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/Waterline.py rename to src/Mod/CAM/Path/Op/Gui/Waterline.py diff --git a/src/Mod/Path/Path/Op/Gui/__init__.py b/src/Mod/CAM/Path/Op/Gui/__init__.py similarity index 100% rename from src/Mod/Path/Path/Op/Gui/__init__.py rename to src/Mod/CAM/Path/Op/Gui/__init__.py diff --git a/src/Mod/Path/Path/Op/Helix.py b/src/Mod/CAM/Path/Op/Helix.py similarity index 100% rename from src/Mod/Path/Path/Op/Helix.py rename to src/Mod/CAM/Path/Op/Helix.py diff --git a/src/Mod/Path/Path/Op/MillFace.py b/src/Mod/CAM/Path/Op/MillFace.py similarity index 100% rename from src/Mod/Path/Path/Op/MillFace.py rename to src/Mod/CAM/Path/Op/MillFace.py diff --git a/src/Mod/Path/Path/Op/Pocket.py b/src/Mod/CAM/Path/Op/Pocket.py similarity index 100% rename from src/Mod/Path/Path/Op/Pocket.py rename to src/Mod/CAM/Path/Op/Pocket.py diff --git a/src/Mod/Path/Path/Op/PocketBase.py b/src/Mod/CAM/Path/Op/PocketBase.py similarity index 100% rename from src/Mod/Path/Path/Op/PocketBase.py rename to src/Mod/CAM/Path/Op/PocketBase.py diff --git a/src/Mod/Path/Path/Op/PocketShape.py b/src/Mod/CAM/Path/Op/PocketShape.py similarity index 100% rename from src/Mod/Path/Path/Op/PocketShape.py rename to src/Mod/CAM/Path/Op/PocketShape.py diff --git a/src/Mod/Path/Path/Op/Probe.py b/src/Mod/CAM/Path/Op/Probe.py similarity index 100% rename from src/Mod/Path/Path/Op/Probe.py rename to src/Mod/CAM/Path/Op/Probe.py diff --git a/src/Mod/Path/Path/Op/Profile.py b/src/Mod/CAM/Path/Op/Profile.py similarity index 100% rename from src/Mod/Path/Path/Op/Profile.py rename to src/Mod/CAM/Path/Op/Profile.py diff --git a/src/Mod/Path/Path/Op/Slot.py b/src/Mod/CAM/Path/Op/Slot.py similarity index 100% rename from src/Mod/Path/Path/Op/Slot.py rename to src/Mod/CAM/Path/Op/Slot.py diff --git a/src/Mod/Path/Path/Op/Surface.py b/src/Mod/CAM/Path/Op/Surface.py similarity index 100% rename from src/Mod/Path/Path/Op/Surface.py rename to src/Mod/CAM/Path/Op/Surface.py diff --git a/src/Mod/Path/Path/Op/SurfaceSupport.py b/src/Mod/CAM/Path/Op/SurfaceSupport.py similarity index 100% rename from src/Mod/Path/Path/Op/SurfaceSupport.py rename to src/Mod/CAM/Path/Op/SurfaceSupport.py diff --git a/src/Mod/Path/Path/Op/ThreadMilling.py b/src/Mod/CAM/Path/Op/ThreadMilling.py similarity index 100% rename from src/Mod/Path/Path/Op/ThreadMilling.py rename to src/Mod/CAM/Path/Op/ThreadMilling.py diff --git a/src/Mod/Path/Path/Op/Util.py b/src/Mod/CAM/Path/Op/Util.py similarity index 100% rename from src/Mod/Path/Path/Op/Util.py rename to src/Mod/CAM/Path/Op/Util.py diff --git a/src/Mod/Path/Path/Op/Vcarve.py b/src/Mod/CAM/Path/Op/Vcarve.py similarity index 100% rename from src/Mod/Path/Path/Op/Vcarve.py rename to src/Mod/CAM/Path/Op/Vcarve.py diff --git a/src/Mod/Path/Path/Op/Waterline.py b/src/Mod/CAM/Path/Op/Waterline.py similarity index 100% rename from src/Mod/Path/Path/Op/Waterline.py rename to src/Mod/CAM/Path/Op/Waterline.py diff --git a/src/Mod/Path/Path/Op/__init__.py b/src/Mod/CAM/Path/Op/__init__.py similarity index 100% rename from src/Mod/Path/Path/Op/__init__.py rename to src/Mod/CAM/Path/Op/__init__.py diff --git a/src/Mod/Path/Path/Post/Command.py b/src/Mod/CAM/Path/Post/Command.py similarity index 100% rename from src/Mod/Path/Path/Post/Command.py rename to src/Mod/CAM/Path/Post/Command.py diff --git a/src/Mod/Path/Path/Post/Processor.py b/src/Mod/CAM/Path/Post/Processor.py similarity index 100% rename from src/Mod/Path/Path/Post/Processor.py rename to src/Mod/CAM/Path/Post/Processor.py diff --git a/src/Mod/Path/Path/Post/Utils.py b/src/Mod/CAM/Path/Post/Utils.py similarity index 98% rename from src/Mod/Path/Path/Post/Utils.py rename to src/Mod/CAM/Path/Post/Utils.py index 388392a962..e61ef4db47 100644 --- a/src/Mod/Path/Path/Post/Utils.py +++ b/src/Mod/CAM/Path/Post/Utils.py @@ -100,7 +100,7 @@ class GCodeEditorDialog(QtGui.QDialog): layout.addWidget(self.buttons) # restore placement and size - self.paramKey = "User parameter:BaseApp/Values/Mod/Path/GCodeEditor/" + self.paramKey = "User parameter:BaseApp/Values/Mod/CAM/GCodeEditor/" params = FreeCAD.ParamGet(self.paramKey) posX = params.GetInt("posX") posY = params.GetInt("posY") @@ -162,7 +162,7 @@ def fmt(num, dec, units): def editor(gcode): """Pops up a handy little editor to look at the code output.""" - prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") # default Max Highlighter Size = 512 Ko defaultMHS = 512 * 1024 mhs = prefs.GetUnsigned("inspecteditorMaxHighlighterSize", defaultMHS) @@ -208,7 +208,7 @@ def splitArcs(path): Returns a Path object. """ - prefGrp = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + prefGrp = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") deflection = prefGrp.GetFloat("LibAreaCurveAccuarcy", 0.01) results = [] diff --git a/src/Mod/Path/Path/Post/UtilsArguments.py b/src/Mod/CAM/Path/Post/UtilsArguments.py similarity index 100% rename from src/Mod/Path/Path/Post/UtilsArguments.py rename to src/Mod/CAM/Path/Post/UtilsArguments.py diff --git a/src/Mod/Path/Path/Post/UtilsExport.py b/src/Mod/CAM/Path/Post/UtilsExport.py similarity index 100% rename from src/Mod/Path/Path/Post/UtilsExport.py rename to src/Mod/CAM/Path/Post/UtilsExport.py diff --git a/src/Mod/Path/Path/Post/UtilsParse.py b/src/Mod/CAM/Path/Post/UtilsParse.py similarity index 100% rename from src/Mod/Path/Path/Post/UtilsParse.py rename to src/Mod/CAM/Path/Post/UtilsParse.py diff --git a/src/Mod/Path/Path/Post/__init__.py b/src/Mod/CAM/Path/Post/__init__.py similarity index 100% rename from src/Mod/Path/Path/Post/__init__.py rename to src/Mod/CAM/Path/Post/__init__.py diff --git a/src/Mod/Path/Path/Post/scripts/KineticNCBeamicon2_post.py b/src/Mod/CAM/Path/Post/scripts/KineticNCBeamicon2_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/KineticNCBeamicon2_post.py rename to src/Mod/CAM/Path/Post/scripts/KineticNCBeamicon2_post.py diff --git a/src/Mod/Path/Path/Post/scripts/__init__.py b/src/Mod/CAM/Path/Post/scripts/__init__.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/__init__.py rename to src/Mod/CAM/Path/Post/scripts/__init__.py diff --git a/src/Mod/Path/Path/Post/scripts/centroid_post.py b/src/Mod/CAM/Path/Post/scripts/centroid_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/centroid_post.py rename to src/Mod/CAM/Path/Post/scripts/centroid_post.py diff --git a/src/Mod/Path/Path/Post/scripts/comparams_post.py b/src/Mod/CAM/Path/Post/scripts/comparams_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/comparams_post.py rename to src/Mod/CAM/Path/Post/scripts/comparams_post.py diff --git a/src/Mod/Path/Path/Post/scripts/dumper_post.py b/src/Mod/CAM/Path/Post/scripts/dumper_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/dumper_post.py rename to src/Mod/CAM/Path/Post/scripts/dumper_post.py diff --git a/src/Mod/Path/Path/Post/scripts/dxf_post.py b/src/Mod/CAM/Path/Post/scripts/dxf_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/dxf_post.py rename to src/Mod/CAM/Path/Post/scripts/dxf_post.py diff --git a/src/Mod/Path/Path/Post/scripts/dynapath_4060_post.py b/src/Mod/CAM/Path/Post/scripts/dynapath_4060_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/dynapath_4060_post.py rename to src/Mod/CAM/Path/Post/scripts/dynapath_4060_post.py diff --git a/src/Mod/Path/Path/Post/scripts/dynapath_post.py b/src/Mod/CAM/Path/Post/scripts/dynapath_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/dynapath_post.py rename to src/Mod/CAM/Path/Post/scripts/dynapath_post.py diff --git a/src/Mod/Path/Path/Post/scripts/estlcam_post.py b/src/Mod/CAM/Path/Post/scripts/estlcam_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/estlcam_post.py rename to src/Mod/CAM/Path/Post/scripts/estlcam_post.py diff --git a/src/Mod/Path/Path/Post/scripts/example_post.py b/src/Mod/CAM/Path/Post/scripts/example_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/example_post.py rename to src/Mod/CAM/Path/Post/scripts/example_post.py diff --git a/src/Mod/Path/Path/Post/scripts/example_pre.py b/src/Mod/CAM/Path/Post/scripts/example_pre.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/example_pre.py rename to src/Mod/CAM/Path/Post/scripts/example_pre.py diff --git a/src/Mod/Path/Path/Post/scripts/fablin_post.py b/src/Mod/CAM/Path/Post/scripts/fablin_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/fablin_post.py rename to src/Mod/CAM/Path/Post/scripts/fablin_post.py diff --git a/src/Mod/Path/Path/Post/scripts/fangling_post.py b/src/Mod/CAM/Path/Post/scripts/fangling_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/fangling_post.py rename to src/Mod/CAM/Path/Post/scripts/fangling_post.py diff --git a/src/Mod/Path/Path/Post/scripts/fanuc_post.py b/src/Mod/CAM/Path/Post/scripts/fanuc_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/fanuc_post.py rename to src/Mod/CAM/Path/Post/scripts/fanuc_post.py diff --git a/src/Mod/Path/Path/Post/scripts/gcode_pre.py b/src/Mod/CAM/Path/Post/scripts/gcode_pre.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/gcode_pre.py rename to src/Mod/CAM/Path/Post/scripts/gcode_pre.py diff --git a/src/Mod/Path/Path/Post/scripts/grbl_post.py b/src/Mod/CAM/Path/Post/scripts/grbl_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/grbl_post.py rename to src/Mod/CAM/Path/Post/scripts/grbl_post.py diff --git a/src/Mod/Path/Path/Post/scripts/heidenhain_post.py b/src/Mod/CAM/Path/Post/scripts/heidenhain_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/heidenhain_post.py rename to src/Mod/CAM/Path/Post/scripts/heidenhain_post.py diff --git a/src/Mod/Path/Path/Post/scripts/jtech_post.py b/src/Mod/CAM/Path/Post/scripts/jtech_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/jtech_post.py rename to src/Mod/CAM/Path/Post/scripts/jtech_post.py diff --git a/src/Mod/Path/Path/Post/scripts/linuxcnc_post.py b/src/Mod/CAM/Path/Post/scripts/linuxcnc_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/linuxcnc_post.py rename to src/Mod/CAM/Path/Post/scripts/linuxcnc_post.py diff --git a/src/Mod/Path/Path/Post/scripts/mach3_mach4_post.py b/src/Mod/CAM/Path/Post/scripts/mach3_mach4_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/mach3_mach4_post.py rename to src/Mod/CAM/Path/Post/scripts/mach3_mach4_post.py diff --git a/src/Mod/Path/Path/Post/scripts/marlin_post.py b/src/Mod/CAM/Path/Post/scripts/marlin_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/marlin_post.py rename to src/Mod/CAM/Path/Post/scripts/marlin_post.py diff --git a/src/Mod/Path/Path/Post/scripts/nccad_post.py b/src/Mod/CAM/Path/Post/scripts/nccad_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/nccad_post.py rename to src/Mod/CAM/Path/Post/scripts/nccad_post.py diff --git a/src/Mod/Path/Path/Post/scripts/opensbp_post.py b/src/Mod/CAM/Path/Post/scripts/opensbp_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/opensbp_post.py rename to src/Mod/CAM/Path/Post/scripts/opensbp_post.py diff --git a/src/Mod/Path/Path/Post/scripts/opensbp_pre.py b/src/Mod/CAM/Path/Post/scripts/opensbp_pre.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/opensbp_pre.py rename to src/Mod/CAM/Path/Post/scripts/opensbp_pre.py diff --git a/src/Mod/Path/Path/Post/scripts/philips_post.py b/src/Mod/CAM/Path/Post/scripts/philips_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/philips_post.py rename to src/Mod/CAM/Path/Post/scripts/philips_post.py diff --git a/src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py b/src/Mod/CAM/Path/Post/scripts/refactored_centroid_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/refactored_centroid_post.py rename to src/Mod/CAM/Path/Post/scripts/refactored_centroid_post.py diff --git a/src/Mod/Path/Path/Post/scripts/refactored_grbl_post.py b/src/Mod/CAM/Path/Post/scripts/refactored_grbl_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/refactored_grbl_post.py rename to src/Mod/CAM/Path/Post/scripts/refactored_grbl_post.py diff --git a/src/Mod/Path/Path/Post/scripts/refactored_linuxcnc_post.py b/src/Mod/CAM/Path/Post/scripts/refactored_linuxcnc_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/refactored_linuxcnc_post.py rename to src/Mod/CAM/Path/Post/scripts/refactored_linuxcnc_post.py diff --git a/src/Mod/Path/Path/Post/scripts/refactored_mach3_mach4_post.py b/src/Mod/CAM/Path/Post/scripts/refactored_mach3_mach4_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/refactored_mach3_mach4_post.py rename to src/Mod/CAM/Path/Post/scripts/refactored_mach3_mach4_post.py diff --git a/src/Mod/Path/Path/Post/scripts/refactored_test_post.py b/src/Mod/CAM/Path/Post/scripts/refactored_test_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/refactored_test_post.py rename to src/Mod/CAM/Path/Post/scripts/refactored_test_post.py diff --git a/src/Mod/Path/Path/Post/scripts/rml_post.py b/src/Mod/CAM/Path/Post/scripts/rml_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/rml_post.py rename to src/Mod/CAM/Path/Post/scripts/rml_post.py diff --git a/src/Mod/Path/Path/Post/scripts/rrf_post.py b/src/Mod/CAM/Path/Post/scripts/rrf_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/rrf_post.py rename to src/Mod/CAM/Path/Post/scripts/rrf_post.py diff --git a/src/Mod/Path/Path/Post/scripts/slic3r_pre.py b/src/Mod/CAM/Path/Post/scripts/slic3r_pre.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/slic3r_pre.py rename to src/Mod/CAM/Path/Post/scripts/slic3r_pre.py diff --git a/src/Mod/Path/Path/Post/scripts/smoothie_post.py b/src/Mod/CAM/Path/Post/scripts/smoothie_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/smoothie_post.py rename to src/Mod/CAM/Path/Post/scripts/smoothie_post.py diff --git a/src/Mod/Path/Path/Post/scripts/uccnc_post.py b/src/Mod/CAM/Path/Post/scripts/uccnc_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/uccnc_post.py rename to src/Mod/CAM/Path/Post/scripts/uccnc_post.py diff --git a/src/Mod/Path/Path/Post/scripts/wedm_post.py b/src/Mod/CAM/Path/Post/scripts/wedm_post.py similarity index 100% rename from src/Mod/Path/Path/Post/scripts/wedm_post.py rename to src/Mod/CAM/Path/Post/scripts/wedm_post.py diff --git a/src/Mod/Path/Path/Preferences.py b/src/Mod/CAM/Path/Preferences.py similarity index 97% rename from src/Mod/Path/Path/Preferences.py rename to src/Mod/CAM/Path/Preferences.py index 013929e520..ae26412631 100644 --- a/src/Mod/Path/Path/Preferences.py +++ b/src/Mod/CAM/Path/Preferences.py @@ -70,17 +70,17 @@ EnableAdvancedOCLFeatures = "EnableAdvancedOCLFeatures" def preferences(): - return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/CAM") def pathPostSourcePath(): - return os.path.join(FreeCAD.getHomePath(), "Mod/Path/Path/Post/") + return os.path.join(FreeCAD.getHomePath(), "Mod/CAM/Path/Post/") def pathDefaultToolsPath(sub=None): if sub: - return os.path.join(FreeCAD.getHomePath(), "Mod/Path/Tools/", sub) - return os.path.join(FreeCAD.getHomePath(), "Mod/Path/Tools/") + return os.path.join(FreeCAD.getHomePath(), "Mod/CAM/Tools/", sub) + return os.path.join(FreeCAD.getHomePath(), "Mod/CAM/Tools/") def allAvailablePostProcessors(): @@ -165,7 +165,7 @@ def searchPathsPost(): def searchPathsTool(sub): paths = [] - paths.append(os.path.join(FreeCAD.getHomePath(), "Mod", "Path", "Tools", sub)) + paths.append(os.path.join(FreeCAD.getHomePath(), "Mod", "CAM", "Tools", sub)) return paths diff --git a/src/Mod/Path/Path/Tool/Bit.py b/src/Mod/CAM/Path/Tool/Bit.py similarity index 100% rename from src/Mod/Path/Path/Tool/Bit.py rename to src/Mod/CAM/Path/Tool/Bit.py diff --git a/src/Mod/Path/Path/Tool/Controller.py b/src/Mod/CAM/Path/Tool/Controller.py similarity index 100% rename from src/Mod/Path/Path/Tool/Controller.py rename to src/Mod/CAM/Path/Tool/Controller.py diff --git a/src/Mod/Path/Path/Tool/Gui/Bit.py b/src/Mod/CAM/Path/Tool/Gui/Bit.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/Bit.py rename to src/Mod/CAM/Path/Tool/Gui/Bit.py diff --git a/src/Mod/Path/Path/Tool/Gui/BitCmd.py b/src/Mod/CAM/Path/Tool/Gui/BitCmd.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/BitCmd.py rename to src/Mod/CAM/Path/Tool/Gui/BitCmd.py diff --git a/src/Mod/Path/Path/Tool/Gui/BitEdit.py b/src/Mod/CAM/Path/Tool/Gui/BitEdit.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/BitEdit.py rename to src/Mod/CAM/Path/Tool/Gui/BitEdit.py diff --git a/src/Mod/Path/Path/Tool/Gui/BitLibrary.py b/src/Mod/CAM/Path/Tool/Gui/BitLibrary.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/BitLibrary.py rename to src/Mod/CAM/Path/Tool/Gui/BitLibrary.py diff --git a/src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py b/src/Mod/CAM/Path/Tool/Gui/BitLibraryCmd.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/BitLibraryCmd.py rename to src/Mod/CAM/Path/Tool/Gui/BitLibraryCmd.py diff --git a/src/Mod/Path/Path/Tool/Gui/Controller.py b/src/Mod/CAM/Path/Tool/Gui/Controller.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/Controller.py rename to src/Mod/CAM/Path/Tool/Gui/Controller.py diff --git a/src/Mod/Path/Path/Tool/Gui/__init__.py b/src/Mod/CAM/Path/Tool/Gui/__init__.py similarity index 100% rename from src/Mod/Path/Path/Tool/Gui/__init__.py rename to src/Mod/CAM/Path/Tool/Gui/__init__.py diff --git a/src/Mod/Path/Path/Tool/__init__.py b/src/Mod/CAM/Path/Tool/__init__.py similarity index 100% rename from src/Mod/Path/Path/Tool/__init__.py rename to src/Mod/CAM/Path/Tool/__init__.py diff --git a/src/Mod/Path/Path/__init__.py b/src/Mod/CAM/Path/__init__.py similarity index 100% rename from src/Mod/Path/Path/__init__.py rename to src/Mod/CAM/Path/__init__.py diff --git a/src/Mod/Path/PathCommands.py b/src/Mod/CAM/PathCommands.py similarity index 100% rename from src/Mod/Path/PathCommands.py rename to src/Mod/CAM/PathCommands.py diff --git a/src/Mod/Path/PathGlobal.h b/src/Mod/CAM/PathGlobal.h similarity index 100% rename from src/Mod/Path/PathGlobal.h rename to src/Mod/CAM/PathGlobal.h diff --git a/src/Mod/Path/PathPythonGui/__init__.py b/src/Mod/CAM/PathPythonGui/__init__.py similarity index 100% rename from src/Mod/Path/PathPythonGui/__init__.py rename to src/Mod/CAM/PathPythonGui/__init__.py diff --git a/src/Mod/Path/PathPythonGui/simple_edit_panel.py b/src/Mod/CAM/PathPythonGui/simple_edit_panel.py similarity index 100% rename from src/Mod/Path/PathPythonGui/simple_edit_panel.py rename to src/Mod/CAM/PathPythonGui/simple_edit_panel.py diff --git a/src/Mod/Path/PathScripts/PathPropertyBag.py b/src/Mod/CAM/PathScripts/PathPropertyBag.py similarity index 100% rename from src/Mod/Path/PathScripts/PathPropertyBag.py rename to src/Mod/CAM/PathScripts/PathPropertyBag.py diff --git a/src/Mod/Path/PathScripts/PathPropertyBagGui.py b/src/Mod/CAM/PathScripts/PathPropertyBagGui.py similarity index 100% rename from src/Mod/Path/PathScripts/PathPropertyBagGui.py rename to src/Mod/CAM/PathScripts/PathPropertyBagGui.py diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/CAM/PathScripts/PathUtils.py similarity index 100% rename from src/Mod/Path/PathScripts/PathUtils.py rename to src/Mod/CAM/PathScripts/PathUtils.py diff --git a/src/Mod/Path/PathScripts/PathUtilsGui.py b/src/Mod/CAM/PathScripts/PathUtilsGui.py similarity index 100% rename from src/Mod/Path/PathScripts/PathUtilsGui.py rename to src/Mod/CAM/PathScripts/PathUtilsGui.py diff --git a/src/Mod/Path/PathScripts/README.md b/src/Mod/CAM/PathScripts/README.md similarity index 100% rename from src/Mod/Path/PathScripts/README.md rename to src/Mod/CAM/PathScripts/README.md diff --git a/src/Mod/Path/PathScripts/__init__.py b/src/Mod/CAM/PathScripts/__init__.py similarity index 100% rename from src/Mod/Path/PathScripts/__init__.py rename to src/Mod/CAM/PathScripts/__init__.py diff --git a/src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp b/src/Mod/CAM/PathSimulator/App/AppPathSimulator.cpp similarity index 100% rename from src/Mod/Path/PathSimulator/App/AppPathSimulator.cpp rename to src/Mod/CAM/PathSimulator/App/AppPathSimulator.cpp diff --git a/src/Mod/Path/PathSimulator/App/CMakeLists.txt b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt similarity index 94% rename from src/Mod/Path/PathSimulator/App/CMakeLists.txt rename to src/Mod/CAM/PathSimulator/App/CMakeLists.txt index 3f4de55fbc..569a2b89bc 100644 --- a/src/Mod/Path/PathSimulator/App/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt @@ -44,7 +44,7 @@ SOURCE_GROUP("Python" FILES ${Python_SRCS}) add_library(PathSimulator SHARED ${PathSimulator_SRCS}) target_link_libraries(PathSimulator ${PathSimulator_LIBS}) -SET_BIN_DIR(PathSimulator PathSimulator /Mod/Path) +SET_BIN_DIR(PathSimulator PathSimulator /Mod/CAM) SET_PYTHON_PREFIX_SUFFIX(PathSimulator) install(TARGETS PathSimulator DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/Path/PathSimulator/App/PathSim.cpp b/src/Mod/CAM/PathSimulator/App/PathSim.cpp similarity index 100% rename from src/Mod/Path/PathSimulator/App/PathSim.cpp rename to src/Mod/CAM/PathSimulator/App/PathSim.cpp diff --git a/src/Mod/Path/PathSimulator/App/PathSim.h b/src/Mod/CAM/PathSimulator/App/PathSim.h similarity index 97% rename from src/Mod/Path/PathSimulator/App/PathSim.h rename to src/Mod/CAM/PathSimulator/App/PathSim.h index 5d056d89db..13ebdb6350 100644 --- a/src/Mod/Path/PathSimulator/App/PathSim.h +++ b/src/Mod/CAM/PathSimulator/App/PathSim.h @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include "VolSim.h" diff --git a/src/Mod/Path/PathSimulator/App/PathSimPy.xml b/src/Mod/CAM/PathSimulator/App/PathSimPy.xml similarity index 97% rename from src/Mod/Path/PathSimulator/App/PathSimPy.xml rename to src/Mod/CAM/PathSimulator/App/PathSimPy.xml index f4ede18033..a6ebbc2cb9 100644 --- a/src/Mod/Path/PathSimulator/App/PathSimPy.xml +++ b/src/Mod/CAM/PathSimulator/App/PathSimPy.xml @@ -5,7 +5,7 @@ Name="PathSimPy" Twin="PathSim" TwinPointer="PathSim" - Include="Mod/Path/PathSimulator/App/PathSim.h" + Include="Mod/CAM/PathSimulator/App/PathSim.h" Namespace="PathSimulator" FatherInclude="Base/BaseClassPy.h" FatherNamespace="Base" diff --git a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp b/src/Mod/CAM/PathSimulator/App/PathSimPyImp.cpp similarity index 99% rename from src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp rename to src/Mod/CAM/PathSimulator/App/PathSimPyImp.cpp index ac7f62e0f2..cbbd7a39c1 100644 --- a/src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp +++ b/src/Mod/CAM/PathSimulator/App/PathSimPyImp.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include "PathSim.h" diff --git a/src/Mod/Path/PathSimulator/App/PreCompiled.cpp b/src/Mod/CAM/PathSimulator/App/PreCompiled.cpp similarity index 100% rename from src/Mod/Path/PathSimulator/App/PreCompiled.cpp rename to src/Mod/CAM/PathSimulator/App/PreCompiled.cpp diff --git a/src/Mod/Path/PathSimulator/App/PreCompiled.h b/src/Mod/CAM/PathSimulator/App/PreCompiled.h similarity index 100% rename from src/Mod/Path/PathSimulator/App/PreCompiled.h rename to src/Mod/CAM/PathSimulator/App/PreCompiled.h diff --git a/src/Mod/Path/PathSimulator/App/VolSim.cpp b/src/Mod/CAM/PathSimulator/App/VolSim.cpp similarity index 100% rename from src/Mod/Path/PathSimulator/App/VolSim.cpp rename to src/Mod/CAM/PathSimulator/App/VolSim.cpp diff --git a/src/Mod/Path/PathSimulator/App/VolSim.h b/src/Mod/CAM/PathSimulator/App/VolSim.h similarity index 99% rename from src/Mod/Path/PathSimulator/App/VolSim.h rename to src/Mod/CAM/PathSimulator/App/VolSim.h index 9fb45c2f74..8b4bf5253d 100644 --- a/src/Mod/Path/PathSimulator/App/VolSim.h +++ b/src/Mod/CAM/PathSimulator/App/VolSim.h @@ -28,7 +28,7 @@ #include #include -#include +#include #define SIM_EPSILON 0.00001 diff --git a/src/Mod/Path/PathSimulator/CMakeLists.txt b/src/Mod/CAM/PathSimulator/CMakeLists.txt similarity index 89% rename from src/Mod/Path/PathSimulator/CMakeLists.txt rename to src/Mod/CAM/PathSimulator/CMakeLists.txt index de72a72c4a..2e75b6a147 100644 --- a/src/Mod/Path/PathSimulator/CMakeLists.txt +++ b/src/Mod/CAM/PathSimulator/CMakeLists.txt @@ -8,5 +8,5 @@ add_subdirectory(App) # FILES # Gui/PathSimulator.py # DESTINATION - # Mod/Path + # Mod/CAM # ) diff --git a/src/Mod/Path/PathSimulator/PathSimulator.dox b/src/Mod/CAM/PathSimulator/PathSimulator.dox similarity index 100% rename from src/Mod/Path/PathSimulator/PathSimulator.dox rename to src/Mod/CAM/PathSimulator/PathSimulator.dox diff --git a/src/Mod/Path/PathTests/Drilling_1.FCStd b/src/Mod/CAM/PathTests/Drilling_1.FCStd similarity index 100% rename from src/Mod/Path/PathTests/Drilling_1.FCStd rename to src/Mod/CAM/PathTests/Drilling_1.FCStd diff --git a/src/Mod/Path/PathTests/PathTestUtils.py b/src/Mod/CAM/PathTests/PathTestUtils.py similarity index 100% rename from src/Mod/Path/PathTests/PathTestUtils.py rename to src/Mod/CAM/PathTests/PathTestUtils.py diff --git a/src/Mod/Path/PathTests/TestCentroidPost.py b/src/Mod/CAM/PathTests/TestCentroidPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestCentroidPost.py rename to src/Mod/CAM/PathTests/TestCentroidPost.py diff --git a/src/Mod/Path/PathTests/TestGrblPost.py b/src/Mod/CAM/PathTests/TestGrblPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestGrblPost.py rename to src/Mod/CAM/PathTests/TestGrblPost.py diff --git a/src/Mod/Path/PathTests/TestLinuxCNCPost.py b/src/Mod/CAM/PathTests/TestLinuxCNCPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestLinuxCNCPost.py rename to src/Mod/CAM/PathTests/TestLinuxCNCPost.py diff --git a/src/Mod/Path/PathTests/TestMach3Mach4Post.py b/src/Mod/CAM/PathTests/TestMach3Mach4Post.py similarity index 100% rename from src/Mod/Path/PathTests/TestMach3Mach4Post.py rename to src/Mod/CAM/PathTests/TestMach3Mach4Post.py diff --git a/src/Mod/Path/PathTests/TestPathAdaptive.py b/src/Mod/CAM/PathTests/TestPathAdaptive.py similarity index 99% rename from src/Mod/Path/PathTests/TestPathAdaptive.py rename to src/Mod/CAM/PathTests/TestPathAdaptive.py index 1b4d21f773..234e4742df 100644 --- a/src/Mod/Path/PathTests/TestPathAdaptive.py +++ b/src/Mod/CAM/PathTests/TestPathAdaptive.py @@ -54,7 +54,7 @@ class TestPathAdaptive(PathTestBase): # Open existing FreeCAD document with test geometry cls.needsInit = False cls.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/Path/PathTests/test_adaptive.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_adaptive.fcstd" ) # Create Job object, adding geometry objects from file opened above diff --git a/src/Mod/Path/PathTests/TestPathCore.py b/src/Mod/CAM/PathTests/TestPathCore.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathCore.py rename to src/Mod/CAM/PathTests/TestPathCore.py diff --git a/src/Mod/Path/PathTests/TestPathDepthParams.py b/src/Mod/CAM/PathTests/TestPathDepthParams.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathDepthParams.py rename to src/Mod/CAM/PathTests/TestPathDepthParams.py diff --git a/src/Mod/Path/PathTests/TestPathDressupDogbone.py b/src/Mod/CAM/PathTests/TestPathDressupDogbone.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathDressupDogbone.py rename to src/Mod/CAM/PathTests/TestPathDressupDogbone.py diff --git a/src/Mod/Path/PathTests/TestPathDressupDogboneII.py b/src/Mod/CAM/PathTests/TestPathDressupDogboneII.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathDressupDogboneII.py rename to src/Mod/CAM/PathTests/TestPathDressupDogboneII.py diff --git a/src/Mod/Path/PathTests/TestPathDressupHoldingTags.py b/src/Mod/CAM/PathTests/TestPathDressupHoldingTags.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathDressupHoldingTags.py rename to src/Mod/CAM/PathTests/TestPathDressupHoldingTags.py diff --git a/src/Mod/Path/PathTests/TestPathDrillGenerator.py b/src/Mod/CAM/PathTests/TestPathDrillGenerator.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathDrillGenerator.py rename to src/Mod/CAM/PathTests/TestPathDrillGenerator.py diff --git a/src/Mod/Path/PathTests/TestPathDrillable.py b/src/Mod/CAM/PathTests/TestPathDrillable.py similarity index 99% rename from src/Mod/Path/PathTests/TestPathDrillable.py rename to src/Mod/CAM/PathTests/TestPathDrillable.py index f01988dce2..0039dbd3b3 100644 --- a/src/Mod/Path/PathTests/TestPathDrillable.py +++ b/src/Mod/CAM/PathTests/TestPathDrillable.py @@ -35,7 +35,7 @@ else: class TestPathDrillable(PathTestUtils.PathTestBase): def setUp(self): - self.doc = App.open(App.getHomePath() + "/Mod/Path/PathTests/Drilling_1.FCStd") + self.doc = App.open(App.getHomePath() + "/Mod/CAM/PathTests/Drilling_1.FCStd") self.obj = self.doc.getObject("Pocket011") def tearDown(self): diff --git a/src/Mod/Path/PathTests/TestPathGeneratorDogboneII.py b/src/Mod/CAM/PathTests/TestPathGeneratorDogboneII.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathGeneratorDogboneII.py rename to src/Mod/CAM/PathTests/TestPathGeneratorDogboneII.py diff --git a/src/Mod/Path/PathTests/TestPathGeom.py b/src/Mod/CAM/PathTests/TestPathGeom.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathGeom.py rename to src/Mod/CAM/PathTests/TestPathGeom.py diff --git a/src/Mod/Path/PathTests/TestPathHelix.py b/src/Mod/CAM/PathTests/TestPathHelix.py similarity index 95% rename from src/Mod/Path/PathTests/TestPathHelix.py rename to src/Mod/CAM/PathTests/TestPathHelix.py index 69ce117a0d..bc1fa8a65f 100644 --- a/src/Mod/Path/PathTests/TestPathHelix.py +++ b/src/Mod/CAM/PathTests/TestPathHelix.py @@ -37,7 +37,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): def setUp(self): self.clone = None self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/Path/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" ) self.job = PathJob.Create("Job", [self.doc.Body]) @@ -89,7 +89,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): for deg in range(self.RotateBy, 360, self.RotateBy): self.tearDown() self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/Path/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" ) self.doc.Body.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0) @@ -114,7 +114,7 @@ class TestPathHelix(PathTestUtils.PathTestBase): for deg in range(self.RotateBy, 360, self.RotateBy): self.tearDown() self.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/Path/PathTests/test_holes00.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_holes00.fcstd" ) self.clone = Draft.clone(self.doc.Body) self.clone.Placement.Rotation = FreeCAD.Rotation(deg, 0, 0) diff --git a/src/Mod/Path/PathTests/TestPathHelixGenerator.py b/src/Mod/CAM/PathTests/TestPathHelixGenerator.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathHelixGenerator.py rename to src/Mod/CAM/PathTests/TestPathHelixGenerator.py diff --git a/src/Mod/Path/PathTests/TestPathHelpers.py b/src/Mod/CAM/PathTests/TestPathHelpers.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathHelpers.py rename to src/Mod/CAM/PathTests/TestPathHelpers.py diff --git a/src/Mod/Path/PathTests/TestPathLanguage.py b/src/Mod/CAM/PathTests/TestPathLanguage.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathLanguage.py rename to src/Mod/CAM/PathTests/TestPathLanguage.py diff --git a/src/Mod/Path/PathTests/TestPathLog.py b/src/Mod/CAM/PathTests/TestPathLog.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathLog.py rename to src/Mod/CAM/PathTests/TestPathLog.py diff --git a/src/Mod/Path/PathTests/TestPathOpDeburr.py b/src/Mod/CAM/PathTests/TestPathOpDeburr.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathOpDeburr.py rename to src/Mod/CAM/PathTests/TestPathOpDeburr.py diff --git a/src/Mod/Path/PathTests/TestPathOpUtil.py b/src/Mod/CAM/PathTests/TestPathOpUtil.py similarity index 99% rename from src/Mod/Path/PathTests/TestPathOpUtil.py rename to src/Mod/CAM/PathTests/TestPathOpUtil.py index e6aeba8cef..417d7644ba 100644 --- a/src/Mod/Path/PathTests/TestPathOpUtil.py +++ b/src/Mod/CAM/PathTests/TestPathOpUtil.py @@ -32,7 +32,7 @@ from FreeCAD import Vector Path.Log.setLevel(Path.Log.Level.INFO, Path.Log.thisModule()) # Path.Log.trackModule(Path.Log.thisModule()) -DOC = FreeCAD.getHomePath() + "Mod/Path/PathTests/test_geomop.fcstd" +DOC = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_geomop.fcstd" def getWire(obj, nr=0): return obj.Tip.Profile[0].Shape.Wires[nr] diff --git a/src/Mod/Path/PathTests/TestPathPost.py b/src/Mod/CAM/PathTests/TestPathPost.py similarity index 99% rename from src/Mod/Path/PathTests/TestPathPost.py rename to src/Mod/CAM/PathTests/TestPathPost.py index d9643577d7..096235efa1 100644 --- a/src/Mod/Path/PathTests/TestPathPost.py +++ b/src/Mod/CAM/PathTests/TestPathPost.py @@ -115,7 +115,7 @@ class TestPathPost(unittest.TestCase): # Enough of the path to where the tests are stored so that # they can be found by the python interpreter. # - PATHTESTS_LOCATION = "Mod/Path/PathTests" + PATHTESTS_LOCATION = "Mod/CAM/PathTests" # # The following code tries to re-use an open FreeCAD document # as much as possible. It compares the current document with @@ -266,7 +266,7 @@ class TestBuildPostList(unittest.TestCase): """ def setUp(self): - self.testfile = FreeCAD.getHomePath() + "Mod/Path/PathTests/test_filenaming.fcstd" + self.testfile = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_filenaming.fcstd" self.doc = FreeCAD.open(self.testfile) self.job = self.doc.getObjectsByLabel("MainJob")[0] @@ -394,7 +394,7 @@ class TestOutputNameSubstitution(unittest.TestCase): """ def setUp(self): - self.testfile = FreeCAD.getHomePath() + "Mod/Path/PathTests/test_filenaming.fcstd" + self.testfile = FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_filenaming.fcstd" self.testfilepath, self.testfilename = os.path.split(self.testfile) self.testfilename, self.ext = os.path.splitext(self.testfilename) diff --git a/src/Mod/Path/PathTests/TestPathPreferences.py b/src/Mod/CAM/PathTests/TestPathPreferences.py similarity index 94% rename from src/Mod/Path/PathTests/TestPathPreferences.py rename to src/Mod/CAM/PathTests/TestPathPreferences.py index 3c1bf9bb7c..0e429fd715 100644 --- a/src/Mod/Path/PathTests/TestPathPreferences.py +++ b/src/Mod/CAM/PathTests/TestPathPreferences.py @@ -54,18 +54,18 @@ class TestPathPreferences(PathTestUtils.PathTestBase): """Default paths for tools are resolved correctly""" self.assertTrue( - Path.Preferences.pathDefaultToolsPath().endswith("/Path/Tools/") + Path.Preferences.pathDefaultToolsPath().endswith("/CAM/Tools/") ) self.assertTrue( - Path.Preferences.pathDefaultToolsPath("Bit").endswith("/Path/Tools/Bit") + Path.Preferences.pathDefaultToolsPath("Bit").endswith("/CAM/Tools/Bit") ) self.assertTrue( Path.Preferences.pathDefaultToolsPath("Library").endswith( - "/Path/Tools/Library" + "/CAM/Tools/Library" ) ) self.assertTrue( Path.Preferences.pathDefaultToolsPath("Template").endswith( - "/Path/Tools/Template" + "/CAM/Tools/Template" ) ) diff --git a/src/Mod/Path/PathTests/TestPathProfile.py b/src/Mod/CAM/PathTests/TestPathProfile.py similarity index 99% rename from src/Mod/Path/PathTests/TestPathProfile.py rename to src/Mod/CAM/PathTests/TestPathProfile.py index 7de6c68328..29afc01bc0 100644 --- a/src/Mod/Path/PathTests/TestPathProfile.py +++ b/src/Mod/CAM/PathTests/TestPathProfile.py @@ -55,7 +55,7 @@ class TestPathProfile(PathTestBase): # Open existing FreeCAD document with test geometry cls.needsInit = False cls.doc = FreeCAD.open( - FreeCAD.getHomePath() + "Mod/Path/PathTests/test_profile.fcstd" + FreeCAD.getHomePath() + "Mod/CAM/PathTests/test_profile.fcstd" ) # Create Job object, adding geometry objects from file opened above diff --git a/src/Mod/Path/PathTests/TestPathPropertyBag.py b/src/Mod/CAM/PathTests/TestPathPropertyBag.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathPropertyBag.py rename to src/Mod/CAM/PathTests/TestPathPropertyBag.py diff --git a/src/Mod/Path/PathTests/TestPathRotationGenerator.py b/src/Mod/CAM/PathTests/TestPathRotationGenerator.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathRotationGenerator.py rename to src/Mod/CAM/PathTests/TestPathRotationGenerator.py diff --git a/src/Mod/Path/PathTests/TestPathSetupSheet.py b/src/Mod/CAM/PathTests/TestPathSetupSheet.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathSetupSheet.py rename to src/Mod/CAM/PathTests/TestPathSetupSheet.py diff --git a/src/Mod/Path/PathTests/TestPathStock.py b/src/Mod/CAM/PathTests/TestPathStock.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathStock.py rename to src/Mod/CAM/PathTests/TestPathStock.py diff --git a/src/Mod/Path/PathTests/TestPathThreadMilling.py b/src/Mod/CAM/PathTests/TestPathThreadMilling.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathThreadMilling.py rename to src/Mod/CAM/PathTests/TestPathThreadMilling.py diff --git a/src/Mod/Path/PathTests/TestPathThreadMillingGenerator.py b/src/Mod/CAM/PathTests/TestPathThreadMillingGenerator.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathThreadMillingGenerator.py rename to src/Mod/CAM/PathTests/TestPathThreadMillingGenerator.py diff --git a/src/Mod/Path/PathTests/TestPathToolBit.py b/src/Mod/CAM/PathTests/TestPathToolBit.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathToolBit.py rename to src/Mod/CAM/PathTests/TestPathToolBit.py diff --git a/src/Mod/Path/PathTests/TestPathToolChangeGenerator.py b/src/Mod/CAM/PathTests/TestPathToolChangeGenerator.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathToolChangeGenerator.py rename to src/Mod/CAM/PathTests/TestPathToolChangeGenerator.py diff --git a/src/Mod/Path/PathTests/TestPathToolController.py b/src/Mod/CAM/PathTests/TestPathToolController.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathToolController.py rename to src/Mod/CAM/PathTests/TestPathToolController.py diff --git a/src/Mod/Path/PathTests/TestPathUtil.py b/src/Mod/CAM/PathTests/TestPathUtil.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathUtil.py rename to src/Mod/CAM/PathTests/TestPathUtil.py diff --git a/src/Mod/Path/PathTests/TestPathVcarve.py b/src/Mod/CAM/PathTests/TestPathVcarve.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathVcarve.py rename to src/Mod/CAM/PathTests/TestPathVcarve.py diff --git a/src/Mod/Path/PathTests/TestPathVoronoi.py b/src/Mod/CAM/PathTests/TestPathVoronoi.py similarity index 100% rename from src/Mod/Path/PathTests/TestPathVoronoi.py rename to src/Mod/CAM/PathTests/TestPathVoronoi.py diff --git a/src/Mod/Path/PathTests/TestRefactoredCentroidPost.py b/src/Mod/CAM/PathTests/TestRefactoredCentroidPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredCentroidPost.py rename to src/Mod/CAM/PathTests/TestRefactoredCentroidPost.py diff --git a/src/Mod/Path/PathTests/TestRefactoredGrblPost.py b/src/Mod/CAM/PathTests/TestRefactoredGrblPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredGrblPost.py rename to src/Mod/CAM/PathTests/TestRefactoredGrblPost.py diff --git a/src/Mod/Path/PathTests/TestRefactoredLinuxCNCPost.py b/src/Mod/CAM/PathTests/TestRefactoredLinuxCNCPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredLinuxCNCPost.py rename to src/Mod/CAM/PathTests/TestRefactoredLinuxCNCPost.py diff --git a/src/Mod/Path/PathTests/TestRefactoredMach3Mach4Post.py b/src/Mod/CAM/PathTests/TestRefactoredMach3Mach4Post.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredMach3Mach4Post.py rename to src/Mod/CAM/PathTests/TestRefactoredMach3Mach4Post.py diff --git a/src/Mod/Path/PathTests/TestRefactoredTestPost.py b/src/Mod/CAM/PathTests/TestRefactoredTestPost.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredTestPost.py rename to src/Mod/CAM/PathTests/TestRefactoredTestPost.py diff --git a/src/Mod/Path/PathTests/TestRefactoredTestPostGCodes.py b/src/Mod/CAM/PathTests/TestRefactoredTestPostGCodes.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredTestPostGCodes.py rename to src/Mod/CAM/PathTests/TestRefactoredTestPostGCodes.py diff --git a/src/Mod/Path/PathTests/TestRefactoredTestPostMCodes.py b/src/Mod/CAM/PathTests/TestRefactoredTestPostMCodes.py similarity index 100% rename from src/Mod/Path/PathTests/TestRefactoredTestPostMCodes.py rename to src/Mod/CAM/PathTests/TestRefactoredTestPostMCodes.py diff --git a/src/Mod/Path/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb b/src/Mod/CAM/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb similarity index 100% rename from src/Mod/Path/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb rename to src/Mod/CAM/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb diff --git a/src/Mod/Path/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl b/src/Mod/CAM/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl similarity index 100% rename from src/Mod/Path/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl rename to src/Mod/CAM/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl diff --git a/src/Mod/Path/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd b/src/Mod/CAM/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd similarity index 100% rename from src/Mod/Path/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd rename to src/Mod/CAM/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd diff --git a/src/Mod/Path/PathTests/__init__.py b/src/Mod/CAM/PathTests/__init__.py similarity index 100% rename from src/Mod/Path/PathTests/__init__.py rename to src/Mod/CAM/PathTests/__init__.py diff --git a/src/Mod/Path/PathTests/boxtest.fcstd b/src/Mod/CAM/PathTests/boxtest.fcstd similarity index 100% rename from src/Mod/Path/PathTests/boxtest.fcstd rename to src/Mod/CAM/PathTests/boxtest.fcstd diff --git a/src/Mod/Path/PathTests/boxtest1.fcstd b/src/Mod/CAM/PathTests/boxtest1.fcstd similarity index 100% rename from src/Mod/Path/PathTests/boxtest1.fcstd rename to src/Mod/CAM/PathTests/boxtest1.fcstd diff --git a/src/Mod/Path/PathTests/drill_test1.FCStd b/src/Mod/CAM/PathTests/drill_test1.FCStd similarity index 100% rename from src/Mod/Path/PathTests/drill_test1.FCStd rename to src/Mod/CAM/PathTests/drill_test1.FCStd diff --git a/src/Mod/Path/PathTests/test_adaptive.fcstd b/src/Mod/CAM/PathTests/test_adaptive.fcstd similarity index 100% rename from src/Mod/Path/PathTests/test_adaptive.fcstd rename to src/Mod/CAM/PathTests/test_adaptive.fcstd diff --git a/src/Mod/Path/PathTests/test_centroid_00.ngc b/src/Mod/CAM/PathTests/test_centroid_00.ngc similarity index 100% rename from src/Mod/Path/PathTests/test_centroid_00.ngc rename to src/Mod/CAM/PathTests/test_centroid_00.ngc diff --git a/src/Mod/Path/PathTests/test_filenaming.fcstd b/src/Mod/CAM/PathTests/test_filenaming.fcstd similarity index 100% rename from src/Mod/Path/PathTests/test_filenaming.fcstd rename to src/Mod/CAM/PathTests/test_filenaming.fcstd diff --git a/src/Mod/Path/PathTests/test_geomop.fcstd b/src/Mod/CAM/PathTests/test_geomop.fcstd similarity index 100% rename from src/Mod/Path/PathTests/test_geomop.fcstd rename to src/Mod/CAM/PathTests/test_geomop.fcstd diff --git a/src/Mod/Path/PathTests/test_holes00.fcstd b/src/Mod/CAM/PathTests/test_holes00.fcstd similarity index 100% rename from src/Mod/Path/PathTests/test_holes00.fcstd rename to src/Mod/CAM/PathTests/test_holes00.fcstd diff --git a/src/Mod/Path/PathTests/test_profile.fcstd b/src/Mod/CAM/PathTests/test_profile.fcstd similarity index 100% rename from src/Mod/Path/PathTests/test_profile.fcstd rename to src/Mod/CAM/PathTests/test_profile.fcstd diff --git a/src/Mod/Path/TestPathApp.py b/src/Mod/CAM/TestPathApp.py similarity index 100% rename from src/Mod/Path/TestPathApp.py rename to src/Mod/CAM/TestPathApp.py diff --git a/src/Mod/Path/Tools/.gitignore b/src/Mod/CAM/Tools/.gitignore similarity index 100% rename from src/Mod/Path/Tools/.gitignore rename to src/Mod/CAM/Tools/.gitignore diff --git a/src/Mod/Path/Tools/Bit/45degree_chamfer.fctb b/src/Mod/CAM/Tools/Bit/45degree_chamfer.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/45degree_chamfer.fctb rename to src/Mod/CAM/Tools/Bit/45degree_chamfer.fctb diff --git a/src/Mod/Path/Tools/Bit/5mm-thread-cutter.fctb b/src/Mod/CAM/Tools/Bit/5mm-thread-cutter.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/5mm-thread-cutter.fctb rename to src/Mod/CAM/Tools/Bit/5mm-thread-cutter.fctb diff --git a/src/Mod/Path/Tools/Bit/5mm_Drill.fctb b/src/Mod/CAM/Tools/Bit/5mm_Drill.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/5mm_Drill.fctb rename to src/Mod/CAM/Tools/Bit/5mm_Drill.fctb diff --git a/src/Mod/Path/Tools/Bit/5mm_Endmill.fctb b/src/Mod/CAM/Tools/Bit/5mm_Endmill.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/5mm_Endmill.fctb rename to src/Mod/CAM/Tools/Bit/5mm_Endmill.fctb diff --git a/src/Mod/Path/Tools/Bit/60degree_Vbit.fctb b/src/Mod/CAM/Tools/Bit/60degree_Vbit.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/60degree_Vbit.fctb rename to src/Mod/CAM/Tools/Bit/60degree_Vbit.fctb diff --git a/src/Mod/Path/Tools/Bit/6mm_Ball_End.fctb b/src/Mod/CAM/Tools/Bit/6mm_Ball_End.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/6mm_Ball_End.fctb rename to src/Mod/CAM/Tools/Bit/6mm_Ball_End.fctb diff --git a/src/Mod/Path/Tools/Bit/6mm_Bullnose.fctb b/src/Mod/CAM/Tools/Bit/6mm_Bullnose.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/6mm_Bullnose.fctb rename to src/Mod/CAM/Tools/Bit/6mm_Bullnose.fctb diff --git a/src/Mod/Path/Tools/Bit/probe.fctb b/src/Mod/CAM/Tools/Bit/probe.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/probe.fctb rename to src/Mod/CAM/Tools/Bit/probe.fctb diff --git a/src/Mod/Path/Tools/Bit/slittingsaw.fctb b/src/Mod/CAM/Tools/Bit/slittingsaw.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/slittingsaw.fctb rename to src/Mod/CAM/Tools/Bit/slittingsaw.fctb diff --git a/src/Mod/Path/Tools/Library/Default.fctl b/src/Mod/CAM/Tools/Library/Default.fctl similarity index 100% rename from src/Mod/Path/Tools/Library/Default.fctl rename to src/Mod/CAM/Tools/Library/Default.fctl diff --git a/src/Mod/Path/Tools/README.md b/src/Mod/CAM/Tools/README.md similarity index 100% rename from src/Mod/Path/Tools/README.md rename to src/Mod/CAM/Tools/README.md diff --git a/src/Mod/Path/Tools/Shape/ballend.fcstd b/src/Mod/CAM/Tools/Shape/ballend.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/ballend.fcstd rename to src/Mod/CAM/Tools/Shape/ballend.fcstd diff --git a/src/Mod/Path/Tools/Shape/bullnose.fcstd b/src/Mod/CAM/Tools/Shape/bullnose.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/bullnose.fcstd rename to src/Mod/CAM/Tools/Shape/bullnose.fcstd diff --git a/src/Mod/Path/Tools/Shape/chamfer.fcstd b/src/Mod/CAM/Tools/Shape/chamfer.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/chamfer.fcstd rename to src/Mod/CAM/Tools/Shape/chamfer.fcstd diff --git a/src/Mod/Path/Tools/Shape/dovetail.fcstd b/src/Mod/CAM/Tools/Shape/dovetail.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/dovetail.fcstd rename to src/Mod/CAM/Tools/Shape/dovetail.fcstd diff --git a/src/Mod/Path/Tools/Shape/drill.fcstd b/src/Mod/CAM/Tools/Shape/drill.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/drill.fcstd rename to src/Mod/CAM/Tools/Shape/drill.fcstd diff --git a/src/Mod/Path/Tools/Shape/endmill.fcstd b/src/Mod/CAM/Tools/Shape/endmill.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/endmill.fcstd rename to src/Mod/CAM/Tools/Shape/endmill.fcstd diff --git a/src/Mod/Path/Tools/Shape/probe.fcstd b/src/Mod/CAM/Tools/Shape/probe.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/probe.fcstd rename to src/Mod/CAM/Tools/Shape/probe.fcstd diff --git a/src/Mod/Path/Tools/Shape/slittingsaw.fcstd b/src/Mod/CAM/Tools/Shape/slittingsaw.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/slittingsaw.fcstd rename to src/Mod/CAM/Tools/Shape/slittingsaw.fcstd diff --git a/src/Mod/Path/Tools/Shape/thread-mill.fcstd b/src/Mod/CAM/Tools/Shape/thread-mill.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/thread-mill.fcstd rename to src/Mod/CAM/Tools/Shape/thread-mill.fcstd diff --git a/src/Mod/Path/Tools/Shape/v-bit.fcstd b/src/Mod/CAM/Tools/Shape/v-bit.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/v-bit.fcstd rename to src/Mod/CAM/Tools/Shape/v-bit.fcstd diff --git a/src/Mod/Path/Tools/toolbit-attributes.py b/src/Mod/CAM/Tools/toolbit-attributes.py similarity index 97% rename from src/Mod/Path/Tools/toolbit-attributes.py rename to src/Mod/CAM/Tools/toolbit-attributes.py index 326eaa71dd..3545fe55a4 100755 --- a/src/Mod/Path/Tools/toolbit-attributes.py +++ b/src/Mod/CAM/Tools/toolbit-attributes.py @@ -33,15 +33,15 @@ # "Attributes" group. Note that the Attributes group might or might not # already exist. If it does exist the specified group gets merged in. # -# ./toolbit-attributes.py --move 'Extra:Attributes' src/Mod/Path/Tools/Shape/*.fcstd +# ./toolbit-attributes.py --move 'Extra:Attributes' src/Mod/CAM/Tools/Shape/*.fcstd # # This example sets the Flutes value of all Shapes to 0: # -# ./toolbit-attributes.py --set Flutes=0 src/Mod/Path/Tools/Shape/*.fcstd +# ./toolbit-attributes.py --set Flutes=0 src/Mod/CAM/Tools/Shape/*.fcstd # # Finally, this example sets the enumerations of the Material attribute: # -# ./toolbit-attributes.py --set 'Material=[HSS,Carbide,Tool Steel,Titanium]' src/Mod/Path/Tools/Shape/*.fcstd +# ./toolbit-attributes.py --set 'Material=[HSS,Carbide,Tool Steel,Titanium]' src/Mod/CAM/Tools/Shape/*.fcstd # # After running this tool it might be necessary to open the shape files # manually and make sure they are visible and the thumbprint image is diff --git a/src/Mod/Path/libarea/Adaptive.cpp b/src/Mod/CAM/libarea/Adaptive.cpp similarity index 100% rename from src/Mod/Path/libarea/Adaptive.cpp rename to src/Mod/CAM/libarea/Adaptive.cpp diff --git a/src/Mod/Path/libarea/Adaptive.hpp b/src/Mod/CAM/libarea/Adaptive.hpp similarity index 100% rename from src/Mod/Path/libarea/Adaptive.hpp rename to src/Mod/CAM/libarea/Adaptive.hpp diff --git a/src/Mod/Path/libarea/Arc.cpp b/src/Mod/CAM/libarea/Arc.cpp similarity index 100% rename from src/Mod/Path/libarea/Arc.cpp rename to src/Mod/CAM/libarea/Arc.cpp diff --git a/src/Mod/Path/libarea/Arc.h b/src/Mod/CAM/libarea/Arc.h similarity index 100% rename from src/Mod/Path/libarea/Arc.h rename to src/Mod/CAM/libarea/Arc.h diff --git a/src/Mod/Path/libarea/Area.cpp b/src/Mod/CAM/libarea/Area.cpp similarity index 100% rename from src/Mod/Path/libarea/Area.cpp rename to src/Mod/CAM/libarea/Area.cpp diff --git a/src/Mod/Path/libarea/Area.h b/src/Mod/CAM/libarea/Area.h similarity index 100% rename from src/Mod/Path/libarea/Area.h rename to src/Mod/CAM/libarea/Area.h diff --git a/src/Mod/Path/libarea/AreaClipper.cpp b/src/Mod/CAM/libarea/AreaClipper.cpp similarity index 100% rename from src/Mod/Path/libarea/AreaClipper.cpp rename to src/Mod/CAM/libarea/AreaClipper.cpp diff --git a/src/Mod/Path/libarea/AreaDxf.cpp b/src/Mod/CAM/libarea/AreaDxf.cpp similarity index 100% rename from src/Mod/Path/libarea/AreaDxf.cpp rename to src/Mod/CAM/libarea/AreaDxf.cpp diff --git a/src/Mod/Path/libarea/AreaDxf.h b/src/Mod/CAM/libarea/AreaDxf.h similarity index 100% rename from src/Mod/Path/libarea/AreaDxf.h rename to src/Mod/CAM/libarea/AreaDxf.h diff --git a/src/Mod/Path/libarea/AreaOrderer.cpp b/src/Mod/CAM/libarea/AreaOrderer.cpp similarity index 100% rename from src/Mod/Path/libarea/AreaOrderer.cpp rename to src/Mod/CAM/libarea/AreaOrderer.cpp diff --git a/src/Mod/Path/libarea/AreaOrderer.h b/src/Mod/CAM/libarea/AreaOrderer.h similarity index 100% rename from src/Mod/Path/libarea/AreaOrderer.h rename to src/Mod/CAM/libarea/AreaOrderer.h diff --git a/src/Mod/Path/libarea/AreaPocket.cpp b/src/Mod/CAM/libarea/AreaPocket.cpp similarity index 100% rename from src/Mod/Path/libarea/AreaPocket.cpp rename to src/Mod/CAM/libarea/AreaPocket.cpp diff --git a/src/Mod/Path/libarea/Box2D.h b/src/Mod/CAM/libarea/Box2D.h similarity index 100% rename from src/Mod/Path/libarea/Box2D.h rename to src/Mod/CAM/libarea/Box2D.h diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/CAM/libarea/CMakeLists.txt similarity index 98% rename from src/Mod/Path/libarea/CMakeLists.txt rename to src/Mod/CAM/libarea/CMakeLists.txt index 62118bc7a0..d892d72705 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt +++ b/src/Mod/CAM/libarea/CMakeLists.txt @@ -156,7 +156,7 @@ else(MSVC) endif(MSVC) target_link_libraries(area-native ${area_native_LIBS} Import) -SET_BIN_DIR(area-native area-native /Mod/Path) +SET_BIN_DIR(area-native area-native /Mod/CAM) target_link_libraries(area area-native ${area_LIBS} ${area_native_LIBS}) @@ -166,7 +166,7 @@ if(NOT BUILD_DYNAMIC_LINK_PYTHON AND CMAKE_COMPILER_IS_CLANGXX) target_link_libraries(area "-Wl,-undefined,dynamic_lookup") endif() -SET_BIN_DIR(area area /Mod/Path) +SET_BIN_DIR(area area /Mod/CAM) SET_PYTHON_PREFIX_SUFFIX(area) # this figures out where to install the Python modules diff --git a/src/Mod/Path/libarea/Circle.cpp b/src/Mod/CAM/libarea/Circle.cpp similarity index 100% rename from src/Mod/Path/libarea/Circle.cpp rename to src/Mod/CAM/libarea/Circle.cpp diff --git a/src/Mod/Path/libarea/Circle.h b/src/Mod/CAM/libarea/Circle.h similarity index 100% rename from src/Mod/Path/libarea/Circle.h rename to src/Mod/CAM/libarea/Circle.h diff --git a/src/Mod/Path/libarea/Curve.cpp b/src/Mod/CAM/libarea/Curve.cpp similarity index 100% rename from src/Mod/Path/libarea/Curve.cpp rename to src/Mod/CAM/libarea/Curve.cpp diff --git a/src/Mod/Path/libarea/Curve.h b/src/Mod/CAM/libarea/Curve.h similarity index 100% rename from src/Mod/Path/libarea/Curve.h rename to src/Mod/CAM/libarea/Curve.h diff --git a/src/Mod/Path/libarea/Point.h b/src/Mod/CAM/libarea/Point.h similarity index 100% rename from src/Mod/Path/libarea/Point.h rename to src/Mod/CAM/libarea/Point.h diff --git a/src/Mod/Path/libarea/PythonStuff.cpp b/src/Mod/CAM/libarea/PythonStuff.cpp similarity index 100% rename from src/Mod/Path/libarea/PythonStuff.cpp rename to src/Mod/CAM/libarea/PythonStuff.cpp diff --git a/src/Mod/Path/libarea/PythonStuff.h b/src/Mod/CAM/libarea/PythonStuff.h similarity index 100% rename from src/Mod/Path/libarea/PythonStuff.h rename to src/Mod/CAM/libarea/PythonStuff.h diff --git a/src/Mod/Path/libarea/clipper.cpp b/src/Mod/CAM/libarea/clipper.cpp similarity index 100% rename from src/Mod/Path/libarea/clipper.cpp rename to src/Mod/CAM/libarea/clipper.cpp diff --git a/src/Mod/Path/libarea/clipper.hpp b/src/Mod/CAM/libarea/clipper.hpp similarity index 100% rename from src/Mod/Path/libarea/clipper.hpp rename to src/Mod/CAM/libarea/clipper.hpp diff --git a/src/Mod/Path/libarea/kurve/Construction.cpp b/src/Mod/CAM/libarea/kurve/Construction.cpp similarity index 100% rename from src/Mod/Path/libarea/kurve/Construction.cpp rename to src/Mod/CAM/libarea/kurve/Construction.cpp diff --git a/src/Mod/Path/libarea/kurve/Finite.cpp b/src/Mod/CAM/libarea/kurve/Finite.cpp similarity index 100% rename from src/Mod/Path/libarea/kurve/Finite.cpp rename to src/Mod/CAM/libarea/kurve/Finite.cpp diff --git a/src/Mod/Path/libarea/kurve/License.txt b/src/Mod/CAM/libarea/kurve/License.txt similarity index 100% rename from src/Mod/Path/libarea/kurve/License.txt rename to src/Mod/CAM/libarea/kurve/License.txt diff --git a/src/Mod/Path/libarea/kurve/Matrix.cpp b/src/Mod/CAM/libarea/kurve/Matrix.cpp similarity index 100% rename from src/Mod/Path/libarea/kurve/Matrix.cpp rename to src/Mod/CAM/libarea/kurve/Matrix.cpp diff --git a/src/Mod/Path/libarea/kurve/README b/src/Mod/CAM/libarea/kurve/README similarity index 100% rename from src/Mod/Path/libarea/kurve/README rename to src/Mod/CAM/libarea/kurve/README diff --git a/src/Mod/Path/libarea/kurve/geometry.h b/src/Mod/CAM/libarea/kurve/geometry.h similarity index 100% rename from src/Mod/Path/libarea/kurve/geometry.h rename to src/Mod/CAM/libarea/kurve/geometry.h diff --git a/src/Mod/Path/libarea/kurve/kurve.cpp b/src/Mod/CAM/libarea/kurve/kurve.cpp similarity index 100% rename from src/Mod/Path/libarea/kurve/kurve.cpp rename to src/Mod/CAM/libarea/kurve/kurve.cpp diff --git a/src/Mod/Path/libarea/kurve/offset.cpp b/src/Mod/CAM/libarea/kurve/offset.cpp similarity index 100% rename from src/Mod/Path/libarea/kurve/offset.cpp rename to src/Mod/CAM/libarea/kurve/offset.cpp diff --git a/src/Mod/Path/libarea/kurve/test.py b/src/Mod/CAM/libarea/kurve/test.py similarity index 100% rename from src/Mod/Path/libarea/kurve/test.py rename to src/Mod/CAM/libarea/kurve/test.py diff --git a/src/Mod/Path/libarea/pyarea.cpp b/src/Mod/CAM/libarea/pyarea.cpp similarity index 100% rename from src/Mod/Path/libarea/pyarea.cpp rename to src/Mod/CAM/libarea/pyarea.cpp diff --git a/src/Mod/Path/path.dox b/src/Mod/CAM/path.dox similarity index 100% rename from src/Mod/Path/path.dox rename to src/Mod/CAM/path.dox diff --git a/src/Mod/CMakeLists.txt b/src/Mod/CMakeLists.txt index 5ca5e95a80..896402098f 100644 --- a/src/Mod/CMakeLists.txt +++ b/src/Mod/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_PART_DESIGN) endif(BUILD_PART_DESIGN) if(BUILD_PATH) - add_subdirectory(Path) + add_subdirectory(CAM) endif(BUILD_PATH) if(BUILD_PLOT)