fix bugs in curve and surface conversions

Author: tomvanmele

CHANGELOG.md

@@ -51,6 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed `compas_blender.artists.VolMeshArtist.draw` and `compas_blender.artists.VolMeshArtist.draw_cells`.
 * Fixed `compas_ghpython.artists.VolMeshArtist.draw` and `compas_ghpython.artists.VolMeshArtist.draw_cells`.
 * Fixed `compas_rhino.artists.VolMeshArtist.draw` and `compas_rhino.artists.VolMeshArtist.draw_cells`.
+* Fixed bug in `compas_rhino.conversions.RhinoCurve.to_compas`.
+* Fixed bug in `compas_rhino.conversions.RhinoSurface.to_compas`.
 
 ### Removed
 

src/compas_rhino/conversions/curve.py

@@ -60,9 +60,8 @@ def to_compas(self):
         -------
         :class:`~compas_rhino.geometry.RhinoNurbsCurve`
         """
-        from compas.geometry import NurbsCurve
-        curve = NurbsCurve()
-        curve.rhino_curve = self.geometry
+        from compas_rhino.geometry import RhinoNurbsCurve
+        curve = RhinoNurbsCurve.from_rhino(self.geometry)
         return curve
 
     def to_compas_circle(self):

src/compas_rhino/conversions/surface.py

@@ -35,6 +35,7 @@ def geometry(self, geometry):
         ------
         :class:`ConversionError`
             If the geometry cannot be converted to a surface.
+
         """
         if not isinstance(geometry, Rhino.Geometry.Surface):
             if not isinstance(geometry, Rhino.Geometry.Brep):
@@ -52,17 +53,15 @@ def to_compas(self):
         ------
         :class:`ConversionError`
             If the surface BRep contains more than one face.
+
         """
-        from compas.geometry import NurbsSurface
+        from compas_rhino.geometry import RhinoNurbsSurface
 
         brep = Rhino.Geometry.Brep.TryConvertBrep(self.geometry)
-        surface = NurbsSurface()
         if brep.Surfaces.Count > 1:
             raise ConversionError('Conversion of a BRep with multiple underlying surface is currently not supported.')
         for geometry in brep.Surfaces:
-            surface.rhino_surface = geometry
-            break
-        return surface
+            return RhinoNurbsSurface.from_rhino(geometry)
 
     def to_compas_mesh(self, cls=None, facefilter=None, cleanup=False):
         """Convert the surface b-rep loops to a COMPAS mesh.