Merge pull request #930 from compas-dev/rhino-newnurbs

Add Rhino plugins for NURBS curve pluggables

Author: tomvanmele

CHANGELOG.md

@@ -11,10 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added `CircleArtist`, `LineArtist`, `PointArtist`, `PolygonArtist`, `PolylineArtist`, and `VectorArtist` to `compas_blender`.
 * Added `draw_circles` and `draw_planes` to `compas_blender`.
+* Added `compas_rhino.geometry.curves` plugins for `compas.geometry.curves` pluggables.
 
 ### Changed
 
 * Replaced implementation of `RGBColour` and `Float` with deprecation warning in `compas.utilities.descriptors`.
+* Moved all Rhino geometry and objects wrappers to `compas_rhino.conversions`.
 
 ### Removed
 

src/compas_rhino/__init__.py

@@ -226,4 +226,5 @@ def _try_remove_bootstrapper(path):
     'compas_rhino.install',
     'compas_rhino.uninstall',
     'compas_rhino.artists',
+    'compas_rhino.geometry.curves',
 ]

src/compas_rhino/conversions/__init__.py

@@ -9,6 +9,30 @@
 
 Conversions between Rhino geometry objects (:mod:`Rhino.Geometry`) and COMPAS geometry objects (:mod:`compas.geometry`).
 
+Classes
+=======
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    RhinoGeometry
+    RhinoBox
+    RhinoCircle
+    RhinoCone
+    RhinoCurve
+    RhinoCylinder
+    RhinoEllipse
+    RhinoLine
+    RhinoMesh
+    RhinoPlane
+    RhinoPoint
+    RhinoPolyline
+    RhinoSphere
+    RhinoSurface
+    RhinoVector
+
+
 Exceptions
 ==========
 
@@ -19,8 +43,11 @@
     ConversionError
 
 
+Functions
+=========
+
 Primitives
-==========
+----------
 
 .. autosummary::
     :toctree: generated/
@@ -47,7 +74,7 @@
 
 
 Shapes
-======
+------
 
 .. autosummary::
     :toctree: generated/
@@ -64,7 +91,7 @@
 
 
 Curves
-======
+------
 
 .. autosummary::
     :toctree: generated/
@@ -80,19 +107,28 @@
 
 
 Surfaces
-========
+--------
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+Transformations
+---------------
 
 .. autosummary::
     :toctree: generated/
     :nosignatures:
 
+    xform_to_rhino
 
 """
 from __future__ import absolute_import
 
-from .exceptions import ConversionError
+from ._exceptions import ConversionError
 
-from .primitives import (
+from ._primitives import (
     point_to_rhino,
     vector_to_rhino,
     line_to_rhino,
@@ -113,7 +149,7 @@
     polyline_to_compas,
     polygon_to_compas
 )
-from .shapes import (
+from ._shapes import (
     box_to_rhino,
     sphere_to_rhino,
     cone_to_rhino,
@@ -124,7 +160,7 @@
     cone_to_compas,
     cylinder_to_compas,
 )
-from .curves import (
+from ._curves import (
     line_to_rhino_curve,
     circle_to_rhino_curve,
     ellipse_to_rhino_curve,
@@ -134,9 +170,29 @@
     curve_to_compas_line,
     curve_to_compas_polyline
 )
+from ._transformations import (
+    xform_to_rhino
+)
+
+from ._geometry import RhinoGeometry
+
+from .box import RhinoBox
+from .circle import RhinoCircle
+from .cone import RhinoCone
+from .curve import RhinoCurve
+from .cylinder import RhinoCylinder
+from .ellipse import RhinoEllipse
+from .line import RhinoLine
+from .mesh import RhinoMesh
+from .plane import RhinoPlane
+from .point import RhinoPoint
+from .polyline import RhinoPolyline
+from .sphere import RhinoSphere
+from .surface import RhinoSurface
+from .vector import RhinoVector
+
+BaseRhinoGeometry = RhinoGeometry
 
-# geometry to geometry conversions
-# Rhino object to geometry conversions
 
 __all__ = [
     'ConversionError',
@@ -179,4 +235,22 @@
     'curve_to_compas_ellipse',
     'curve_to_compas_line',
     'curve_to_compas_polyline',
+
+    'xform_to_rhino',
+
+    'RhinoGeometry',
+    'RhinoBox',
+    'RhinoCircle',
+    'RhinoCone',
+    'RhinoCurve',
+    'RhinoCylinder',
+    'RhinoEllipse',
+    'RhinoLine',
+    'RhinoMesh',
+    'RhinoPlane',
+    'RhinoPoint',
+    'RhinoPolyline',
+    'RhinoSphere',
+    'RhinoSurface',
+    'RhinoVector',
 ]

src/compas_rhino/conversions/curves.py renamed to src/compas_rhino/conversions/_curves.py

@@ -4,15 +4,15 @@
 
 from compas.geometry import Line
 
-from .exceptions import ConversionError
-
-from .primitives import line_to_rhino
-from .primitives import circle_to_rhino
-from .primitives import ellipse_to_rhino
-from .primitives import point_to_compas
-from .primitives import circle_to_compas
-from .primitives import ellipse_to_compas
-from .primitives import polyline_to_compas
+from ._exceptions import ConversionError
+
+from ._primitives import line_to_rhino
+from ._primitives import circle_to_rhino
+from ._primitives import ellipse_to_rhino
+from ._primitives import point_to_compas
+from ._primitives import circle_to_compas
+from ._primitives import ellipse_to_compas
+from ._primitives import polyline_to_compas
 
 from Rhino.Geometry import NurbsCurve as RhinoNurbsCurve
 

src/compas_rhino/conversions/exceptions.py renamed to src/compas_rhino/conversions/_exceptions.py

@@ -14,14 +14,14 @@
 from Rhino.Geometry import Cone as RhinoCone
 from Rhino.Geometry import Cylinder as RhinoCylinder
 
-from .primitives import plane_to_rhino
-from .primitives import circle_to_rhino
-from .primitives import frame_to_rhino
-from .primitives import point_to_rhino
-from .primitives import plane_to_compas_frame
-from .primitives import plane_to_compas
-from .primitives import point_to_compas
-from .primitives import vector_to_compas
+from ._primitives import plane_to_rhino
+from ._primitives import circle_to_rhino
+from ._primitives import frame_to_rhino
+from ._primitives import point_to_rhino
+from ._primitives import plane_to_compas_frame
+from ._primitives import plane_to_compas
+from ._primitives import point_to_compas
+from ._primitives import vector_to_compas
 
 
 def box_to_compas(box):

src/compas_rhino/geometry/_geometry.py renamed to src/compas_rhino/conversions/_geometry.py

@@ -6,8 +6,8 @@
 
 from Rhino.Geometry import NurbsSurface as RhinoNurbsSurface
 
-from .primitives import point_to_rhino
-from .primitives import point_to_compas
+from ._primitives import point_to_rhino
+from ._primitives import point_to_compas
 
 
 def surface_to_compas_data(surface):