Revert "Enhanced make_face so faces can have holes. Added BoundBox.measure"

This reverts commit a5e95fe72f.

src/build123d/geometry.py

@@ -41,7 +41,7 @@ import json
 import logging
 import warnings
 from collections.abc import Callable, Iterable, Sequence
-from math import degrees, isclose, log10, pi, radians, prod
+from math import degrees, isclose, log10, pi, radians
 from typing import TYPE_CHECKING, Any, TypeAlias, overload
 
 import numpy as np
@@ -1001,16 +1001,6 @@ class BoundBox:
         self.max = Vector(x_max, y_max, z_max)  #: location of maximum corner
         self.size = Vector(x_max - x_min, y_max - y_min, z_max - z_min)  #: overall size
 
-    @property
-    def measure(self) -> float:
-        """Return the overall Lebesgue measure of the bounding box.
-
-        - For 1D objects: length
-        - For 2D objects: area
-        - For 3D objects: volume
-        """
-        return prod([x for x in self.size if x > TOLERANCE])
-
     @property
     def diagonal(self) -> float:
         """body diagonal length (i.e. object maximum size)"""

src/build123d/operations_sketch.py

@@ -44,7 +44,6 @@ from build123d.topology import (
     Sketch,
     topo_explore_connected_edges,
     topo_explore_common_vertex,
-    edges_to_wires,
 )
 from build123d.geometry import Plane, Vector, TOLERANCE
 from build123d.build_common import flatten_sequence, validate_inputs
@@ -201,33 +200,26 @@ def make_face(
 ) -> Sketch:
     """Sketch Operation: make_face
 
-    Create a face from the given edges.
+    Create a face from the given perimeter edges.
 
     Args:
-        edges (Edge): sequence of edges. Defaults to all sketch pending edges.
+        edges (Edge): sequence of perimeter edges. Defaults to all
+            sketch pending edges.
         mode (Mode, optional): combination mode. Defaults to Mode.ADD.
     """
     context: BuildSketch | None = BuildSketch._get_context("make_face")
 
     if edges is not None:
-        raw_edges = flatten_sequence(edges)
+        outer_edges = flatten_sequence(edges)
     elif context is not None:
-        raw_edges = context.pending_edges
+        outer_edges = context.pending_edges
     else:
         raise ValueError("No objects to create a face")
-    if not raw_edges:
+    if not outer_edges:
-        raise ValueError("No objects to create a face")
+        raise ValueError("No objects to create a hull")
-    validate_inputs(context, "make_face", raw_edges)
+    validate_inputs(context, "make_face", outer_edges)
 
-    wires = list(
+    pending_face = Face(Wire.combine(outer_edges)[0])
-        edges_to_wires(raw_edges).sort_by(
-            lambda w: w.bounding_box().measure, reverse=True
-        )
-    )
-    if len(wires) > 1:
-        pending_face = Face(wires[0], wires[1:])
-    else:
-        pending_face = Face(wires[0])
     if pending_face.normal_at().Z < 0:  # flip up-side-down faces
         pending_face = -pending_face
 

tests/test_build_sketch.py

@@ -168,17 +168,6 @@ class TestUpSideDown(unittest.TestCase):
         sketch = make_face(wire.edges())
         self.assertTrue(sketch.faces()[0].normal_at().Z > 0)
 
-    def test_make_face_with_holes(self):
-        with BuildSketch() as skt:
-            with BuildLine() as perimeter:
-                CenterArc((0, 0), 3, 0, 360)
-            with BuildLine() as hole1:
-                Polyline((-1, 1), (1, 1), (1, 2), (-1, 2), (-1, 1))
-            with BuildLine() as hole2:
-                Airfoil("4020")
-            make_face()
-        self.assertEqual(len(skt.face().inner_wires()), 2)
-
 
 class TestBuildSketchExceptions(unittest.TestCase):
     """Test exception handling"""

tests/test_direct_api/test_bound_box.py

@@ -43,7 +43,6 @@ class TestBoundBox(unittest.TestCase):
 
         # OCC uses some approximations
         self.assertAlmostEqual(bb1.size.X, 1.0, 1)
-        self.assertAlmostEqual(bb1.measure, 1.0, 5)
 
         # Test adding to an existing bounding box
         v0 = Vertex(0, 0, 0)
@@ -51,7 +50,6 @@ class TestBoundBox(unittest.TestCase):
 
         bb3 = bb1.add(bb2)
         self.assertAlmostEqual(bb3.size, (2, 2, 2), 7)
-        self.assertAlmostEqual(bb3.measure, 8, 5)
 
         bb3 = bb2.add((3, 3, 3))
         self.assertAlmostEqual(bb3.size, (3, 3, 3), 7)
@@ -63,7 +61,6 @@ class TestBoundBox(unittest.TestCase):
         bb1 = Vertex(1, 1, 0).bounding_box().add(Vertex(2, 2, 0).bounding_box())
         bb2 = Vertex(0, 0, 0).bounding_box().add(Vertex(3, 3, 0).bounding_box())
         bb3 = Vertex(0, 0, 0).bounding_box().add(Vertex(1.5, 1.5, 0).bounding_box())
-        self.assertAlmostEqual(bb2.measure, 9, 5)
         # Test that bb2 contains bb1
         self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb1, bb2))
         self.assertEqual(bb2, BoundBox.find_outside_box_2d(bb2, bb1))