diff --git a/src/Mod/CAM/CAMTests/TestPathToolShapeClasses.py b/src/Mod/CAM/CAMTests/TestPathToolShapeClasses.py index 98f73f4b89..dc09140ef7 100644 --- a/src/Mod/CAM/CAMTests/TestPathToolShapeClasses.py +++ b/src/Mod/CAM/CAMTests/TestPathToolShapeClasses.py @@ -320,13 +320,13 @@ class TestPathToolShapeClasses(PathTestWithAssets): def test_toolbitshapethreadmill_defaults(self): """Test ToolBitShapeThreadMill default parameters and labels.""" # Provide a dummy filepath for instantiation. - shape = self._test_shape_common("threadmill") + shape = self._test_shape_common("thread-mill") self.assertEqual(shape["Diameter"].Value, 5.0) self.assertEqual(unit(shape["Diameter"]), "mm") self.assertEqual(shape["cuttingAngle"].Value, 60.0) self.assertEqual(unit(shape["cuttingAngle"]), "°") # Need an instance to get parameter labels, get it from the asset manager - uri = ToolBitShape.resolve_name("threadmill") + uri = ToolBitShape.resolve_name("thread-mill") instance = self.assets.get(uri) self.assertEqual(instance.get_parameter_label("cuttingAngle"), "Cutting angle") @@ -346,7 +346,7 @@ class TestPathToolShapeClasses(PathTestWithAssets): def test_toolbitshapevbit_defaults(self): """Test ToolBitShapeVBit default parameters and labels.""" # Provide a dummy filepath for instantiation. - shape = self._test_shape_common("vbit") + shape = self._test_shape_common("v-bit") self.assertEqual(shape["Diameter"].Value, 10.0) self.assertEqual(unit(shape["Diameter"]), "mm") self.assertEqual(shape["CuttingEdgeAngle"].Value, 90.0) @@ -354,7 +354,7 @@ class TestPathToolShapeClasses(PathTestWithAssets): self.assertEqual(shape["TipDiameter"].Value, 1.0) self.assertEqual(unit(shape["TipDiameter"]), "mm") # Need an instance to get parameter labels, get it from the asset manager - uri = ToolBitShape.resolve_name("vbit") + uri = ToolBitShape.resolve_name("v-bit") instance = self.assets.get(uri) self.assertEqual(instance.get_parameter_label("CuttingEdgeAngle"), "Cutting edge angle") diff --git a/src/Mod/CAM/CMakeLists.txt b/src/Mod/CAM/CMakeLists.txt index 6ba07c39af..b2e1e55ad7 100644 --- a/src/Mod/CAM/CMakeLists.txt +++ b/src/Mod/CAM/CMakeLists.txt @@ -462,10 +462,10 @@ SET(Tools_Shape_SRCS Tools/Shape/slittingsaw.svg Tools/Shape/tap.fcstd Tools/Shape/tap.svg - Tools/Shape/threadmill.fcstd - Tools/Shape/threadmill.svg - Tools/Shape/vbit.fcstd - Tools/Shape/vbit.svg + Tools/Shape/thread-mill.fcstd + Tools/Shape/thread-mill.svg + Tools/Shape/v-bit.fcstd + Tools/Shape/v-bit.svg ) SET(Tests_SRCS diff --git a/src/Mod/CAM/Path/Op/SurfaceSupport.py b/src/Mod/CAM/Path/Op/SurfaceSupport.py index 9962dcdf02..55bce6c161 100644 --- a/src/Mod/CAM/Path/Op/SurfaceSupport.py +++ b/src/Mod/CAM/Path/Op/SurfaceSupport.py @@ -2652,6 +2652,7 @@ class OCL_Tool: "drill": "ConeCutter", "engraver": "ConeCutter", "v_bit": "ConeCutter", + "v-bit": "ConeCutter", "vbit": "ConeCutter", "chamfer": "None", } diff --git a/src/Mod/CAM/Path/Tool/toolbit/serializers/camotics.py b/src/Mod/CAM/Path/Tool/toolbit/serializers/camotics.py index aea9787a19..f5c8f10d15 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/serializers/camotics.py +++ b/src/Mod/CAM/Path/Tool/toolbit/serializers/camotics.py @@ -33,6 +33,7 @@ from ...assets.asset import Asset SHAPEMAP = { "ballend": "Ballnose", "endmill": "Cylindrical", + "v-bit": "Conical", "vbit": "Conical", "chamfer": "Snubnose", } diff --git a/src/Mod/CAM/Tools/Shape/threadmill.fcstd b/src/Mod/CAM/Tools/Shape/thread-mill.fcstd similarity index 100% rename from src/Mod/CAM/Tools/Shape/threadmill.fcstd rename to src/Mod/CAM/Tools/Shape/thread-mill.fcstd diff --git a/src/Mod/CAM/Tools/Shape/threadmill.svg b/src/Mod/CAM/Tools/Shape/thread-mill.svg similarity index 99% rename from src/Mod/CAM/Tools/Shape/threadmill.svg rename to src/Mod/CAM/Tools/Shape/thread-mill.svg index aa811b634c..904d1f3aa5 100644 --- a/src/Mod/CAM/Tools/Shape/threadmill.svg +++ b/src/Mod/CAM/Tools/Shape/thread-mill.svg @@ -5,7 +5,7 @@ viewBox="0 0 210 297" height="297mm" width="210mm" - sodipodi:docname="threadmill.svg" + sodipodi:docname="thread-mill.svg" xml:space="preserve" inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" diff --git a/src/Mod/CAM/Tools/Shape/vbit.fcstd b/src/Mod/CAM/Tools/Shape/v-bit.fcstd similarity index 100% rename from src/Mod/CAM/Tools/Shape/vbit.fcstd rename to src/Mod/CAM/Tools/Shape/v-bit.fcstd diff --git a/src/Mod/CAM/Tools/Shape/vbit.svg b/src/Mod/CAM/Tools/Shape/v-bit.svg similarity index 99% rename from src/Mod/CAM/Tools/Shape/vbit.svg rename to src/Mod/CAM/Tools/Shape/v-bit.svg index 975022b615..e6e327b813 100644 --- a/src/Mod/CAM/Tools/Shape/vbit.svg +++ b/src/Mod/CAM/Tools/Shape/v-bit.svg @@ -5,7 +5,7 @@ viewBox="0 0 210 297" height="297mm" width="210mm" - sodipodi:docname="vbit.svg" + sodipodi:docname="v-bit.svg" xml:space="preserve" inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"