More shape/free func improvements

cadquery/cq.py

@@ -42,13 +42,15 @@
 from .occ_impl.geom import Vector, Plane, Location
 from .occ_impl.shapes import (
     Shape,
+    Vertex,
     Edge,
     Wire,
     Face,
     Solid,
     Compound,
     wiresToFaces,
     Shapes,
+    loft,
 )
 
 from .occ_impl.exporters.svg import getSVG, exportSVG
@@ -3697,15 +3699,22 @@ def loft(
 
         """
 
+        toLoft: List[Union[Wire, Vertex]] = []
+
         if self.ctx.pendingWires:
-            wiresToLoft = self.ctx.popPendingWires()
+            toLoft.extend(self.ctx.popPendingWires())
         else:
-            wiresToLoft = [f.outerWire() for f in self._getFaces()]
+            toLoft = [
+                el if isinstance(el, Vertex) else el.outerWire()
+                for el in self._getFacesVertices()
+            ]
 
-        if not wiresToLoft:
+        if not toLoft:
             raise ValueError("Nothing to loft")
+        elif len(toLoft) == 1:
+            raise ValueError("More than one wire or face is required")
 
-        r: Shape = Solid.makeLoft(wiresToLoft, ruled)
+        r: Shape = loft(toLoft, cap=True, ruled=ruled)
 
         newS = self._combineWithBase(r, combine, clean)
 
@@ -3731,6 +3740,23 @@ def _getFaces(self) -> List[Face]:
 
         return rv
 
+    def _getFacesVertices(self) -> List[Union[Face, Vertex]]:
+        """
+        Convert pending wires or sketches to faces/vertices for subsequent operation
+        """
+
+        rv: List[Union[Face, Vertex]] = []
+
+        for el in self.objects:
+            if isinstance(el, Sketch):
+                rv.extend(el)
+            elif isinstance(el, (Face, Vertex)):
+                rv.append(el)
+            elif isinstance(el, Compound):
+                rv.extend(subel for subel in el if isinstance(subel, (Face, Vertex)))
+
+        return rv
+
     def _extrude(
         self,
         distance: Optional[float] = None,
@@ -4574,7 +4600,7 @@ def export(
     ) -> T:
         """
         Export Workplane to file.
-        
+
         :param path: Filename.
         :param tolerance: the deflection tolerance, in model units. Default 0.1.
         :param angularTolerance: the angular tolerance, in radians. Default 0.1.

cadquery/occ_impl/assembly.py

@@ -261,6 +261,23 @@ def _toCAF(el, ancestor, color) -> TDF_Label:
     return top, doc
 
 
+def _loc2vtk(
+    loc: Location,
+) -> Tuple[Tuple[float, float, float], Tuple[float, float, float]]:
+    """
+    Convert location to t,rot pair following vtk conventions
+    """
+
+    T = loc.wrapped.Transformation()
+
+    trans = T.TranslationPart().Coord()
+    rot = tuple(
+        map(degrees, T.GetRotation().GetEulerAngles(gp_EulerSequence.gp_Intrinsic_ZXY),)
+    )
+
+    return trans, (rot[1], rot[2], rot[0])
+
+
 def toVTK(
     assy: AssemblyProtocol,
     color: Tuple[float, float, float, float] = (1.0, 1.0, 1.0, 1.0),
@@ -273,14 +290,8 @@ def toVTK(
     for shape, _, loc, col_ in assy:
 
         col = col_.toTuple() if col_ else color
-        T = loc.wrapped.Transformation()
-        trans = T.TranslationPart().Coord()
-        rot = tuple(
-            map(
-                degrees,
-                T.GetRotation().GetEulerAngles(gp_EulerSequence.gp_Intrinsic_ZXY),
-            )
-        )
+
+        trans, rot = _loc2vtk(loc)
 
         data = shape.toVtkPolyData(tolerance, angularTolerance)
 
@@ -311,7 +322,7 @@ def toVTK(
         actor = vtkActor()
         actor.SetMapper(mapper)
         actor.SetPosition(*trans)
-        actor.SetOrientation(rot[1], rot[2], rot[0])
+        actor.SetOrientation(*rot)
         actor.GetProperty().SetColor(*col[:3])
         actor.GetProperty().SetOpacity(col[3])
 
@@ -323,7 +334,7 @@ def toVTK(
         actor = vtkActor()
         actor.SetMapper(mapper)
         actor.SetPosition(*trans)
-        actor.SetOrientation(rot[1], rot[2], rot[0])
+        actor.SetOrientation(*rot)
         actor.GetProperty().SetColor(0, 0, 0)
         actor.GetProperty().SetLineWidth(2)