Implement close for wires

Author: adam-urbanczyk

cadquery/occ_impl/shapes.py

@@ -1404,8 +1404,7 @@ def close(self) -> Union["Edge", "Wire"]:
         rv: Union[Wire, Edge]
 
         if not self.IsClosed():
-            e = Edge.makeLine(self.endPoint(), self.startPoint())
-            rv = Wire.assembleEdges((self, e))
+            rv = Wire.assembleEdges((self,)).close()
         else:
             rv = self
 
@@ -1673,6 +1672,19 @@ def _geomAdaptorH(self) -> Tuple[BRepAdaptor_CompCurve, BRepAdaptor_HCompCurve]:
 
         return curve, BRepAdaptor_HCompCurve(curve)
 
+    def close(self) -> "Wire":
+        """
+        Close a Wire
+        """
+
+        if not self.IsClosed():
+            e = Edge.makeLine(self.endPoint(), self.startPoint())
+            rv = Wire.combine((self, e))[0]
+        else:
+            rv = self
+
+        return rv
+
     @classmethod
     def combine(
         cls: Type["Wire"], listOfWires: Iterable[Union["Wire", Edge]], tol: float = 1e-9

tests/test_cadquery.py

@@ -4476,7 +4476,7 @@ def testParametricSurface(self):
         self.assertTrue(r2.solids().val().isValid())
         self.assertEqual(r2.solids().size(), 2)
 
-    def testEdgeClose(self):
+    def testEdgeWireClose(self):
 
         # test with edge
         e0 = Edge.makeThreePointArc(Vector(0, 0, 0), Vector(1, 1, 0), Vector(0, 2, 0))
@@ -4491,6 +4491,12 @@ def testEdgeClose(self):
         self.assertTrue(e2.IsClosed())
         self.assertEqual(type(e1), type(e2))
 
+        # test with already closed WIRE
+        w1 = Wire.makeCircle(1, Vector(), Vector(0, 0, 1))
+        self.assertTrue(w1.IsClosed())
+        w2 = w1.close()
+        self.assertTrue(w1 is w2)
+
     def testSplitShape(self):
         """
         Testing the Shape.split method.