fix bugs, use native_, restructure

Author: tomvanmele

src/compas_rhino/geometry/surfaces/nurbs.py

@@ -7,11 +7,14 @@
 import Rhino.Geometry  # type: ignore
 
 from compas.geometry import NurbsSurface
-from compas.geometry import Point
 from compas.geometry import knots_and_mults_to_knotvector
 from compas.itertools import flatten
+from compas_rhino.conversions import cylinder_to_rhino
+from compas_rhino.conversions import frame_to_rhino_plane
+from compas_rhino.conversions import plane_to_rhino
 from compas_rhino.conversions import point_to_compas
 from compas_rhino.conversions import point_to_rhino
+from compas_rhino.conversions import sphere_to_rhino
 
 from .surface import RhinoSurface
 
@@ -133,10 +136,6 @@ class RhinoNurbsSurface(RhinoSurface, NurbsSurface):
 
     """
 
-    def __init__(self, name=None):
-        super(RhinoNurbsSurface, self).__init__(name=name)
-        self._points = None
-
     # ==============================================================================
     # Data
     # ==============================================================================
@@ -165,52 +164,14 @@ def __data__(self):
             "is_periodic_v": self.is_periodic_v,
         }
 
-    @classmethod
-    def __from_data__(cls, data):
-        """Construct a BSpline surface from its data representation.
-
-        Parameters
-        ----------
-        data : dict
-            The data dictionary.
-
-        Returns
-        -------
-        :class:`compas_rhino.geometry.RhinoNurbsSurface`
-            The constructed surface.
-
-        """
-        points = [[Point.__from_data__(point) for point in row] for row in data["points"]]
-        weights = data["weights"]
-        knots_u = data["knots_u"]
-        knots_v = data["knots_v"]
-        mults_u = data["mults_u"]
-        mults_v = data["mults_v"]
-        degree_u = data["degree_u"]
-        degree_v = data["degree_v"]
-        is_periodic_u = data["is_periodic_u"]
-        is_periodic_v = data["is_periodic_v"]
-        return cls.from_parameters(
-            points,
-            weights,
-            knots_u,
-            knots_v,
-            mults_u,
-            mults_v,
-            degree_u,
-            degree_v,
-            is_periodic_u,
-            is_periodic_v,
-        )
-
     # ==============================================================================
     # Properties
     # ==============================================================================
 
     @property
     def points(self):
         if self.rhino_surface:
-            if not self._points:
+            if not hasattr(self, "_points"):
                 self._points = ControlPoints(self.rhino_surface)
             return self._points
 
@@ -269,6 +230,95 @@ def degree_v(self):
     # Constructors
     # ==============================================================================
 
+    @classmethod
+    def from_corners(cls, corners):
+        """Creates a NURBS surface using the given 4 corners.
+
+        The order of the given points determins the normal direction of the generated surface.
+
+        Parameters
+        ----------
+        corners : list(:class:`compas.geometry.Point`)
+            4 points in 3d space to represent the corners of the planar surface.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        rhino_points = [Rhino.Geometry.Point3d(corner.x, corner.y, corner.z) for corner in corners]
+        return cls.from_native(Rhino.Geometry.NurbsSurface.CreateFromCorners(*rhino_points))
+
+    @classmethod
+    def from_cylinder(cls, cylinder):
+        """Create a NURBS surface from a cylinder.
+
+        Parameters
+        ----------
+        cylinder : :class:`compas.geometry.Cylinder`
+            The surface's geometry.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        cylinder = cylinder_to_rhino(cylinder)
+        surface = Rhino.Geometry.NurbsSurface.CreateFromCylinder(cylinder)
+        return cls.from_native(surface)
+
+    @classmethod
+    def from_fill(cls, curve1, curve2):
+        """Construct a NURBS surface from the infill between two NURBS curves.
+
+        Parameters
+        ----------
+        curve1 : :class:`compas.geometry.NurbsCurve`
+        curve2 : :class:`compas.geometry.NurbsCurve`
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        surface = cls()
+        # these curves probably need to be processed first
+        surface.rhino_surface = Rhino.Geometry.NurbsSurface.CreateRuledSurface(curve1, curve2)
+        return surface
+
+    @classmethod
+    def from_frame(cls, frame, domain_u=(0, 1), domain_v=(0, 1), degree_u=1, degree_v=1, pointcount_u=2, pointcount_v=2):
+        """Creates a planar surface from a frame and parametric domain information.
+
+        Parameters
+        ----------
+        frame : :class:`compas.geometry.Frame`
+            A frame with point at the center of the wanted plannar surface and
+            x and y axes the direction of u and v respectively.
+        domain_u : tuple[int, int], optional
+            The domain of the U parameter.
+        domain_v : tuple[int, int], optional
+            The domain of the V parameter.
+        degree_u : int, optional
+            Degree in the U direction.
+        degree_v : int, optional
+            Degree in the V direction.
+        pointcount_u : int, optional
+            Number of control points in the U direction.
+        pointcount_v : int, optional
+            Number of control points in the V direction.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        plane = frame_to_rhino_plane(frame)
+        du = Rhino.Geometry.Interval(*domain_u)
+        dv = Rhino.Geometry.Interval(*domain_v)
+        rhino_surface = Rhino.Geometry.NurbsSurface.CreateFromPlane(plane, du, dv, degree_u, degree_v, pointcount_u, pointcount_v)
+        return cls.from_native(rhino_surface)
+
     @classmethod
     def from_parameters(
         cls,
@@ -313,6 +363,38 @@ def from_parameters(
         surface.rhino_surface = rhino_surface_from_parameters(points, weights, knots_u, knots_v, mults_u, mults_v, degree_u, degree_v)
         return surface
 
+    @classmethod
+    def from_plane(cls, plane, domain_u=(0, 1), domain_v=(0, 1), degree_u=1, degree_v=1, pointcount_u=2, pointcount_v=2):
+        """Construct a surface from a plane.
+
+        Parameters
+        ----------
+        plane : :class:`compas.geometry.Plane`
+            The plane.
+        domain_u : tuple[int, int], optional
+            The domain of the U parameter.
+        domain_v : tuple[int, int], optional
+            The domain of the V parameter.
+        degree_u : int, optional
+            Degree in the U direction.
+        degree_v : int, optional
+            Degree in the V direction.
+        pointcount_u : int, optional
+            Number of control points in the U direction.
+        pointcount_v : int, optional
+            Number of control points in the V direction.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        plane = plane_to_rhino(plane)
+        du = Rhino.Geometry.Interval(*domain_u)
+        dv = Rhino.Geometry.Interval(*domain_v)
+        rhino_surface = Rhino.Geometry.NurbsSurface.CreateFromPlane(plane, du, dv, degree_u, degree_v, pointcount_u, pointcount_v)
+        return cls.from_native(rhino_surface)
+
     @classmethod
     def from_points(cls, points, degree_u=3, degree_v=3):
         """Construct a NURBS surface from control points.
@@ -343,23 +425,38 @@ def from_points(cls, points, degree_u=3, degree_v=3):
         return surface
 
     @classmethod
-    def from_fill(cls, curve1, curve2):
-        """Construct a NURBS surface from the infill between two NURBS curves.
+    def from_sphere(cls, sphere):
+        """Creates a NURBS surface from a sphere.
 
         Parameters
         ----------
-        curve1 : :class:`compas.geometry.NurbsCurve`
-        curve2 : :class:`compas.geometry.NurbsCurve`
+        sphere : :class:`compas.geometry.Sphere`
+            The surface's geometry.
 
         Returns
         -------
         :class:`compas_rhino.geometry.RhinoNurbsSurface`
 
         """
-        surface = cls()
-        # these curves probably need to be processed first
-        surface.rhino_surface = Rhino.Geometry.NurbsSurface.CreateRuledSurface(curve1, curve2)
-        return surface
+        sphere = sphere_to_rhino(sphere)
+        surface = Rhino.Geometry.NurbsSurface.CreateFromSphere(sphere)
+        return cls.from_native(surface)
+
+    @classmethod
+    def from_torus(cls, torus):
+        """Create a NURBS surface from a torus.
+
+        Parameters
+        ----------
+        torus : :class:`compas.geometry.Torus`
+            The surface's geometry.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        raise NotImplementedError
 
     # ==============================================================================
     # Conversions