small fixes and updates

Author: tomvanmele

CHANGELOG.md

@@ -26,6 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas_plotters.artists.MeshArtist.draw_vertexlabels` to use `compas_plotters.Plotter.fontsize`.
 * Changed `compas_plotters.artists.MeshArtist.draw_edgelabels` to use `compas_plotters.Plotter.fontsize`.
 * Changed `compas_plotters.artists.MeshArtist.draw_facelabels` to use `compas_plotters.Plotter.fontsize`.
+* Fixed bug in `compas_rhino.conversions.plane_to_compas_frame`.
+* Changed implementation of `compas.geometry.NurbsSurface.xyz`.
+* Fixed bug in `compas.geometry.NurbsSurface.to_mesh`.
+* Changed `compas_rhino.geometry.RhinoNurbsSurface.from_points` to use transposed points.
 
 ### Removed
 

src/compas/geometry/surfaces/nurbs.py

@@ -333,7 +333,7 @@ def to_mesh(self, nu=100, nv=None):
         from compas.datastructures import Mesh
 
         nv = nv or nu
-        vertices = [self.point_at(i, j) for i, j in product(self.u_space(nv + 1), self.v_space(nv + 1))]
+        vertices = [self.point_at(i, j) for i, j in product(self.u_space(nu + 1), self.v_space(nv + 1))]
         faces = [[
             i * (nv + 1) + j,
             (i + 1) * (nv + 1) + j,
@@ -556,9 +556,7 @@ def xyz(self, nu=10, nv=10):
         nv : int, optional
             The size of the grid in the V direction.
         """
-        import numpy as np
-        U, V = np.meshgrid(self.u_space(nu), self.v_space(nv), indexing='ij')
-        return [self.point_at(U[i, j], V[i, j]) for i, j in product(np.arange(nu), np.arange(nv))]
+        return [self.point_at(i, j) for i, j in product(self.u_space(nu), self.v_space(nv))]
 
     def point_at(self, u, v):
         """Compute a point on the surface.

src/compas_rhino/geometry/__init__.py

@@ -13,6 +13,7 @@
     :nosignatures:
 
     RhinoNurbsCurve
+    RhinoNurbsSurface
 
 
 Plugins
@@ -75,6 +76,7 @@
 from compas_rhino.conversions import RhinoVector
 
 from .curves import RhinoNurbsCurve
+from .surfaces import RhinoNurbsSurface
 
 
 __all__ = [
@@ -94,5 +96,6 @@
     'RhinoSurface',
     'RhinoVector',
 
-    'RhinoNurbsCurve'
+    'RhinoNurbsCurve',
+    'RhinoNurbsSurface',
 ]

src/compas_rhino/geometry/surfaces/nurbs.py

@@ -12,6 +12,7 @@
 from compas_rhino.conversions import vector_to_compas
 from compas_rhino.conversions import plane_to_compas_frame
 from compas_rhino.conversions import box_to_compas
+from compas_rhino.conversions import RhinoCurve
 
 import Rhino.Geometry
 
@@ -226,11 +227,12 @@ def from_points(cls, points, u_degree=3, v_degree=3):
         -------
         :class:`compas.geometry.NurbsSurface`
         """
+        points = list(zip(*points))
         u_count = len(points[0])
         v_count = len(points)
         points[:] = [point_to_rhino(point) for row in points for point in row]
         surface = cls()
-        surface.rhino_surface = Rhino.Geometry.NurbsSurface.CreateFromPoints(points, u_count, v_count, u_degree, v_degree)
+        surface.rhino_surface = Rhino.Geometry.NurbsSurface.CreateFromPoints(points, v_count, u_count, u_degree, v_degree)
         return surface
 
     @classmethod
@@ -281,9 +283,9 @@ def to_step(self, filepath, schema="AP203"):
     def points(self):
         if self.rhino_surface:
             points = []
-            for i in range(self.rhino_surface.Points.CountV):
+            for i in range(self.rhino_surface.Points.CountU):
                 row = []
-                for j in range(self.rhino_surface.Points.CountU):
+                for j in range(self.rhino_surface.Points.CountV):
                     row.append(point_to_compas(self.rhino_surface.Points.GetControlPoint(i, j).Location))
                 points.append(row)
             return points
@@ -292,9 +294,9 @@ def points(self):
     def weights(self):
         if self.rhino_surface:
             weights = []
-            for i in range(self.rhino_surface.Points.CountV):
+            for i in range(self.rhino_surface.Points.CountU):
                 row = []
-                for j in range(self.rhino_surface.Points.CountU):
+                for j in range(self.rhino_surface.Points.CountV):
                     row.append(self.rhino_surface.Points.GetWeight(i, j))
                 weights.append(row)
             return weights
@@ -374,7 +376,8 @@ def u_isocurve(self, u):
         -------
         :class:`compas.geometry.NurbsCurve`
         """
-        raise NotImplementedError
+        curve = self.rhino_surface.IsoCurve(1, u)
+        return RhinoCurve.from_geometry(curve).to_compas()
 
     def v_isocurve(self, v):
         """Compute the isoparametric curve at parameter v.
@@ -387,7 +390,8 @@ def v_isocurve(self, v):
         -------
         :class:`compas.geometry.NurbsCurve`
         """
-        raise NotImplementedError
+        curve = self.rhino_surface.IsoCurve(0, v)
+        return RhinoCurve.from_geometry(curve).to_compas()
 
     def boundary(self):
         """Compute the boundary curves of the surface.
@@ -440,8 +444,9 @@ def frame_at(self, u, v):
         -------
         :class:`compas.geometry.Frame`
         """
-        plane = self.rhino_surface.FrameAt(u, v)
-        return plane_to_compas_frame(plane)
+        result, plane = self.rhino_surface.FrameAt(u, v)
+        if result:
+            return plane_to_compas_frame(plane)
 
     def closest_point(self, point, return_parameters=False):
         """Compute the closest point on the curve to a given point.