diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py index fcff3facaa..12fc57f7d5 100644 --- a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py +++ b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py @@ -38,7 +38,8 @@ class CommandToolBitSelectorOpen: return {'Pixmap': 'Path-ToolTable', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "ToolBit Dock"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Toggle the Toolbit Dock"), - 'Accel': "P, T"} + 'Accel': "P, T", + 'CmdType': "ForEdit"} def IsActive(self): return FreeCAD.ActiveDocument is not None @@ -66,7 +67,8 @@ class CommandToolBitLibraryOpen: def GetResources(self): return {'Pixmap': 'Path-ToolTable', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "ToolBit Library editor"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Open an editor to manage ToolBit libraries")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Open an editor to manage ToolBit libraries"), + 'CmdType': "ForEdit"} def IsActive(self): return FreeCAD.ActiveDocument is not None diff --git a/src/Mod/Path/Tools/Bit/45 degree chamfer.fctb b/src/Mod/Path/Tools/Bit/45 degree chamfer.fctb new file mode 100644 index 0000000000..6c1231ed0f --- /dev/null +++ b/src/Mod/Path/Tools/Bit/45 degree chamfer.fctb @@ -0,0 +1,14 @@ +{ + "version": 2, + "name": "45 Deg. Chamfer", + "shape": "chamfer.fcstd", + "parameter": { + "CuttingEdgeAngle": "45.0000 \u00b0", + "CuttingEdgeHeight": "6.3500 mm", + "Diameter": "12.3323 mm", + "FlatRadius": "5.0000 mm", + "Length": "30.0000 mm", + "ShankDiameter": "6.3500 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/5mm Drill.fctb b/src/Mod/Path/Tools/Bit/5mm Drill.fctb new file mode 100644 index 0000000000..40243399a2 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/5mm Drill.fctb @@ -0,0 +1,11 @@ +{ + "version": 2, + "name": "5mm Drill", + "shape": "drill.fcstd", + "parameter": { + "Diameter": "5.0000 mm", + "Length": "50.0000 mm", + "TipAngle": "119.0000 \u00b0" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/5mm Endmill.fctb b/src/Mod/Path/Tools/Bit/5mm Endmill.fctb new file mode 100644 index 0000000000..8c7a208e28 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/5mm Endmill.fctb @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "Endmill", + "shape": "endmill.fcstd", + "parameter": { + "CuttingEdgeHeight": "30.0000 mm", + "Diameter": "5.0000 mm", + "Length": "50.0000 mm", + "ShankDiameter": "3.0000 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/6 mm Bullnose.fctb b/src/Mod/Path/Tools/Bit/6 mm Bullnose.fctb new file mode 100644 index 0000000000..05d80b1d2a --- /dev/null +++ b/src/Mod/Path/Tools/Bit/6 mm Bullnose.fctb @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "6 mm Bull Nose", + "shape": "bullnose.fcstd", + "parameter": { + "CuttingEdgeHeight": "40.0000 mm", + "Diameter": "6.0000 mm", + "FlatRadius": "1.5000 mm", + "Length": "50.0000 mm", + "ShankDiameter": "3.0000 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/60 degree Vbit.fctb b/src/Mod/Path/Tools/Bit/60 degree Vbit.fctb new file mode 100644 index 0000000000..715361ec34 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/60 degree Vbit.fctb @@ -0,0 +1,14 @@ +{ + "version": 2, + "name": "60 Deg. V-Bit", + "shape": "v-bit.fcstd", + "parameter": { + "CuttingEdgeAngle": "60.0000 \u00b0", + "Diameter": "10.0000 mm", + "FlatHeight": "1.0000 mm", + "FlatRadius": "0.5000 mm", + "Length": "20.0000 mm", + "ShankDiameter": "5.0000 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/6mm Ball End.fctb b/src/Mod/Path/Tools/Bit/6mm Ball End.fctb new file mode 100644 index 0000000000..9e9afbabc8 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/6mm Ball End.fctb @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "6mm Ball End", + "shape": "ballend.fcstd", + "parameter": { + "CuttingEdgeHeight": "40.0000 mm", + "Diameter": "6.0000 mm", + "Length": "50.0000 mm", + "ShankDiameter": "3.0000 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/probe.fctb b/src/Mod/Path/Tools/Bit/probe.fctb new file mode 100644 index 0000000000..ebebaf4ee6 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/probe.fctb @@ -0,0 +1,11 @@ +{ + "version": 2, + "name": "Probe004", + "shape": "probe.FCStd", + "parameter": { + "Diameter": "6.0000 mm", + "Length": "50.0000 mm", + "ShaftDiameter": "4.0000 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/slittingsaw.fctb b/src/Mod/Path/Tools/Bit/slittingsaw.fctb new file mode 100644 index 0000000000..3a74354076 --- /dev/null +++ b/src/Mod/Path/Tools/Bit/slittingsaw.fctb @@ -0,0 +1,14 @@ +{ + "version": 2, + "name": "Slitting Saw", + "shape": "SlittingSaw.fcstd", + "parameter": { + "BladeThickness": "3.0000 mm", + "BoltHeight": "3.0000 mm", + "BoltWidth": "8.0000 mm", + "Diameter": "76.2000 mm", + "Length": "50.0000 mm", + "ShankDiameter": "19.0500 mm" + }, + "attribute": {} +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Bit/t1.fctb b/src/Mod/Path/Tools/Bit/t1.fctb deleted file mode 100644 index 9221229563..0000000000 --- a/src/Mod/Path/Tools/Bit/t1.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 2, - "name": "T1", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "1.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t2.fctb b/src/Mod/Path/Tools/Bit/t2.fctb deleted file mode 100644 index 1c70485e5c..0000000000 --- a/src/Mod/Path/Tools/Bit/t2.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T2", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "2.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t3.fctb b/src/Mod/Path/Tools/Bit/t3.fctb deleted file mode 100644 index 86e6bf1110..0000000000 --- a/src/Mod/Path/Tools/Bit/t3.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 2, - "name": "T3", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "3.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t4.fctb b/src/Mod/Path/Tools/Bit/t4.fctb deleted file mode 100644 index c97b20feed..0000000000 --- a/src/Mod/Path/Tools/Bit/t4.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T4", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "4.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t5.fctb b/src/Mod/Path/Tools/Bit/t5.fctb deleted file mode 100644 index 014ebea50c..0000000000 --- a/src/Mod/Path/Tools/Bit/t5.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T5", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "5.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t6.fctb b/src/Mod/Path/Tools/Bit/t6.fctb deleted file mode 100644 index 521b489554..0000000000 --- a/src/Mod/Path/Tools/Bit/t6.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T6", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "6.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t7.fctb b/src/Mod/Path/Tools/Bit/t7.fctb deleted file mode 100644 index b10067d4aa..0000000000 --- a/src/Mod/Path/Tools/Bit/t7.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T7", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "7.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t8.fctb b/src/Mod/Path/Tools/Bit/t8.fctb deleted file mode 100644 index 2ad54eb330..0000000000 --- a/src/Mod/Path/Tools/Bit/t8.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T8", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "8.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Bit/t9.fctb b/src/Mod/Path/Tools/Bit/t9.fctb deleted file mode 100644 index 3a3dbc3f78..0000000000 --- a/src/Mod/Path/Tools/Bit/t9.fctb +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "name": "T9", - "shape": "endmill.fcstd", - "attribute": {}, - "parameter": { - "CuttingEdgeHeight": "30.000 mm", - "Diameter": "9.000 mm", - "Length": "50.000 mm", - "ShankDiameter": "3.000 mm" - } -} diff --git a/src/Mod/Path/Tools/Library/Default.fctl b/src/Mod/Path/Tools/Library/Default.fctl new file mode 100644 index 0000000000..f0a35ef51f --- /dev/null +++ b/src/Mod/Path/Tools/Library/Default.fctl @@ -0,0 +1,37 @@ +{ + "tools": [ + { + "nr": 1, + "path": "5mm Endmill.fctb" + }, + { + "nr": 2, + "path": "5mm Drill.fctb" + }, + { + "nr": 3, + "path": "6mm Ball End.fctb" + }, + { + "nr": 4, + "path": "6 mm Bullnose.fctb" + }, + { + "nr": 5, + "path": "60 degree Vbit.fctb" + }, + { + "nr": 6, + "path": "45 degree chamfer.fctb" + }, + { + "nr": 7, + "path": "slittingsaw.fctb" + }, + { + "nr": 8, + "path": "probe.fctb" + } + ], + "version": 1 +} \ No newline at end of file diff --git a/src/Mod/Path/Tools/Library/endmills.fctl b/src/Mod/Path/Tools/Library/endmills.fctl deleted file mode 100644 index c443e6cd10..0000000000 --- a/src/Mod/Path/Tools/Library/endmills.fctl +++ /dev/null @@ -1,41 +0,0 @@ -{ - "tools": [ - { - "nr": 1, - "path": "t1.fctb" - }, - { - "nr": 2, - "path": "t2.fctb" - }, - { - "nr": 3, - "path": "t3.fctb" - }, - { - "nr": 4, - "path": "t4.fctb" - }, - { - "nr": 5, - "path": "t5.fctb" - }, - { - "nr": 6, - "path": "t6.fctb" - }, - { - "nr": 7, - "path": "t7.fctb" - }, - { - "nr": 8, - "path": "t8.fctb" - }, - { - "nr": 9, - "path": "t9.fctb" - } - ], - "version": 1 -} diff --git a/src/Mod/Path/Tools/Shape/SlittingSaw.fcstd b/src/Mod/Path/Tools/Shape/SlittingSaw.fcstd new file mode 100644 index 0000000000..81d3d7f3d9 Binary files /dev/null and b/src/Mod/Path/Tools/Shape/SlittingSaw.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/ballend.fcstd b/src/Mod/Path/Tools/Shape/ballend.fcstd index 430a6f8160..79cbd68605 100644 Binary files a/src/Mod/Path/Tools/Shape/ballend.fcstd and b/src/Mod/Path/Tools/Shape/ballend.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/bullnose.fcstd b/src/Mod/Path/Tools/Shape/bullnose.fcstd index a97cacde63..c2f7240b72 100644 Binary files a/src/Mod/Path/Tools/Shape/bullnose.fcstd and b/src/Mod/Path/Tools/Shape/bullnose.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/chamfer.fcstd b/src/Mod/Path/Tools/Shape/chamfer.fcstd new file mode 100644 index 0000000000..a6acac7a43 Binary files /dev/null and b/src/Mod/Path/Tools/Shape/chamfer.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/drill.fcstd b/src/Mod/Path/Tools/Shape/drill.fcstd index 75f7573829..aa2a626d02 100644 Binary files a/src/Mod/Path/Tools/Shape/drill.fcstd and b/src/Mod/Path/Tools/Shape/drill.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/endmill.fcstd b/src/Mod/Path/Tools/Shape/endmill.fcstd index 79acaf72fc..8e258621ba 100644 Binary files a/src/Mod/Path/Tools/Shape/endmill.fcstd and b/src/Mod/Path/Tools/Shape/endmill.fcstd differ diff --git a/src/Mod/Path/Tools/Shape/probe.FCStd b/src/Mod/Path/Tools/Shape/probe.FCStd new file mode 100644 index 0000000000..5f853f415b Binary files /dev/null and b/src/Mod/Path/Tools/Shape/probe.FCStd differ diff --git a/src/Mod/Path/Tools/Shape/v-bit.fcstd b/src/Mod/Path/Tools/Shape/v-bit.fcstd index 6a333a871c..5d35188c81 100644 Binary files a/src/Mod/Path/Tools/Shape/v-bit.fcstd and b/src/Mod/Path/Tools/Shape/v-bit.fcstd differ