Merge pull request #15 from lottilotte/joined_from-fill

Join curves and surface from fill with 4 curves

Author: tomvanmele

CHANGELOG.md

@@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### Added
+* Added `compas_occ.geometry.NurbsCurve.join`.
+* Added `compas_occ.geometry.NurbsCurve.joined`.
 
 ### Changed
+* Extend `compas_occ.geometry.OCCNurbsSurface.from_fill` with up to 4 input curves.
 
 ### Removed
 

docs/_images/example_curve_joining_joined.png

@@ -0,0 +1,25 @@
+from compas.geometry import Point
+from compas.geometry import Polyline
+from compas_occ.geometry import OCCNurbsCurve
+from compas_view2.app import App
+
+points1 = [Point(0, 0, 0), Point(1, 1, 0), Point(3, 0, 0)]
+points2 = [Point(3, 0, 0), Point(4, -2, 0), Point(5, 0, 0)]
+
+curve1 = OCCNurbsCurve.from_interpolation(points1)
+curve2 = OCCNurbsCurve.from_interpolation(points2)
+
+joined = curve1.joined(curve2)
+curve1.join(curve2)
+
+# ==============================================================================
+# Visualisation
+# ==============================================================================
+
+view = App()
+
+view.add(Polyline(curve1.locus()), linewidth=3, linecolor=(1, 0, 0))
+view.add(Polyline(curve2.locus()), linewidth=3, linecolor=(0, 1, 0))
+view.add(Polyline(joined.locus()), linewidth=3, linecolor=(0, 0, 1))
+
+view.run()

docs/_images/example_curve_joining_separate.png

@@ -0,0 +1,14 @@
+********************************************************************************
+Curve Joining
+********************************************************************************
+
+.. figure:: /_images/example_curve_joining_separate.png
+    :figclass: figure
+    :class: figure-img img-fluid
+
+.. figure:: /_images/example_curve_joining_joined.png
+    :figclass: figure
+    :class: figure-img img-fluid
+
+.. literalinclude:: curve_joining.py
+    :language: python

docs/_images/example_surface_from_fill.png

@@ -0,0 +1,49 @@
+
+from compas.geometry import NurbsCurve
+from compas.geometry import NurbsSurface
+
+
+from compas.geometry import Point
+from compas.geometry import Polyline
+
+from compas_view2.app import App
+
+points1 = [Point(0, -10, 0), Point(1, -8, 0), Point(-1, -6, 0), Point(0, -4, 0)]
+points2 = [Point(5, -10, 0), Point(4, -8, 0), Point(6, -6, 0), Point(5, -4, 0)]
+
+nurbscurve1 = NurbsCurve.from_interpolation(points1)
+nurbscurve2 = NurbsCurve.from_interpolation(points2)
+
+nurbssurface_2curves = NurbsSurface.from_fill(nurbscurve1, nurbscurve2)
+
+points3 = [Point(0, 0, 0), Point(1, 2, 0), Point(-1, 4, 0), Point(0, 6, 0)]
+points4 = [Point(0, 6, 0), Point(3, 6, -1), Point(5, 6, 0)]
+points5 = [Point(5, 6, 0), Point(4, 2, 0), Point(5, 0, 0)]
+points6 = [Point(5, 0, 0), Point(2, -1, 1), Point(0, 0, 0)]
+
+nurbscurve3 = NurbsCurve.from_interpolation(points3)
+nurbscurve4 = NurbsCurve.from_interpolation(points4)
+nurbscurve5 = NurbsCurve.from_interpolation(points5)
+nurbscurve6 = NurbsCurve.from_interpolation(points6)
+
+nurbssurface_4curves = NurbsSurface.from_fill(nurbscurve3, nurbscurve4, nurbscurve5, nurbscurve6, style='curved')
+
+
+# ==============================================================================
+# Visualisation
+# ==============================================================================
+
+view = App()
+
+view.add(Polyline(nurbscurve1.locus()), linewidth=3, linecolor=(1, 0, 0))
+view.add(Polyline(nurbscurve2.locus()), linewidth=3, linecolor=(0, 1, 0))
+
+view.add(Polyline(nurbscurve3.locus()), linewidth=3, linecolor=(1, 0, 0))
+view.add(Polyline(nurbscurve4.locus()), linewidth=3, linecolor=(0, 1, 0))
+view.add(Polyline(nurbscurve5.locus()), linewidth=3, linecolor=(1, 0, 1))
+view.add(Polyline(nurbscurve6.locus()), linewidth=3, linecolor=(0, 0, 1))
+
+view.add(nurbssurface_2curves.to_mesh(nu=10))
+view.add(nurbssurface_4curves.to_mesh(nu=10))
+
+view.run()

docs/examples/curve_joining.py

@@ -0,0 +1,10 @@
+********************************************************************************
+Surface From Fill
+********************************************************************************
+
+.. figure:: /_images/example_surface_from_fill.png
+    :figclass: figure
+    :class: figure-img img-fluid
+
+.. literalinclude:: surface_from_fill.py
+    :language: python

docs/examples/curve_joining.rst

@@ -19,6 +19,7 @@
 
 from OCC.Core.Geom import Geom_BSplineCurve
 from OCC.Core.GeomAPI import GeomAPI_Interpolate
+from OCC.Core.GeomConvert import GeomConvert_CompCurveToBSplineCurve
 
 from .curve import OCCCurve
 
@@ -493,3 +494,45 @@ def segmented(self, u, v, precision=1e-3):
         copy = self.copy()
         copy.segment(u, v, precision)
         return copy
+
+    def join(self, curve, precision=1e-4):
+        """Modifies this curve by joining it with another curve.
+
+        Parameters
+        ----------
+        curve : :class:`OCCNurbsCurve`
+            The curve to join.
+        precision : float, optional
+            Tolerance for continuity and multiplicity.
+
+        Returns
+        -------
+        None
+
+        """
+        converter = GeomConvert_CompCurveToBSplineCurve(self.occ_curve)
+        success = converter.Add(curve.occ_curve, precision)
+        if success:
+            self.occ_curve = converter.BSplineCurve()
+
+    def joined(self, curve, precision=1e-4):
+        """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` | None
+
+        """
+        copy = self.copy()
+        converter = GeomConvert_CompCurveToBSplineCurve(self.occ_curve)
+        success = converter.Add(curve.occ_curve, precision)
+        if success:
+            copy.occ_curve = converter.BSplineCurve()
+            return copy

docs/examples/surface_from_fill.py

@@ -16,7 +16,9 @@
 
 from OCC.Core.Geom import Geom_BSplineSurface
 from OCC.Core.GeomFill import GeomFill_BSplineCurves
+from OCC.Core.GeomFill import GeomFill_StretchStyle
 from OCC.Core.GeomFill import GeomFill_CoonsStyle
+from OCC.Core.GeomFill import GeomFill_CurvedStyle
 
 from .surface import OCCSurface
 
@@ -354,21 +356,48 @@ def from_step(cls, filepath):
         raise NotImplementedError
 
     @classmethod
-    def from_fill(cls, curve1, curve2):
-        """Construct a NURBS surface from the infill between two NURBS curves.
+    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
         ----------
         curve1 : :class:`~compas_occ.geometry.OCCNurbsCurve`
         curve2 : :class:`~compas_occ.geometry.OCCNurbsCurve`
+        curve3 : :class:`~compas_occ.geometry.OCCNurbsCurve`, optional.
+        curve4 : :class:`~compas_occ.geometry.OCCNurbsCurve`, optional.
+        style : Literal['stretch', 'coons', 'curved'], optional.
+
+            * ``'stretch'`` produces the flattest patch.
+            * ``'curved'`` produces a rounded patch.
+            * ``'coons'`` is between stretch and coons.
+
+        Raises
+        ------
+        ValueError
+            If the fill style is not supported.
 
         Returns
         -------
         :class:`OCCNurbsSurface`
 
         """
+
+        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()
-        occ_fill = GeomFill_BSplineCurves(curve1.occ_curve, curve2.occ_curve, GeomFill_CoonsStyle)
+        if curve3 and curve4:
+            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, style)
         surface.occ_surface = occ_fill.Surface()
         return surface