Merge pull request #2724 from mlampert/feature/tool-bit-poc

Path: Feature/tool bit poc
FreeCAD · Dec 10, 2019 · 540aead · vocx-fc · Dec 11, 2019 · 540aead
2 parents f4e79ed + 227a292
commit 540aead
Show file tree

Hide file tree

Showing 61 changed files with 3,894 additions and 216 deletions.
diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt
@@ -101,6 +101,12 @@ SET(PathScripts_SRCS
     PathScripts/PathStop.py
     PathScripts/PathSurface.py
     PathScripts/PathSurfaceGui.py
+    PathScripts/PathToolBit.py
+    PathScripts/PathToolBitCmd.py
+    PathScripts/PathToolBitEdit.py
+    PathScripts/PathToolBitGui.py
+    PathScripts/PathToolBitLibraryCmd.py
+    PathScripts/PathToolBitLibraryGui.py
     PathScripts/PathToolController.py
     PathScripts/PathToolControllerGui.py
     PathScripts/PathToolEdit.py
@@ -133,6 +139,29 @@ SET(PathScripts_post_SRCS
     PathScripts/post/smoothie_post.py
 )
 
+SET(Tools_Bit_SRCS
+  Tools/Bit/t1.fctb
+  Tools/Bit/t2.fctb
+  Tools/Bit/t3.fctb
+  Tools/Bit/t4.fctb
+  Tools/Bit/t5.fctb
+  Tools/Bit/t6.fctb
+  Tools/Bit/t7.fctb
+  Tools/Bit/t8.fctb
+  Tools/Bit/t9.fctb
+)
+
+SET(Tools_Library_SRCS
+  Tools/Library/endmills.fctl
+)
+
+SET(Tools_Shape_SRCS
+  Tools/Shape/ballend.fcstd
+  Tools/Shape/bullnose.fcstd
+  Tools/Shape/drill.fcstd
+  Tools/Shape/endmill.fcstd
+  Tools/Shape/v-bit.fcstd
+)
 
 SET(PathTests_SRCS
     PathTests/__init__.py
@@ -147,9 +176,11 @@ SET(PathTests_SRCS
     PathTests/TestPathLog.py
     PathTests/TestPathOpTools.py
     PathTests/TestPathPost.py
+    PathTests/TestPathPreferences.py
     PathTests/TestPathSetupSheet.py
     PathTests/TestPathStock.py
     PathTests/TestPathTool.py
+    PathTests/TestPathToolBit.py
     PathTests/TestPathToolController.py
     PathTests/TestPathTooltable.py
     PathTests/TestPathUtil.py
@@ -178,6 +209,9 @@ SET(Path_Images
 SET(all_files
     ${PathScripts_SRCS}
     ${PathScripts_post_SRCS}
+    ${Tools_Bit_SRCS}
+    ${Tools_Library_SRCS}
+    ${Tools_Shape_SRCS}
     ${Path_Images}
 )
 
@@ -218,6 +252,27 @@ INSTALL(
         Mod/Path/PathScripts/post
 )
 
+INSTALL(
+    FILES
+        ${Tools_Bit_SRCS}
+    DESTINATION
+        Mod/Path/Tools/Bit
+)
+
+INSTALL(
+    FILES
+        ${Tools_Library_SRCS}
+    DESTINATION
+        Mod/Path/Tools/Library
+)
+
+INSTALL(
+    FILES
+      ${Tools_Shape_SRCS}
+    DESTINATION
+      Mod/Path/Tools/Shape
+)
+
 INSTALL(
     FILES
         ${PathImages_Ops}

diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc
@@ -48,9 +48,10 @@
         <file>icons/Path-Speed.svg</file>
         <file>icons/Path-Stock.svg</file>
         <file>icons/Path-Stop.svg</file>
+        <file>icons/Path-ToolBit.svg</file>
         <file>icons/Path-ToolChange.svg</file>
         <file>icons/Path-ToolController.svg</file>
-	<file>icons/Path-ToolDuplicate.svg</file>
+	      <file>icons/Path-ToolDuplicate.svg</file>
         <file>icons/Path-Toolpath.svg</file>
         <file>icons/Path-ToolTable.svg</file>
         <file>icons/Path-Area.svg</file>
@@ -107,6 +108,9 @@
         <file>panels/PointEdit.ui</file>
         <file>panels/SetupGlobal.ui</file>
         <file>panels/SetupOp.ui</file>
+        <file>panels/ToolBitEditor.ui</file>
+        <file>panels/ToolBitLibraryEdit.ui</file>
+        <file>panels/ToolBitSelector.ui</file>
         <file>panels/ToolEditor.ui</file>
         <file>panels/ToolLibraryEditor.ui</file>
         <file>panels/TaskPathSimulator.ui</file>