Merge pull request #1257 from lorenzncode/1180-polygon-close

Add close option to Wire.makePolygon

Author: jmwright

cadquery/cq.py

@@ -3816,7 +3816,7 @@ def interpPlate(
 
         # Creates interpolated plate
         f: Face = Face.makeNSidedSurface(
-            edges if not points else [Wire.makePolygon(points).close()],
+            edges if not points else [Wire.makePolygon(points, False, True)],
             surf_pts,
             degree=degree,
             nbPtsOnCur=nbPtsOnCur,

cadquery/occ_impl/shapes.py

@@ -2067,14 +2067,23 @@ def makeEllipse(
 
     @classmethod
     def makePolygon(
-        cls, listOfVertices: Iterable[VectorLike], forConstruction: bool = False,
+        cls,
+        listOfVertices: Iterable[VectorLike],
+        forConstruction: bool = False,
+        close: bool = False,
     ) -> "Wire":
-        # convert list of tuples into Vectors.
+        """
+        Construct a polygonal wire from points.
+        """
+
         wire_builder = BRepBuilderAPI_MakePolygon()
 
         for v in listOfVertices:
             wire_builder.Add(Vector(v).toPnt())
 
+        if close:
+            wire_builder.Close()
+
         w = cls(wire_builder.Wire())
         w.forConstruction = forConstruction
 

cadquery/sketch.py

@@ -307,7 +307,9 @@ def polygon(
         Construct a polygonal face.
         """
 
-        w = Wire.makePolygon(p if isinstance(p, Vector) else Vector(*p) for p in pts)
+        w = Wire.makePolygon(
+            (p if isinstance(p, Vector) else Vector(*p) for p in pts), False, True
+        )
 
         return self.face(w, angle, mode, tag)
 

tests/test_cad_objects.py

@@ -1,5 +1,6 @@
 # system modules
 import math
+import pytest
 import unittest
 from tests import BaseTest
 from OCP.gp import gp_Vec, gp_Pnt, gp_Ax2, gp_Circ, gp_Elips, gp, gp_XYZ, gp_Trsf
@@ -721,5 +722,18 @@ def testEdgeWrapperRadius(self):
         self.assertAlmostEqual(many_rad.radius(), 1.0)
 
 
+@pytest.mark.parametrize(
+    "points, close, expected_edges",
+    [
+        (((0, 0, 0), (0, 1, 0), (1, 0, 0)), False, 2),
+        (((0, 0, 0), (0, 1, 0), (1, 0, 0)), True, 3),
+        (((0, 0, 0), (0, 1, 0), (1, 0, 0), (0, 0, 0)), False, 3),
+        (((0, 0, 0), (0, 1, 0), (1, 0, 0), (0, 0, 0)), True, 3),
+    ],
+)
+def test_wire_makepolygon(points, close, expected_edges):
+    assert len(Wire.makePolygon(points, False, close).Edges()) == expected_edges
+
+
 if __name__ == "__main__":
     unittest.main()

tests/test_cadquery.py

@@ -5264,6 +5264,11 @@ def testSketch(self):
 
         self.assertEqual(len(r4.solids().vals()), 1)
 
+        r5 = (
+            Workplane().sketch().polygon([(0, 0), (0, 1), (1, 0)]).finalize().extrude(1)
+        )
+        assert r5.val().Volume() == approx(0.5)
+
     def testCircumscribedPolygon(self):
         """
         Test that circumscribed polygons result in the correct shapes