From 7a614cb45ad807315c5dbc8165ca2584365ab8f2 Mon Sep 17 00:00:00 2001 From: Samuel Abels Date: Sun, 29 Jun 2025 11:52:07 +0200 Subject: [PATCH] CAM: store tool quantities in user units, not metric --- src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py | 2 +- src/Mod/CAM/Path/Tool/toolbit/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py b/src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py index 773641c33e..b2d36cb7ca 100644 --- a/src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py +++ b/src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py @@ -96,7 +96,7 @@ class TestFCTBSerializer(_BaseToolBitSerializerTestCase): self.assertEqual(data.get("name"), "Test Tool") self.assertEqual(data.get("shape"), "endmill.fcstd") self.assertEqual(data.get("parameter", {}).get("Diameter"), "4.12 mm") - self.assertEqual(data.get("parameter", {}).get("Length"), "15.0 mm", data) + self.assertEqual(data.get("parameter", {}).get("Length"), "15.00 mm", data) def test_extract_dependencies(self): """Test dependency extraction for FCTB.""" diff --git a/src/Mod/CAM/Path/Tool/toolbit/util.py b/src/Mod/CAM/Path/Tool/toolbit/util.py index 3a81493ee2..03976184de 100644 --- a/src/Mod/CAM/Path/Tool/toolbit/util.py +++ b/src/Mod/CAM/Path/Tool/toolbit/util.py @@ -25,7 +25,7 @@ import FreeCAD def to_json(value): """Convert a value to JSON format.""" if isinstance(value, FreeCAD.Units.Quantity): - return str(value) + return value.UserString return value