Merge pull request #943 from compas-dev/nurbscurve-fix

Small fixes

Author: tomvanmele

CHANGELOG.md

@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Updated `pr-checks` workflow for checking Changelog entry.
+* Fixed return value of attributes of empty `compas_rhino.geometry.RhinoNurbsCurve`.
+* Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve`.
+* Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve_from_interpolation`.
+* Fixed error in parameter list of `compas_rhino.geometry.curves.new_nurbscurve_from_step`.
 
 ### Removed
 

src/compas/geometry/curves/nurbs.py

@@ -13,27 +13,27 @@
 
 
 @pluggable(category='factories')
-def new_nurbscurve(cls, *args, **kwargs):
+def new_nurbscurve(*args, **kwargs):
     raise NotImplementedError
 
 
 @pluggable(category='factories')
-def new_nurbscurve_from_parameters(cls, *args, **kwargs):
+def new_nurbscurve_from_parameters(*args, **kwargs):
     raise NotImplementedError
 
 
 @pluggable(category='factories')
-def new_nurbscurve_from_points(cls, *args, **kwargs):
+def new_nurbscurve_from_points(*args, **kwargs):
     raise NotImplementedError
 
 
 @pluggable(category='factories')
-def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
+def new_nurbscurve_from_interpolation(*args, **kwargs):
     raise NotImplementedError
 
 
 @pluggable(category='factories')
-def new_nurbscurve_from_step(cls, *args, **kwargs):
+def new_nurbscurve_from_step(*args, **kwargs):
     raise NotImplementedError
 
 
@@ -93,7 +93,7 @@ def JSONSCHEMANAME(self):
         raise NotImplementedError
 
     def __new__(cls, *args, **kwargs):
-        return new_nurbscurve(cls, *args, **kwargs)
+        return new_nurbscurve(*args, **kwargs)
 
     def __init__(self, name=None):
         super(NurbsCurve, self).__init__(name=name)

src/compas_rhino/geometry/curves/__init__.py

@@ -5,7 +5,7 @@
 
 
 @plugin(category='factories', requires=['Rhino'])
-def new_nurbscurve(cls, *args, **kwargs):
+def new_nurbscurve(*args, **kwargs):
     """Create a new empty Nurbs curve."""
     return super(NurbsCurve, RhinoNurbsCurve).__new__(RhinoNurbsCurve)
 
@@ -38,7 +38,7 @@ def new_nurbscurve_from_points(*args, **kwargs):
 
 
 @plugin(category='factories', requires=['Rhino'])
-def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
+def new_nurbscurve_from_interpolation(*args, **kwargs):
     """Construct a NURBS curve by interpolating a set of points.
 
     Parameters
@@ -58,6 +58,6 @@ def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
 
 
 @plugin(category='factories', requires=['Rhino'])
-def new_nurbscurve_from_step(cls, *args, **kwargs):
+def new_nurbscurve_from_step(*args, **kwargs):
     """Create a new Nurbs curve from the data contained in a step file."""
     return RhinoNurbsCurve.from_step(*args, **kwargs)

src/compas_rhino/geometry/curves/nurbs.py

@@ -316,87 +316,93 @@ def to_polyline(self):
     @property
     def points(self):
         """list of :class:`compas.geometry.Point`: The control points."""
-        return [point_to_compas(point) for point in self.rhino_curve.Points]
+        if self.rhino_curve:
+            return [point_to_compas(point) for point in self.rhino_curve.Points]
 
     @property
     def weights(self):
         """list of float: The weights of the control points."""
-        return [point.Weight for point in self.rhino_curve.Points]
+        if self.rhino_curve:
+            return [point.Weight for point in self.rhino_curve.Points]
 
     @property
     def knots(self):
         """list of float: Knots without repeating elements."""
-        return [key for key, _ in groupby(self.rhino_curve.Knots)]
+        if self.rhino_curve:
+            return [key for key, _ in groupby(self.rhino_curve.Knots)]
 
     @property
     def knotsequence(self):
         """list of float: Knots with multiplicities."""
-        return list(self.rhino_curve.Knots)
+        if self.rhino_curve:
+            return list(self.rhino_curve.Knots)
 
     @property
     def multiplicities(self):
         """list of int: Multiplicities of the knots."""
-        return [len(list(group)) for _, group in groupby(self.rhino_curve.Knots)]
+        if self.rhino_curve:
+            return [len(list(group)) for _, group in groupby(self.rhino_curve.Knots)]
 
     @property
     def degree(self):
         """int: The degree of the curve (degree = order - 1)."""
-        return self.rhino_curve.Degree
+        if self.rhino_curve:
+            return self.rhino_curve.Degree
 
     @property
     def dimension(self):
         """int: The dimension of the curve."""
-        return self.rhino_curve.Dimension
+        if self.rhino_curve:
+            return self.rhino_curve.Dimension
 
     @property
     def domain(self):
         """tuple of float: The parameter domain of the curve."""
-        return self.rhino_curve.Domain.T0, self.rhino_curve.Domain.T1
+        if self.rhino_curve:
+            return self.rhino_curve.Domain.T0, self.rhino_curve.Domain.T1
 
     @property
     def order(self):
         """int: The order of the curve (order = degree + 1)."""
-        return self.rhino_curve.Order
+        if self.rhino_curve:
+            return self.rhino_curve.Order
 
     @property
     def start(self):
         """:class:`compas.geometry.Point`: The point at the start of the curve."""
-        return point_to_compas(self.rhino_curve.PointAtStart)
+        if self.rhino_curve:
+            return point_to_compas(self.rhino_curve.PointAtStart)
 
     @property
     def end(self):
         """:class:`compas.geometry.Point`: The point at the end of the curve."""
-        return point_to_compas(self.rhino_curve.PointAtEnd)
+        if self.rhino_curve:
+            return point_to_compas(self.rhino_curve.PointAtEnd)
 
     @property
     def is_closed(self):
         """bool"""
-        return self.rhino_curve.IsClosed
+        if self.rhino_curve:
+            return self.rhino_curve.IsClosed
 
     @property
     def is_periodic(self):
         """bool"""
-        return self.rhino_curve.IsPeriodic
+        if self.rhino_curve:
+            return self.rhino_curve.IsPeriodic
 
     @property
     def is_rational(self):
         """bool"""
-        return self.rhino_curve.IsRational
+        if self.rhino_curve:
+            return self.rhino_curve.IsRational
 
     # ==============================================================================
     # Methods
     # ==============================================================================
 
     def copy(self):
         """Make an independent copy of the current curve."""
-        # return RhinoNurbsCurve.from_parameters(
-        #     self.points,
-        #     self.weights,
-        #     self.knots,
-        #     self.multiplicities,
-        #     self.degree,
-        #     self.is_periodic
-        # )
         cls = type(self)
         curve = cls()
         curve.rhino_curve = self.rhino_curve.Duplicate()