Merge pull request #658 from jdegenstein/units

Fix MC units and reduce code duplication of UNITS_PER_METER
gumyr · Jul 11, 2024 · f6a3501 · f6a3501
2 parents 28b6689 + 209b772
commit f6a3501
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/build123d/build_common.py b/src/build123d/build_common.py
@@ -92,7 +92,7 @@
 #
 
 # LENGTH CONSTANTS
-MC = 0.0001
+MC = 0.001
 MM = 1
 CM = 10 * MM
 M = 1000 * MM

diff --git a/src/build123d/exporters.py b/src/build123d/exporters.py
@@ -65,6 +65,7 @@
     Vector,
     VectorLike,
 )
+from build123d.build_common import UNITS_PER_METER
 
 PathSegment = Union[PT.Line, PT.Arc, PT.QuadraticBezier, PT.CubicBezier]
 
@@ -249,17 +250,6 @@ def iso_pattern(*args):
     return result
 
 
-# Scale factor to convert various units to meters.
-UNITS_PER_METER = {
-    Unit.IN: 100 / 2.54,
-    Unit.FT: 100 / (12 * 2.54),
-    Unit.MC: 1_000_000,
-    Unit.MM: 1000,
-    Unit.CM: 100,
-    Unit.M: 1,
-}
-
-
 def unit_conversion_scale(from_unit: Unit, to_unit: Unit) -> float:
     """Return the multiplicative conversion factor to go from from_unit to to_unit."""
     result = UNITS_PER_METER[to_unit] / UNITS_PER_METER[from_unit]