Merge pull request #1101 from compas-dev/bugfix/nurbs_point_count

Bugfix/nurbs point count

Author: chenkasirer

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Fixed strange point values in RhinoNurbsCurve caused by conversion `ControlPoint` to COMPAS instead of `ControlPoint.Location`.
+* Fixed flipped order of NURBS point count values when creating RhinoNurbsSurface from parameters.
 
 ### Removed
 

src/compas_rhino/geometry/surfaces/nurbs.py

@@ -61,27 +61,38 @@ def rhino_surface_from_parameters(
     is_u_periodic=False,
     is_v_periodic=False,
 ):
-    rhino_surface = Rhino.Geometry.NurbsSurface.Create(3, True, u_degree + 1, v_degree + 1, len(points[0]), len(points))
-    u_knotvector = [knot for knot, mult in zip(u_knots, u_mults) for _ in range(mult)]
-    v_knotvector = [knot for knot, mult in zip(v_knots, v_mults) for _ in range(mult)]
-    u_count = len(points[0])
-    v_count = len(points)
     u_order = u_degree + 1
     v_order = v_degree + 1
+    u_point_count = len(points)
+    v_point_count = len(points[0])
+    is_rational = True  # TODO: check if all weights are equal? https://developer.rhino3d.com/guides/opennurbs/nurbs-geometry-overview/
+    dimensions = 3
+    rhino_surface = Rhino.Geometry.NurbsSurface.Create(
+        dimensions, is_rational, u_order, v_order, u_point_count, v_point_count
+    )
+
+    if not rhino_surface:
+        message = "dimensions: {} is_rational: {} u_order: {} v_order: {} u_points: {} v_points: {}".format(
+            dimensions, is_rational, u_order, v_order, u_point_count, v_point_count
+        )
+        raise ValueError("Failed to create NurbsSurface with params:\n{}".format(message))
+
+    u_knotvector = [knot for knot, mult in zip(u_knots, u_mults) for _ in range(mult)]
+    v_knotvector = [knot for knot, mult in zip(v_knots, v_mults) for _ in range(mult)]
     # account for superfluous knots
     # https://developer.rhino3d.com/guides/opennurbs/superfluous-knots/
-    if len(u_knotvector) == u_count + u_order:
+    if len(u_knotvector) == u_point_count + u_order:
         u_knotvector[:] = u_knotvector[1:-1]
-    if len(v_knotvector) == v_count + v_order:
+    if len(v_knotvector) == v_point_count + v_order:
         v_knotvector[:] = v_knotvector[1:-1]
     # add knots
     for index, knot in enumerate(u_knotvector):
         rhino_surface.KnotsU[index] = knot
     for index, knot in enumerate(v_knotvector):
         rhino_surface.KnotsV[index] = knot
     # add control points
-    for i in range(v_count):
-        for j in range(u_count):
+    for i in range(u_point_count):
+        for j in range(v_point_count):
             rhino_surface.Points.SetPoint(i, j, point_to_rhino(points[i][j]), weights[i][j])
     return rhino_surface