last fixes

Author: tomvanmele

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas.geometry.surfaces.nurbs.NurbsSurface.from_sphere`.
 * Added `compas.geometry.surfaces.nurbs.NurbsSurface.from_torus`.
 * Added `compas_rhino.geometry.surfaces.surface_from_native`.
+* Added `compas_rhino.geometry.surfaces.nurbssurface_from_native`.
 * Added `compas_rhino.geometry.surfaces.nurbssurface_from_cylinder`.
 * Added `compas_rhino.geometry.surfaces.nurbssurface_from_fill`.
 * Added `compas_rhino.geometry.surfaces.nurbssurface_from_torus`.
@@ -33,7 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Fixed bug in `compas.geometry.curves.curve.Curve.reversed` by adding missing parenthesis.
 * Fixed all doctests so we can run `invoke test --doctest`.
-* Changed `compas.geometry.surfaces.surface.Surface.__new__` to prevent instantiation of `compas.geometry.surfaces.surface.Surface` only.
+* Changed `compas.geometry.surfaces.surface.Surface.__new__` to prevent instantiation of `compas.geometry.surfaces.surface.Surface` directly.
+* Changed `compas.geometry.surfaces.nurbs.NurbsSurface.__new__` to prevent instantiation of `compas.geometry.surfaces.nurbs.NurbsSurface` directly.
 * Fixed bug in `compas.geometry.surfaces.nurbs.NurbsSurface.__data__`.
 * Changed `compas.geometry.surfaces.nurbs.new_nurbssurface_from_...` to `compas.geometry.surfaces.nurbs.nurbssurface_from_...`.
 
@@ -49,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed `compas.geometry.surfaces.surface.ToroidalSurface.__new__`.
 * Removed `compas.geometry.surfaces.nurbs.NurbsSurface.__init__`.
 * Removed `compas_rhino.geometry.surfaces.new_surface`.
+* Removed `compas_rhino.geometry.surfaces.new_nurbssurface`.
 * Removed `compas_rhino.geometry.surfaces.nurbs.NurbsSurface.__from_data__`.
 * Removed `compas_rhino.geometry.surfaces.surface.Surface.from_corners`.
 * Removed `compas_rhino.geometry.surfaces.surface.Surface.from_cylinder`.

src/compas/geometry/surfaces/nurbs.py

@@ -11,11 +11,6 @@
 from .surface import Surface
 
 
-@pluggable(category="factories")
-def new_nurbssurface(cls, *args, **kwargs):
-    raise PluginNotInstalledError
-
-
 @pluggable(category="factories")
 def nurbssurface_from_cylinder(cls, *args, **kwargs):
     raise PluginNotInstalledError
@@ -41,6 +36,11 @@ def nurbssurface_from_interpolation(cls, *args, **kwargs):
     raise PluginNotInstalledError
 
 
+@pluggable(category="factories")
+def nurbssurface_from_native(cls, *args, **kwargs):
+    raise PluginNotInstalledError
+
+
 @pluggable(category="factories")
 def nurbssurface_from_parameters(cls, *args, **kwargs):
     raise PluginNotInstalledError
@@ -157,7 +157,7 @@ def __from_data__(cls, data):
             The constructed surface.
 
         """
-        points = [[Point.__from_data__(point) for point in row] for row in data["points"]]
+        points = data["points"]  # conversion is not needed because point data can be provided in their raw form as well
         weights = data["weights"]
         knots_u = data["knots_u"]
         knots_v = data["knots_v"]
@@ -180,9 +180,10 @@ def __from_data__(cls, data):
             is_periodic_v,
         )
 
-    # this may not really be necessary
     def __new__(cls, *args, **kwargs):
-        return new_nurbssurface(cls, *args, **kwargs)
+        if cls is NurbsSurface:
+            raise TypeError("Instantiating the base NURBS Surface class directly is not allowed.")
+        return object.__new__(cls)
 
     def __repr__(self):
         return "{0}(points={1!r}, weigths={2}, knots_u={3}, knots_v={4}, mults_u={5}, mults_v={6}, degree_u={7}, degree_v={8}, is_periodic_u={9}, is_periodic_v={10})".format(
@@ -377,6 +378,22 @@ def from_meshgrid(cls, nu=10, nv=10):
             points.append(row)
         return cls.from_points(points=points)
 
+    @classmethod
+    def from_native(cls, surface):
+        """Construct a NURBS surface from a native surface geometry.
+
+        Parameters
+        ----------
+        surface
+            A CAD native surface object.
+
+        Returns
+        -------
+        :class:`compas.geometry.NurbsSurface`
+
+        """
+        raise NotImplementedError
+
     @classmethod
     def from_parameters(
         cls,

src/compas/geometry/surfaces/surface.py

@@ -145,9 +145,6 @@ def is_periodic_v(self):
     # Constructors
     # ==============================================================================
 
-    # these probably need to be moved to Nurbs
-    # i don't think you can store a "general" parametric surface in a file
-
     @classmethod
     def from_native(cls, surface):
         """Construct a parametric surface from a native surface geometry.
@@ -163,7 +160,7 @@ def from_native(cls, surface):
             A COMPAS surface.
 
         """
-        return surface_from_native(cls, surface)
+        raise NotImplementedError
 
     @classmethod
     def from_obj(cls, filepath):

src/compas_rhino/geometry/surfaces/__init__.py

@@ -1,7 +1,6 @@
 from .surface import RhinoSurface  # noqa : F401
 from .nurbs import RhinoNurbsSurface
 
-from compas.geometry import NurbsSurface
 from compas.plugins import plugin
 
 
@@ -10,12 +9,6 @@ def surface_from_native(cls, *args, **kwargs):
     return RhinoSurface.from_native(*args, **kwargs)
 
 
-# this may not really be necessary
-@plugin(category="factories", requires=["Rhino"])
-def new_nurbssurface(cls, *args, **kwargs):
-    return super(NurbsSurface, cls).__new__(cls)
-
-
 @plugin(category="factories", requires=["Rhino"])
 def nurbssurface_from_cylinder(cls, *args, **kwargs):
     return RhinoNurbsSurface.from_cylinder(*args, **kwargs)
@@ -31,6 +24,11 @@ def nurbssurface_from_frame(cls, *args, **kwargs):
     return RhinoNurbsSurface.from_frame(*args, **kwargs)
 
 
+@plugin(category="factories", requires=["Rhino"])
+def nurbssurface_from_native(cls, *args, **kwargs):
+    return RhinoNurbsSurface.from_native(*args, **kwargs)
+
+
 @plugin(category="factories", requires=["Rhino"])
 def nurbssurface_from_parameters(cls, *args, **kwargs):
     return RhinoNurbsSurface.from_parameters(*args, **kwargs)

src/compas_rhino/geometry/surfaces/nurbs.py

@@ -21,15 +21,15 @@
 
 class ControlPoints(object):
     def __init__(self, surface):
-        self.rhino_surface = surface
+        self.native_surface = surface
 
     @property
     def points(self):
         points = []
-        for i in range(self.rhino_surface.Points.CountU):
+        for i in range(self.native_surface.Points.CountU):
             row = []
-            for j in range(self.rhino_surface.Points.CountV):
-                row.append(point_to_compas(self.rhino_surface.Points.GetControlPoint(i, j).Location))
+            for j in range(self.native_surface.Points.CountV):
+                row.append(point_to_compas(self.native_surface.Points.GetControlPoint(i, j).Location))
             points.append(row)
         return points
 
@@ -39,21 +39,21 @@ def __getitem__(self, index):
         except TypeError:
             return self.points[index]
         else:
-            point = self.rhino_surface.Points.GetControlPoint(u, v).Location
+            point = self.native_surface.Points.GetControlPoint(u, v).Location
             return point_to_compas(point)
 
     def __setitem__(self, index, point):
         u, v = index
-        self.rhino_surface.Points.SetControlPoint(u, v, Rhino.Geometry.ControlPoint(point_to_rhino(point)))
+        self.native_surface.Points.SetControlPoint(u, v, Rhino.Geometry.ControlPoint(point_to_rhino(point)))
 
     def __len__(self):
-        return self.rhino_surface.Points.CountU
+        return self.native_surface.Points.CountU
 
     def __iter__(self):
         return iter(self.points)
 
 
-def rhino_surface_from_parameters(
+def native_surface_from_parameters(
     points,
     weights,
     knots_u,
@@ -72,7 +72,7 @@ def rhino_surface_from_parameters(
     is_rational = any(weight != 1.0 for weight in flatten(weights))
     dimensions = 3
 
-    rhino_surface = Rhino.Geometry.NurbsSurface.Create(
+    native_surface = Rhino.Geometry.NurbsSurface.Create(
         dimensions,
         is_rational,
         order_u,
@@ -81,7 +81,7 @@ def rhino_surface_from_parameters(
         pointcount_v,
     )
 
-    if not rhino_surface:
+    if not native_surface:
         message = "dimensions: {} is_rational: {} order_u: {} order_v: {} u_points: {} v_points: {}".format(
             dimensions,
             is_rational,
@@ -102,14 +102,14 @@ def rhino_surface_from_parameters(
         knotvector_v[:] = knotvector_v[1:-1]
     # add knots
     for index, knot in enumerate(knotvector_u):
-        rhino_surface.KnotsU[index] = knot
+        native_surface.KnotsU[index] = knot
     for index, knot in enumerate(knotvector_v):
-        rhino_surface.KnotsV[index] = knot
+        native_surface.KnotsV[index] = knot
     # add control points
     for i in range(pointcount_u):
         for j in range(pointcount_v):
-            rhino_surface.Points.SetPoint(i, j, point_to_rhino(points[i][j]), weights[i][j])
-    return rhino_surface
+            native_surface.Points.SetPoint(i, j, point_to_rhino(points[i][j]), weights[i][j])
+    return native_surface
 
 
 class RhinoNurbsSurface(RhinoSurface, NurbsSurface):
@@ -170,61 +170,61 @@ def __data__(self):
 
     @property
     def points(self):
-        if self.rhino_surface:
+        if self.native_surface:
             if not hasattr(self, "_points"):
-                self._points = ControlPoints(self.rhino_surface)
+                self._points = ControlPoints(self.native_surface)
             return self._points
 
     @property
     def weights(self):
-        if self.rhino_surface:
+        if self.native_surface:
             weights = []
-            for i in range(self.rhino_surface.Points.CountU):
+            for i in range(self.native_surface.Points.CountU):
                 row = []
-                for j in range(self.rhino_surface.Points.CountV):
-                    row.append(self.rhino_surface.Points.GetWeight(i, j))
+                for j in range(self.native_surface.Points.CountV):
+                    row.append(self.native_surface.Points.GetWeight(i, j))
                 weights.append(row)
             return weights
 
     @property
     def knots_u(self):
-        if self.rhino_surface:
-            return [key for key, _ in groupby(self.rhino_surface.KnotsU)]
+        if self.native_surface:
+            return [key for key, _ in groupby(self.native_surface.KnotsU)]
 
     @property
     def mults_u(self):
-        if self.rhino_surface:
-            return [len(list(group)) for _, group in groupby(self.rhino_surface.KnotsU)]
+        if self.native_surface:
+            return [len(list(group)) for _, group in groupby(self.native_surface.KnotsU)]
 
     @property
     def knotvector_u(self):
-        if self.rhino_surface:
-            return list(self.rhino_surface.KnotsU)
+        if self.native_surface:
+            return list(self.native_surface.KnotsU)
 
     @property
     def knots_v(self):
-        if self.rhino_surface:
-            return [key for key, _ in groupby(self.rhino_surface.KnotsV)]
+        if self.native_surface:
+            return [key for key, _ in groupby(self.native_surface.KnotsV)]
 
     @property
     def mults_v(self):
-        if self.rhino_surface:
-            return [len(list(group)) for _, group in groupby(self.rhino_surface.KnotsV)]
+        if self.native_surface:
+            return [len(list(group)) for _, group in groupby(self.native_surface.KnotsV)]
 
     @property
     def knotvector_v(self):
-        if self.rhino_surface:
-            return list(self.rhino_surface.KnotsV)
+        if self.native_surface:
+            return list(self.native_surface.KnotsV)
 
     @property
     def degree_u(self):
-        if self.rhino_surface:
-            return self.rhino_surface.Degree(0)
+        if self.native_surface:
+            return self.native_surface.Degree(0)
 
     @property
     def degree_v(self):
-        if self.rhino_surface:
-            return self.rhino_surface.Degree(1)
+        if self.native_surface:
+            return self.native_surface.Degree(1)
 
     # ==============================================================================
     # Constructors
@@ -281,10 +281,8 @@ def from_fill(cls, curve1, curve2):
         :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
+        native_surface = Rhino.Geometry.NurbsSurface.CreateRuledSurface(curve1, curve2)
+        return cls.from_native(native_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):
@@ -316,8 +314,24 @@ def from_frame(cls, frame, domain_u=(0, 1), domain_v=(0, 1), degree_u=1, degree_
         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)
+        native_surface = Rhino.Geometry.NurbsSurface.CreateFromPlane(plane, du, dv, degree_u, degree_v, pointcount_u, pointcount_v)
+        return cls.from_native(native_surface)
+
+    @classmethod
+    def from_native(cls, native_surface):
+        """Construct a NURBS surface from an existing Rhino surface.
+
+        Parameters
+        ----------
+        native_surface : :rhino:`Rhino.Geometry.Surface`
+            A Rhino surface.
+
+        Returns
+        -------
+        :class:`compas_rhino.geometry.RhinoNurbsSurface`
+
+        """
+        return cls(native_surface)
 
     @classmethod
     def from_parameters(
@@ -359,9 +373,8 @@ def from_parameters(
         :class:`compas_rhino.geometry.RhinoNurbsSurface`
 
         """
-        surface = cls()
-        surface.rhino_surface = rhino_surface_from_parameters(points, weights, knots_u, knots_v, mults_u, mults_v, degree_u, degree_v)
-        return surface
+        native_surface = native_surface_from_parameters(points, weights, knots_u, knots_v, mults_u, mults_v, degree_u, degree_v)
+        return cls.from_native(native_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):
@@ -392,8 +405,8 @@ def from_plane(cls, plane, domain_u=(0, 1), domain_v=(0, 1), degree_u=1, degree_
         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)
+        native_surface = Rhino.Geometry.NurbsSurface.CreateFromPlane(plane, du, dv, degree_u, degree_v, pointcount_u, pointcount_v)
+        return cls.from_native(native_surface)
 
     @classmethod
     def from_points(cls, points, degree_u=3, degree_v=3):
@@ -420,9 +433,8 @@ def from_points(cls, points, degree_u=3, degree_v=3):
         pointcount_u = len(points)
         pointcount_v = len(points[0])
         points[:] = [point_to_rhino(point) for row in points for point in row]
-        surface = cls()
-        surface.rhino_surface = Rhino.Geometry.NurbsSurface.CreateFromPoints(points, pointcount_u, pointcount_v, degree_u, degree_v)
-        return surface
+        native_surface = Rhino.Geometry.NurbsSurface.CreateFromPoints(points, pointcount_u, pointcount_v, degree_u, degree_v)
+        return cls.from_native(native_surface)
 
     @classmethod
     def from_sphere(cls, sphere):