manget hole chamfers for all hole shapes

Author: greg19

freecad/gridfinity_workbench/baseplate_feature_construction.py

@@ -72,13 +72,6 @@ def magnet_holes_properties(obj: fc.DocumentObject) -> None:
         "<br> <br> default = 3 mm",
     ).MagnetBaseHole = const.MAGNET_BASE_HOLE
 
-    obj.addProperty(
-        "App::PropertyLength",
-        "MagnetChamfer",
-        "NonStandard",
-        "Chamfer at top of magnet hole <br> <br> default = 0.4 mm",
-    ).MagnetChamfer = const.MAGNET_CHAMFER
-
     ## Gridfinity Expert Only Parameters
     obj.addProperty(
         "App::PropertyLength",
@@ -229,7 +222,7 @@ def make_connection_holes(obj: fc.DocumentObject, layout: GridfinityLayout) -> P
     return fuse_total
 
 
-def _center_cut_wire(obj: fc.DocumentObject) -> Part.Wire:
+def _center_cut_face(obj: fc.DocumentObject) -> Part.Face:
     """Create wire for the baseplate center cut."""
     x_inframedis = (
         obj.xGridSize / 2
@@ -324,7 +317,7 @@ def _center_cut_wire(obj: fc.DocumentObject) -> Part.Wire:
     l5 = Part.LineSegment(l4.EndPoint, mec_middle)
     l6 = Part.LineSegment(l5.EndPoint, l1.StartPoint)
 
-    return utils.curve_to_wire([l1, ar1, l2, ar2, l3, ar3, l4, l5, l6])
+    return utils.curve_to_face([l1, ar1, l2, ar2, l3, ar3, l4, l5, l6])
 
 
 def center_cut_properties(obj: fc.DocumentObject) -> None:
@@ -339,9 +332,9 @@ def center_cut_properties(obj: fc.DocumentObject) -> None:
 
 def make_center_cut(obj: fc.DocumentObject, layout: GridfinityLayout) -> Part.Shape:
     """Create baseplate center cutout."""
-    wire = _center_cut_wire(obj)
+    face = _center_cut_face(obj)
 
-    partial_shape1 = Part.Face(wire).extrude(fc.Vector(0, 0, -obj.TotalHeight))
+    partial_shape1 = face.extrude(fc.Vector(0, 0, -obj.TotalHeight))
     partial_shape2 = partial_shape1.mirror(fc.Vector(0, 0, 0), fc.Vector(0, 1, 0))
     partial_shape3 = partial_shape1.mirror(fc.Vector(0, 0, 0), fc.Vector(1, 0, 0))
     partial_shape4 = partial_shape2.mirror(fc.Vector(0, 0, 0), fc.Vector(1, 0, 0))

freecad/gridfinity_workbench/const.py

@@ -97,7 +97,6 @@
 MAGNET_EDGE_THICKNESS = 1.2
 MAGNET_BASE = 0.4
 MAGNET_BASE_HOLE = 3
-MAGNET_CHAMFER = 0.4
 
 # Screw Together Baseplate Specific
 CONNECTION_HOLE_DIAMETER = 3.2

freecad/gridfinity_workbench/feature_construction.py

@@ -330,7 +330,7 @@ def make_fillet(rotation: float, translation: fc.Vector) -> Part.Shape:
             Part.LineSegment(v3, v1),
         ]
 
-        face = Part.Face(utils.curve_to_wire(lines))
+        face = utils.curve_to_face(lines)
         face.rotate(fc.Vector(0, 0, 0), fc.Vector(0, 0, 1), rotation)
         face.translate(translation)
         return face.extrude(fc.Vector(0, 0, -obj.TotalHeight))

freecad/gridfinity_workbench/label_shelf.py

@@ -26,7 +26,7 @@ def _corner_fillet(radius: float) -> Part.Face:
         Part.LineSegment(v3, v1),
     ]
 
-    return Part.Face(utils.curve_to_wire(lines))
+    return utils.curve_to_face(lines)
 
 
 def outside_fillet(
@@ -79,7 +79,7 @@ def from_dimensions(
         fc.Vector(0, yoffset, -height),
     ]
 
-    face = Part.Face(utils.curve_to_wire(utils.loop(v)))
+    face = utils.curve_to_face(utils.loop(v))
     shape = face.extrude(fc.Vector(0, length))
 
     # Front fillet

freecad/gridfinity_workbench/magnet_hole.py

@@ -9,19 +9,14 @@
 
 from . import utils
 
+unitmm = fc.Units.Quantity("1 mm")
 
-def _crush_ribs(
-    radius: fc.Units.Quantity,
-    depth: fc.Units.Quantity,
-    *,
-    n: int,
-    beta: float,
-) -> Part.Shape:
-    """Make crush ribs inner shape.
+
+def _crush_ribs(radius: fc.Units.Quantity, *, n: int, beta: float) -> tuple[Part.Face, float]:
+    """Make crush ribs inner face.
 
     Args:
         radius (fc.Units.Quantity): Inner radius.
-        depth (fc.Units.Quantity): Depth.
         n (int): Number of ribs.
         beta (float): Waviness of the ribs. It is the angle at wich inner at outer arcs meet.
         A value of 0 would result in a perfect circle.
@@ -52,14 +47,10 @@ def get_midpoint(beta: float) -> float:
             math.degrees((i + 0.5) / len(lines) * 2 * math.pi),
         )
         arc.rotate(placement)
-    wire = utils.curve_to_wire(lines)
-    face = Part.Face(wire)
-    shape = face.extrude(fc.Vector(0, 0, depth))
-
-    return shape
+    return utils.curve_to_face(lines), r3 - r1
 
 
-def _hex_shape(radius: fc.Units.Quantity, depth: fc.Units.Quantity) -> Part.Shape:
+def _hex_shape(radius: fc.Units.Quantity) -> Part.Shape:
     # Ratio of 2/sqrt(3) converts from inscribed circle radius to circumscribed
     # circle radius
     radius = 2 * radius / math.sqrt(3)
@@ -70,7 +61,7 @@ def _hex_shape(radius: fc.Units.Quantity, depth: fc.Units.Quantity) -> Part.Shap
     p.recompute()
 
     p_wire: Part.Wire = p.Shape
-    shape = Part.Face(p_wire).extrude(fc.Vector(0, 0, depth))
+    shape = Part.Face(p_wire)
     fc.ActiveDocument.removeObject(p.Name)
     return shape
 
@@ -83,25 +74,31 @@ def from_obj(obj: fc.DocumentObject) -> Part.Shape:
     hole_shape = obj.MagnetHolesShape
     radius = obj.MagnetHoleDiameter / 2
     depth = obj.MagnetHoleDepth
+    chamfer_depth = depth / 8
 
     if hole_shape == "Hex":
-        shape = _hex_shape(radius, depth)
+        shape = _hex_shape(radius)
+        chamfer_width = (2 / math.sqrt(3) - 1) * radius
     elif hole_shape == "Crush ribs":
-        shape = _crush_ribs(radius, depth, n=8, beta=0.5 * math.pi / 2)
+        shape, ch = _crush_ribs(radius, n=8, beta=0.5 * math.pi / 2)
+        chamfer_width = ch * unitmm
     elif hole_shape == "Round":
-        shape = Part.makeCylinder(radius, depth)
-        if obj.Baseplate:
-            chamfer = obj.MagnetChamfer
-            chamfer_shape = utils.round_chamfer(
-                radius,
-                radius + chamfer,
-                chamfer,
-                pPnt=fc.Vector(0, 0, depth - chamfer),
-            )
-            shape = shape.fuse(chamfer_shape)
+        shape = Part.Face(Part.Wire(Part.makeCircle(radius)))
+        chamfer_width = chamfer_depth
     else:
         raise ValueError(f"Unrecognised magnet hole shape {hole_shape:!r}")
 
+    shape = shape.extrude(fc.Vector(0, 0, depth))
+
+    if obj.Baseplate:
+        chamfer_shape = utils.round_chamfer(
+            radius,
+            radius + chamfer_width,
+            chamfer_depth,
+            pPnt=fc.Vector(0, 0, depth - chamfer_depth),
+        )
+        shape = shape.fuse(chamfer_shape)
+
     return shape
 
 
@@ -125,8 +122,7 @@ def relief(obj: fc.DocumentObject) -> Part.Shape:
         Part.LineSegment(p4, p5),
         Part.LineSegment(p5, p1),
     ]
-    wire = utils.curve_to_wire(lines)
-    face = Part.Face(wire)
+    face = utils.curve_to_face(lines)
     shape = face.extrude(fc.Vector(0, 0, obj.MagnetHoleDepth))
 
     positions = [

freecad/gridfinity_workbench/utils.py

@@ -115,23 +115,22 @@ def copy_in_grid(
     return multi_fuse(shapes)
 
 
-def curve_to_wire(list_of_items: Sequence[Part.TrimmedCurve]) -> Part.Wire:
-    """Make a wire from curves (line,linesegment,arc,ect).
+def curve_to_face(curves: Sequence[Part.TrimmedCurve]) -> Part.Face:
+    """Make a face from curves (line,linesegment,arc,ect).
 
-    This function accepts all curves and makes it into a wire. Note that the wire should be
-    closed.
+    Note that the sequence should be a closed curve -- the end of last curve should be the beginning
+    of the first one.
 
     Args:
-        list_of_items (list[Part.LineSegment]): List of items to convert in a wire.
-
-    Returns:
-        Part.Wire: The created wire.
+        curves (Sequence[Part.LineSegment]): Sequence of corves to that enclose the face.
 
     """
-    if not list_of_items:
+    if not curves:
         raise ValueError("List is empty")
+    if curves[0].StartPoint != curves[-1].EndPoint:
+        raise ValueError("The sequence is not a closed curve")
 
-    return Part.Wire([item.toShape() for item in list_of_items])
+    return Part.Face(Part.Wire([item.toShape() for item in curves]))
 
 
 def create_rounded_rectangle(

tests/test_unit_utils.py

@@ -63,29 +63,8 @@ def test_copy_in_grid(self) -> None:
         )
         self.assertEqual(shapes, shape.translated().multiFuse())
 
-    def test_curve_to_wire_empty_list(self) -> None:
-        self.assertRaises(ValueError, utils.curve_to_wire, [])
-
-    def test_curve_to_wire_one_line(self) -> None:
-        vertexes = [fc.Vector(0, 0, 0), fc.Vector(10, 0, 0)]
-        line = Part.LineSegment(vertexes[0], vertexes[1])
-
-        wire = utils.curve_to_wire([line])
-
-        self.assertEqual(wire.Length, 10)
-        self.assertListEqual(vertexes, [vertex.Point for vertex in wire.Vertexes])
-
-    def test_cuve_to_wire_rectangle(self) -> None:
-        line_1 = Part.LineSegment(fc.Vector(0, 0, 0), fc.Vector(10, 0, 0))
-        line_2 = Part.LineSegment(fc.Vector(10, 0, 0), fc.Vector(10, 10, 0))
-        line_3 = Part.LineSegment(fc.Vector(10, 10, 0), fc.Vector(10, 0, 0))
-        line_4 = Part.LineSegment(fc.Vector(10, 0, 0), fc.Vector(0, 0, 0))
-
-        wire = utils.curve_to_wire([line_1, line_2, line_3, line_4])
-
-        self.assertTrue(wire.isClosed)
-        self.assertEqual(wire.Length, 10 * 4)
-        self.assertEqual(len(wire.Edges), 4)
+    def test_curve_to_face_empty_list(self) -> None:
+        self.assertRaises(ValueError, utils.curve_to_face, [])
 
     def test_create_rounded_rectangle_radius_1(self) -> None:
         length, width, radius = 5, 6, 1