Merge pull request #1271 from lorenzncode/1253-close

Fix Workplane.close bug with 3D points

Author: jmwright

cadquery/cq.py

@@ -2651,8 +2651,7 @@ def polyline(
         """
         Create a polyline from a list of points
 
-        :param listOfXYTuple: a list of points in Workplane coordinates
-        :type listOfXYTuple: list of 2-tuples
+        :param listOfXYTuple: a list of points in Workplane coordinates (2D or 3D)
         :param forConstruction: whether or not the edges are used for reference
         :type forConstruction: true if the edges are for reference, false if they are for creating geometry
             part geometry
@@ -2688,15 +2687,15 @@ def polyline(
 
     def close(self: T) -> T:
         """
-        End 2D construction, and attempt to build a closed wire.
+        End construction, and attempt to build a closed wire.
 
         :return: a CQ object with a completed wire on the stack, if possible.
 
-        After 2D drafting with methods such as lineTo, threePointArc,
+        After 2D (or 3D) drafting with methods such as lineTo, threePointArc,
         tangentArcPoint and polyline, it is necessary to convert the edges
         produced by these into one or more wires.
 
-        When a set of edges is closed, cadQuery assumes it is safe to build
+        When a set of edges is closed, CadQuery assumes it is safe to build
         the group of edges into a wire. This example builds a simple triangular
         prism::
 
@@ -2713,7 +2712,7 @@ def close(self: T) -> T:
         # that is larger than what is considered a numerical error.
         # If so; add a line segment between endPoint and startPoint
         if endPoint.sub(startPoint).Length > 1e-6:
-            self.lineTo(self.ctx.firstPoint.x, self.ctx.firstPoint.y)
+            self.polyline([endPoint, startPoint])
 
         # Need to reset the first point after closing a wire
         self.ctx.firstPoint = None

tests/test_cadquery.py

@@ -5113,6 +5113,10 @@ def testEdgeWireClose(self):
         w2 = w1.close()
         self.assertTrue(w1 is w2)
 
+    def test_close_3D_points(self):
+        r = Workplane().polyline([(0, 0, 10), (5, 0, 12), (0, 5, 10),]).close()
+        assert r.wire().val().Closed()
+
     def testSplitShape(self):
         """
         Testing the Shape.split method.