added cut for revolve and loft

added the option to combine="cut" for revolve and loft, added tests

removed old arg of loft that was actually unused

Author: Jojain

cadquery/cq.py

@@ -3085,7 +3085,7 @@ def revolve(
         :param axisEnd: the end point of the axis of rotation
         :type axisEnd: tuple, a two tuple
         :param combine: True to combine the resulting solid with parent solids if found.
-        :type combine: boolean, combine with parent solid
+        :type combine: boolean or string, defines how the result of the operation is combined with the base solid
         :param boolean clean: call :py:meth:`clean` afterwards to have a clean shape
         :return: a CQ object with the resulting solid selected.
 
@@ -3129,7 +3129,9 @@ def revolve(
 
         # returns a Solid (or a compound if there were multiple)
         r = self._revolve(angleDegrees, axisStart, axisEnd)
-        if combine:
+        if isinstance(combine, str) and combine == "cut":
+            newS = self._cutFromBase(r)
+        elif isinstance(combine, bool) and combine:
             newS = self._combineWithBase(r)
         else:
             newS = self.newObject([r])
@@ -3492,12 +3494,10 @@ def cutThruAll(self: T, clean: bool = True, taper: float = 0) -> T:
 
         return self.newObject([s])
 
-    def loft(
-        self: T, filled: bool = True, ruled: bool = False, combine: bool = True
-    ) -> T:
+    def loft(self: T, ruled: bool = False, combine: Union[bool, str] = True) -> T:
         """
         Make a lofted solid, through the set of wires.
-        :return: a CQ object containing the created loft
+        :return: a Workplane object containing the created loft
         """
 
         if self.ctx.pendingWires:
@@ -3510,14 +3510,13 @@ def loft(
 
         r: Shape = Solid.makeLoft(wiresToLoft, ruled)
 
-        if combine:
-            parentSolid = self._findType(
-                (Solid, Compound), searchStack=False, searchParents=True
-            )
-            if parentSolid is not None:
-                r = parentSolid.fuse(r)
+        if isinstance(combine, str) and combine == "cut":
+            r = self._cutFromBase(r)
 
-        return self.newObject([r])
+        elif isinstance(combine, bool) and combine:
+            r = self._combineWithBase(r)
+
+        return r
 
     def _getFaces(self) -> List[Face]:
         """

tests/test_cadquery.py

@@ -467,6 +467,19 @@ def testLoft(self):
         # the resulting loft had a split on the side, not sure why really, i expected only 3 faces
         self.assertEqual(7, s.faces().size())
 
+        # test loft with combine="cut"
+        box = Workplane().box(10, 10, 10).solids()
+        cut = (
+            box.faces(">Z")
+            .workplane()
+            .circle(2)
+            .workplane(invert=True, offset=12)
+            .rect(3, 2)
+            .loft(combine="cut")
+        )
+
+        self.assertGreater(box.val().Volume(), cut.val().Volume())
+
     def testLoftRaisesValueError(self):
         s0 = Workplane().hLine(1)  # no wires
         with raises(ValueError):
@@ -616,6 +629,17 @@ def testRevolveCone(self):
         self.assertEqual(2, result.vertices().size())
         self.assertEqual(2, result.edges().size())
 
+    def testRevolveCut(self):
+        box = Workplane().box(10, 10, 10)
+        cut = (
+            box.transformed((90, 0, 0))
+            .move(5, 0)
+            .rect(3, 4, centered=False)
+            .revolve(360, (0, 0, 0), (0, 1, 0), combine="cut")
+        )
+
+        self.assertGreater(box.val().Volume(), cut.val().Volume())
+
     def testRevolveErrors(self):
         """
         Test that revolve raises errors when used incorrectly.