Face.makeFromWires - check that wires are closed

Author: lorenzncode

cadquery/occ_impl/shapes.py

@@ -2260,6 +2260,9 @@ def makeFromWires(cls, outerWire: Wire, innerWires: List[Wire] = []) -> "Face":
         Makes a planar face from one or more wires
         """
 
+        if innerWires and not outerWire.IsClosed():
+            raise ValueError("Cannot build face(s): outer wire is not closed")
+
         # check if wires are coplanar
         ws = Compound.makeCompound([outerWire] + innerWires)
         if not BRepLib_FindSurface(ws.wrapped, OnlyPlane=True).Found():
@@ -2273,6 +2276,8 @@ def makeFromWires(cls, outerWire: Wire, innerWires: List[Wire] = []) -> "Face":
         face_builder = BRepBuilderAPI_MakeFace(wo, True)
 
         for w in innerWires:
+            if not w.IsClosed():
+                raise ValueError("Cannot build face(s): inner wire is not closed")
             face_builder.Add(w.wrapped)
 
         face_builder.Build()

tests/test_cadquery.py

@@ -4782,6 +4782,56 @@ def test2Dchamfer(self):
         with raises(ValueError):
             r.chamfer2D(0.25, [vs[0]])
 
+    def test_Face_makeFromWires(self):
+
+        w0 = Wire.assembleEdges(
+            [
+                Edge.makeLine(Vector(), Vector(0, 1)),
+                Edge.makeLine(Vector(0, 1), Vector(1, 1)),
+                Edge.makeLine(Vector(1, 1), Vector(1, 0)),
+                Edge.makeLine(Vector(1, 0), Vector(0, 0)),
+            ]
+        )
+        w1 = Wire.assembleEdges(
+            [
+                Edge.makeLine(Vector(0.25, 0.25), Vector(0.25, 0.75)),
+                Edge.makeLine(Vector(0.25, 0.75), Vector(0.75, 0.75)),
+                Edge.makeLine(Vector(0.75, 0.75), Vector(0.75, 0.25)),
+                Edge.makeLine(Vector(0.75, 0.25), Vector(0.25, 0.25)),
+            ]
+        )
+        f = Face.makeFromWires(w0, [w1])
+        assert f.isValid()
+
+        with raises(ValueError):
+            w0 = Wire.assembleEdges([Edge.makeLine(Vector(), Vector(0, 1)),])
+            w1 = Wire.assembleEdges([Edge.makeLine(Vector(0, 1), Vector(1, 1)),])
+            f = Face.makeFromWires(w0, [w1])
+
+        with raises(ValueError):
+            w0 = Wire.assembleEdges([Edge.makeLine(Vector(), Vector(0, 1)),])
+            w1 = Wire.assembleEdges(
+                [
+                    Edge.makeLine(Vector(), Vector(1, 1)),
+                    Edge.makeLine(Vector(1, 1), Vector(2, 0)),
+                    Edge.makeLine(Vector(2, 0), Vector(0, 0)),
+                ]
+            )
+            f = Face.makeFromWires(w0, [w1])
+
+        with raises(ValueError):
+            w0 = Wire.assembleEdges(
+                [
+                    Edge.makeLine(Vector(), Vector(1, 1)),
+                    Edge.makeLine(Vector(1, 1), Vector(2, 0)),
+                    Edge.makeLine(Vector(2, 0), Vector(0, 0)),
+                ]
+            )
+            w1 = Wire.assembleEdges(
+                [Edge.makeLine(Vector(0.1, 0.1), Vector(0.2, 0.2)),]
+            )
+            f = Face.makeFromWires(w0, [w1])
+
     def testSplineApprox(self):
 
         from .naca import naca5305

tests/test_importers.py

@@ -84,8 +84,9 @@ def testImportDXF(self):
 
         filename = os.path.join(testdataDir, "gear.dxf")
 
-        obj = importers.importDXF(filename)
-        self.assertFalse(obj.val().isValid())
+        with self.assertRaises(ValueError):
+            # tol >~ 2e-4 required for closed wires
+            obj = importers.importDXF(filename)
 
         obj = importers.importDXF(filename, tol=1e-3)
         self.assertTrue(obj.val().isValid())

tests/test_sketch.py

@@ -344,6 +344,12 @@ def test_assemble():
     s1.segment((0.0, 0), (0.0, 2.0))
     s1.segment(Vector(4.0, -1)).close().arc((0.7, 0.6), 0.4, 0.0, 360.0).assemble()
 
+    s2 = Sketch()
+    s2.segment((0, 0), (1, 0))
+    s2.segment((2, 0), (3, 0))
+    with raises(ValueError):
+        s2.assemble()
+
 
 def test_finalize():