smal l fixes and docs

Author: tomvanmele

CHANGELOG.md

@@ -37,7 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas_rhino.conversions.docobjects.curveobject_to_compas`.
 * Added `compas_rhino.conversions.docobjects.meshobject_to_compas`.
 * Added `compas_rhino.conversions.docobjects.pointobject_to_compas`.
-* Added `compas_rhino.conversions.docobjects.surfaceobject_to_compas`.
 * Added `compas.datastructures.HashTree` and `compas.datastructures.HashNode`.
 
 ### Changed

docs/userguide/cad.rhino.rst

@@ -88,10 +88,183 @@ For more information on visualisation scenes, see :doc:`/userguide/basics.visual
 Conversions
 ===========
 
+For conversion between Rhino objects and COMPAS objects, different scenarios exist.
+
+Rhino Geometry to COMPAS
+------------------------
+
+Conversions of geometry is straightforward and explicit.
+
+.. code-block:: python
+
+    import Rhino.Geometry
+    import compas_rhino.conversions
+
+    point = Rhino.Geometry.Point3d(...)
+    point = compas_rhino.conversions.point_to_compas(point)
+
+    line = Rhino.Geometry.Line(...)
+    line = compas_rhino.conversions.line_to_compas(line)
+
+    plane = Rhino.Geometry.Plane(...)
+    plane = compas_rhino.conversions.plane_to_compas(plane)
+
+    box = Rhino.Geometry.Box(...)
+    box = compas_rhino.conversions.box_to_compas(box)
+
+    mesh = Rhino.Geometry.Mesh(...)
+    mesh = compas_rhino.conversions.mesh_to_compas(mesh)
+
+    curve = Rhino.Geometry.Curve(...)
+    curve = compas_rhino.conversions.curve_to_compas(curve)
+
+    surface = Rhino.Geometry.Surface(...)
+    surface = compas_rhino.conversions.surface_to_compas(surface)
+
+    brep = Rhino.Geometry.Brep(...)
+    brep = compas_rhino.conversions.brep_to_compas(brep)
+
+
+Note that Rhino doen't distinguish between a frame and a plane.
+Therefore, to convert `Rhino.Geometry.Plane` to :class:`compas.geometry.Frame`.
+
+.. code-block:: python
+
+    plane = Rhino.Geometry.Plane(...)
+    frame = compas_rhino.conversions.plane_to_compas_frame(plane)
+
+
+Rhino Object to COMPAS
+----------------------
+
+A Rhino Document contains Rhino Object instead of Rhino Geometry.
+The geometry of a Rhino Object is stored in the corresponding attribute (`obj.Geometry`).
+
+Converting point, curve, and mesh objects is straightforward.
+
+.. code-block:: python
+
+    import compas_rhino.objects
+    import compas_rhino.conversions
+
+    guid = compas_rhino.objects.select_point()
+    point = compas_rhino.conversions.pointobject_to_compas(guid)
+
+    guid = compas_rhino.objects.select_curve()
+    curve = compas_rhino.conversions.curveobject_to_compas(guid)
+
+    guid = compas_rhino.objects.select_mesh()
+    mesh = compas_rhino.conversions.meshobject_to_compas(guid)
+
+
+In the case of curve objects, note that the conversion function will return a NurbsCurve in almost all cases.
+If the curve has a specific geometry, it can be converted explicitly using the corresponding geomtry conversion function.
+For example, if the curve is a circle.
+
+.. code-block:: python
+
+    import compas_rhino.objects
+    import compas_rhino.conversions
+
+    guid = compas_rhino.objects.select_curve()
+    obj = compas_rhino.objects.find_object(guid)
+
+    circle = compas_rhino.conversions.curve_to_compas_circle(obj.Geometry)
+
+
+In the case of all other objects, conversions are a bit trickier.
+This is because in a Rhino Document, almost all other geometries are represented by a BrepObject regardless of the actual geometry type.
+For example, when you add a sphere to a model, the DocObject is a BrepObject, and the geometry of the object is a Brep.
+Therefore, conversions of other objects have to be done more carefully.
+
+.. code-block:: python
+
+    import compas_rhino.objects
+    import compas_rhino.conversions
+
+    guid = compas_rhino.objects.select_object()
+    brep = compas_rhino.conversions.brepobject_to_compas(guid)
+
+
+Also here, if the object is (supposed to be) a specific type of geometry,
+conversion can be done more explicitly using the geometry conversion functions instead.
+For example, if the geometry of the object is a Rhino Cylinder.
+
+.. code-block:: python
+
+    import compas_rhino.objects
+    import compas_rhino.conversions
+
+    guid = compas_rhino.objects.select_object()
+    obj = compas_rhino.objects.find_object(guid)
+
+    cylinder = compas_rhino.conversions.brep_to_compas_cylinder(obj.Geometry)
+
+
+COMPAS to Rhino Geometry
+------------------------
+
+.. code-block:: python
+
+    import compas.geometry
+    import compas_rhino.conversions
+
+    point = compas.geometry.Point(...)
+    point = compas_rhino.conversions.point_to_rhino(point)
+
+    line = compas.geometry.Line(...)
+    line = compas_rhino.conversions.line_to_rhino(line)
+
+    plane = compas.geometry.Plane(...)
+    plane = compas_rhino.conversions.plane_to_rhino(plane)
+
+    box = compas.geometry.Box(...)
+    box = compas_rhino.conversions.box_to_rhino(box)
+
+    curve = compas.geometry.Curve(...)
+    curve = compas_rhino.conversions.curve_to_rhino(curve)
+
+    surface = compas.geometry.Surface(...)
+    surface = compas_rhino.conversions.surface_to_rhino(surface)
+
+    brep = compas.geometry.Brep(...)
+    brep = compas_rhino.conversions.brep_to_rhino(brep)
+
+
+To convert a :class:`compas.geometry.Frame`.
+
+.. code-block:: python
+
+    frame = compas.geometry.Frame(...)
+    plane = compas_rhino.conversions.frame_to_rhino_plane(frame)
+
+
+COMPAS to Rhino Object
+----------------------
+
+COMPAS objects are converted to Rhino Objects implicitly, by placing them into a visualisation scene.
+However, you can create a Rhino Object in a Rhino Dcocument explicitly from a COMPAS object.
+
+.. code-block:: python
+
+    import scriptcontext as sc
+    import compas.geometry 
+    import compas_rhino_conversions
+
+    point = compas.geometry.Point(...)
+    geometry = compas_rhino.conversions.point_to_rhino(point)
+
+    guid = sc.doc.Objects.AddPoint(geometry)
+
 
 Data Exchange
 =============
 
+JSON
+----
+
+rhino3dm
+--------
 
 Remote Procedure Calls
 ======================

src/compas_rhino/conversions/__init__.py

@@ -70,6 +70,7 @@
 )
 from .breps import (
     brep_to_rhino,
+    brep_to_compas,
     brep_to_compas_box,
     brep_to_compas_cone,
     brep_to_compas_cylinder,
@@ -92,7 +93,6 @@
     curveobject_to_compas,
     meshobject_to_compas,
     pointobject_to_compas,
-    surfaceobject_to_compas,
 )
 
 
@@ -157,6 +157,7 @@
     "mesh_to_compas",
     # breps
     "brep_to_rhino",
+    "brep_to_compas",
     "brep_to_compas_box",
     "brep_to_compas_cone",
     "brep_to_compas_cylinder",
@@ -174,5 +175,4 @@
     "curveobject_to_compas",
     "meshobject_to_compas",
     "pointobject_to_compas",
-    "surfaceobject_to_compas",
 ]