From 9cc83b4d149cf2d676ff49a4556d107afb1309d5 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 16 Nov 2020 11:22:06 -0600 Subject: [PATCH] fix toolbit install --- src/Mod/Path/CMakeLists.txt | 22 ++++++++++-------- ...ree chamfer.fctb => 45degree_chamfer.fctb} | 0 .../Bit/{5mm Drill.fctb => 5mm_Drill.fctb} | 0 .../{5mm Endmill.fctb => 5mm_Endmill.fctb} | 4 ++-- ...60 degree Vbit.fctb => 60degree_Vbit.fctb} | 0 .../{6mm Ball End.fctb => 6mm_Ball_End.fctb} | 0 .../{6 mm Bullnose.fctb => 6mm_Bullnose.fctb} | 0 src/Mod/Path/Tools/Bit/probe.fctb | 4 ++-- src/Mod/Path/Tools/Bit/slittingsaw.fctb | 4 ++-- src/Mod/Path/Tools/Library/Default.fctl | 14 +++++------ .../Tools/Shape/{probe.FCStd => probe.fcstd} | Bin .../{SlittingSaw.fcstd => slittingsaw.fcstd} | Bin 12 files changed, 25 insertions(+), 23 deletions(-) rename src/Mod/Path/Tools/Bit/{45 degree chamfer.fctb => 45degree_chamfer.fctb} (100%) rename src/Mod/Path/Tools/Bit/{5mm Drill.fctb => 5mm_Drill.fctb} (100%) rename src/Mod/Path/Tools/Bit/{5mm Endmill.fctb => 5mm_Endmill.fctb} (88%) rename src/Mod/Path/Tools/Bit/{60 degree Vbit.fctb => 60degree_Vbit.fctb} (100%) rename src/Mod/Path/Tools/Bit/{6mm Ball End.fctb => 6mm_Ball_End.fctb} (100%) rename src/Mod/Path/Tools/Bit/{6 mm Bullnose.fctb => 6mm_Bullnose.fctb} (100%) rename src/Mod/Path/Tools/Shape/{probe.FCStd => probe.fcstd} (100%) rename src/Mod/Path/Tools/Shape/{SlittingSaw.fcstd => slittingsaw.fcstd} (100%) diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 5b88d574de..7046290c7b 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -154,26 +154,28 @@ SET(PathScripts_post_SRCS ) 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 + Tools/Bit/45degree_chamfer.fctb + Tools/Bit/5mm_Drill.fctb + Tools/Bit/5mm_Endmill.fctb + Tools/Bit/60degree_Vbit.fctb + Tools/Bit/6mm_Ball_End.fctb + Tools/Bit/6mm_Bullnose.fctb + Tools/Bit/slittingsaw.fctb + Tools/Bit/probe.fctb ) SET(Tools_Library_SRCS - Tools/Library/endmills.fctl + Tools/Library/Default.fctl ) SET(Tools_Shape_SRCS Tools/Shape/ballend.fcstd Tools/Shape/bullnose.fcstd Tools/Shape/drill.fcstd + Tools/Shape/chamfer.fcstd Tools/Shape/endmill.fcstd + Tools/Shape/probe.fcstd + Tools/Shape/slittingsaw.fcstd Tools/Shape/v-bit.fcstd ) diff --git a/src/Mod/Path/Tools/Bit/45 degree chamfer.fctb b/src/Mod/Path/Tools/Bit/45degree_chamfer.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/45 degree chamfer.fctb rename to src/Mod/Path/Tools/Bit/45degree_chamfer.fctb diff --git a/src/Mod/Path/Tools/Bit/5mm Drill.fctb b/src/Mod/Path/Tools/Bit/5mm_Drill.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/5mm Drill.fctb rename to src/Mod/Path/Tools/Bit/5mm_Drill.fctb diff --git a/src/Mod/Path/Tools/Bit/5mm Endmill.fctb b/src/Mod/Path/Tools/Bit/5mm_Endmill.fctb similarity index 88% rename from src/Mod/Path/Tools/Bit/5mm Endmill.fctb rename to src/Mod/Path/Tools/Bit/5mm_Endmill.fctb index 8c7a208e28..7cc72ba33c 100644 --- a/src/Mod/Path/Tools/Bit/5mm Endmill.fctb +++ b/src/Mod/Path/Tools/Bit/5mm_Endmill.fctb @@ -1,6 +1,6 @@ { "version": 2, - "name": "Endmill", + "name": "5mm Endmill", "shape": "endmill.fcstd", "parameter": { "CuttingEdgeHeight": "30.0000 mm", @@ -9,4 +9,4 @@ "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/60degree_Vbit.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/60 degree Vbit.fctb rename to src/Mod/Path/Tools/Bit/60degree_Vbit.fctb diff --git a/src/Mod/Path/Tools/Bit/6mm Ball End.fctb b/src/Mod/Path/Tools/Bit/6mm_Ball_End.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/6mm Ball End.fctb rename to src/Mod/Path/Tools/Bit/6mm_Ball_End.fctb diff --git a/src/Mod/Path/Tools/Bit/6 mm Bullnose.fctb b/src/Mod/Path/Tools/Bit/6mm_Bullnose.fctb similarity index 100% rename from src/Mod/Path/Tools/Bit/6 mm Bullnose.fctb rename to src/Mod/Path/Tools/Bit/6mm_Bullnose.fctb diff --git a/src/Mod/Path/Tools/Bit/probe.fctb b/src/Mod/Path/Tools/Bit/probe.fctb index ebebaf4ee6..b92828e7ac 100644 --- a/src/Mod/Path/Tools/Bit/probe.fctb +++ b/src/Mod/Path/Tools/Bit/probe.fctb @@ -1,11 +1,11 @@ { "version": 2, "name": "Probe004", - "shape": "probe.FCStd", + "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 index 3a74354076..e9d33fe571 100644 --- a/src/Mod/Path/Tools/Bit/slittingsaw.fctb +++ b/src/Mod/Path/Tools/Bit/slittingsaw.fctb @@ -1,7 +1,7 @@ { "version": 2, "name": "Slitting Saw", - "shape": "SlittingSaw.fcstd", + "shape": "slittingsaw.fcstd", "parameter": { "BladeThickness": "3.0000 mm", "BoltHeight": "3.0000 mm", @@ -11,4 +11,4 @@ "ShankDiameter": "19.0500 mm" }, "attribute": {} -} \ No newline at end of file +} diff --git a/src/Mod/Path/Tools/Library/Default.fctl b/src/Mod/Path/Tools/Library/Default.fctl index f0a35ef51f..b3b8ea23c4 100644 --- a/src/Mod/Path/Tools/Library/Default.fctl +++ b/src/Mod/Path/Tools/Library/Default.fctl @@ -2,27 +2,27 @@ "tools": [ { "nr": 1, - "path": "5mm Endmill.fctb" + "path": "5mm_Endmill.fctb" }, { "nr": 2, - "path": "5mm Drill.fctb" + "path": "5mm_Drill.fctb" }, { "nr": 3, - "path": "6mm Ball End.fctb" + "path": "6mm_Ball_End.fctb" }, { "nr": 4, - "path": "6 mm Bullnose.fctb" + "path": "6mm_Bullnose.fctb" }, { "nr": 5, - "path": "60 degree Vbit.fctb" + "path": "60degree_Vbit.fctb" }, { "nr": 6, - "path": "45 degree chamfer.fctb" + "path": "45degree_chamfer.fctb" }, { "nr": 7, @@ -34,4 +34,4 @@ } ], "version": 1 -} \ No newline at end of file +} diff --git a/src/Mod/Path/Tools/Shape/probe.FCStd b/src/Mod/Path/Tools/Shape/probe.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/probe.FCStd rename to src/Mod/Path/Tools/Shape/probe.fcstd diff --git a/src/Mod/Path/Tools/Shape/SlittingSaw.fcstd b/src/Mod/Path/Tools/Shape/slittingsaw.fcstd similarity index 100% rename from src/Mod/Path/Tools/Shape/SlittingSaw.fcstd rename to src/Mod/Path/Tools/Shape/slittingsaw.fcstd