implement Tom's comments

Author: lottilotte

docs/examples/surface_from_fill.py

@@ -26,7 +26,7 @@
 nurbscurve5 = NurbsCurve.from_interpolation(points5)
 nurbscurve6 = NurbsCurve.from_interpolation(points6)
 
-nurbssurface_4curves = NurbsSurface.from_fill(nurbscurve3, nurbscurve4, nurbscurve5, nurbscurve6, 'curved')
+nurbssurface_4curves = NurbsSurface.from_fill(nurbscurve3, nurbscurve4, nurbscurve5, nurbscurve6, style='curved')
 
 
 # ==============================================================================

src/compas_occ/geometry/curves/nurbs.py

@@ -502,7 +502,6 @@ def join(self, curve, precision=1e-4):
         ----------
         curve : :class:`OCCNurbsCurve`
             The curve to join.
-
         precision : float, optional
             Tolerance for continuity and multiplicity.
 
@@ -517,19 +516,18 @@ def join(self, curve, precision=1e-4):
             self.occ_curve = converter.BSplineCurve()
 
     def joined(self, curve, precision=1e-4):
-        """Returns a copy of joining this curve with another curve.
+        """Returns a new curve that is the result of joining this curve with another.
 
         Parameters
         ----------
         curve : :class:`OCCNurbsCurve`
             The curve to join.
-
         precision : float, optional
             Tolerance for continuity and multiplicity.
 
         Returns
         -------
-        :class:`OCCNurbsCurve`
+        :class:`OCCNurbsCurve` | None
 
         """
         copy = self.copy()
@@ -538,5 +536,3 @@ def joined(self, curve, precision=1e-4):
         if success:
             copy.occ_curve = converter.BSplineCurve()
             return copy
-        else:
-            return None

src/compas_occ/geometry/surfaces/nurbs.py

@@ -356,7 +356,7 @@ def from_step(cls, filepath):
         raise NotImplementedError
 
     @classmethod
-    def from_fill(cls, curve1, curve2, curve3=None, curve4=None, scheme='stretch'):
+    def from_fill(cls, curve1, curve2, curve3=None, curve4=None, style='stretch'):
         """Construct a NURBS surface from the infill between two, three or four contiguous NURBS curves.
 
         Parameters
@@ -365,30 +365,39 @@ def from_fill(cls, curve1, curve2, curve3=None, curve4=None, scheme='stretch'):
         curve2 : :class:`~compas_occ.geometry.OCCNurbsCurve`
         curve3 : :class:`~compas_occ.geometry.OCCNurbsCurve`, optional.
         curve4 : :class:`~compas_occ.geometry.OCCNurbsCurve`, optional.
-        scheme (Literal[’stretch’, ’coons’, ‘curved’], optional) – The scheme according to which the mesh should be subdivided.
+        style : Literal['stretch', 'coons', 'curved'], optional.
+            The fill style:
+            'stretch' gives the flattest patch.
+            'coons' gives a rounded patch with less depth than that of curved.
+            'curved' gives with the most rounded patch.
+
+        Raises
+        ------
+        ValueError
+            If the fill style is not supported.
 
         Returns
         -------
         :class:`OCCNurbsSurface`
 
         """
 
-        if scheme == 'stretch':
-            schemeStyle = GeomFill_StretchStyle
-        elif scheme == 'coons':
-            schemeStyle = GeomFill_CoonsStyle
-        elif scheme == 'curved':
-            schemeStyle = GeomFill_CurvedStyle
+        if style == 'stretch':
+            style = GeomFill_StretchStyle
+        elif style == 'coons':
+            style = GeomFill_CoonsStyle
+        elif style == 'curved':
+            style = GeomFill_CurvedStyle
         else:
             ValueError('Scheme is not supported')
 
         surface = cls()
-        if curve3:
-            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, curve3.occ_curve, schemeStyle)
         if curve3 and curve4:
-            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, curve3.occ_curve, curve4.occ_curve, schemeStyle)
+            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, curve3.occ_curve, curve4.occ_curve, style)
+        elif curve3:
+            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, curve3.occ_curve, style)
         else:
-            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, schemeStyle)
+            occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, style)
         surface.occ_surface = occ_fill.Surface()
         return surface