Merge pull request #1086 from compas-dev/brep_from_native

Brep from native

Author: chenkasirer

CHANGELOG.md

@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed the `test_tangent` to work with a properly defined circle
 * `RhinoBrep` serialization works now with surface types other than NURBS.
 * Fixed bug in finding halfedge before a given halfedge if that halfedge is on the boundary (`Mesh.halfedge_before`).
+* Renamed `Brep.from_brep` to `Brep.from_native`.
 
 ### Removed
 

docs/tutorial/brep.rst

@@ -82,7 +82,7 @@ Every backend is expected to implement some alternative constructors
     >>> import Rhino
     >>> from compas.geometry import Brep
     >>> ...
-    >>> Brep.from_brep(Rhino.Geometry.Brep())
+    >>> Brep.from_native(Rhino.Geometry.Brep())
 
 Brep operations
 ===============

src/compas/geometry/brep/brep.py

@@ -12,7 +12,7 @@ def new_brep(*args, **kwargs):
 
 
 @pluggable(category="factories")
-def from_brep(*args, **kwargs):
+def from_native(*args, **kwargs):
     raise PluginNotInstalledError()
 
 
@@ -355,8 +355,8 @@ def centroid(self):
     # ==============================================================================
 
     @classmethod
-    def from_brep(cls, brep):
-        """Create a Brep from an instance of a backend Brep.
+    def from_native(cls, native_brep):
+        """Creates a Brep from an instance of a native backend Brep type.
 
         Parameters
         ----------
@@ -367,11 +367,11 @@ def from_brep(cls, brep):
         -------
         :class:`~compas.geometry.Brep`
         """
-        return from_brep(brep)
+        return from_native(native_brep)
 
     @classmethod
     def from_step_file(cls, filename):
-        """Conctruct a BRep from the data contained in a STEP file.
+        """Conctruct a Brep from the data contained in a STEP file.
 
         Parameters
         ----------

src/compas_rhino/geometry/brep/__init__.py

@@ -16,7 +16,7 @@
     "RhinoBrepLoop",
     "RhinoBrepFace",
     "new_brep",
-    "from_brep",
+    "from_native",
     "from_box",
 ]
 
@@ -29,8 +29,8 @@ def new_brep(*args, **kwargs):
 
 
 @plugin(category="factories", requires=["Rhino"])
-def from_brep(*args, **kwargs):
-    return RhinoBrep.from_brep(*args, **kwargs)
+def from_native(*args, **kwargs):
+    return RhinoBrep.from_native(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["Rhino"])

src/compas_rhino/geometry/brep/brep.py

@@ -134,8 +134,8 @@ def volume(self):
     # ==============================================================================
 
     @classmethod
-    def from_brep(cls, rhino_brep):
-        """Constructs a RhinoBrep from an instance of a Rhino brep
+    def from_native(cls, rhino_brep):
+        """Constructs a RhinoBrep from an instance of a Rhino.Geometry.Brep.
 
         Parameters
         ----------
@@ -165,7 +165,7 @@ def from_box(cls, box):
 
         """
         rhino_box = box_to_rhino(box)
-        return cls.from_brep(rhino_box.ToBrep())
+        return cls.from_native(rhino_box.ToBrep())
 
     @classmethod
     def from_cylinder(cls, cylinder):
@@ -182,7 +182,7 @@ def from_cylinder(cls, cylinder):
 
         """
         rhino_cylinder = cylinder_to_rhino(cylinder)
-        return cls.from_brep(rhino_cylinder.ToBrep(True, True))
+        return cls.from_native(rhino_cylinder.ToBrep(True, True))
 
     # ==============================================================================
     # Methods
@@ -255,7 +255,7 @@ def from_boolean_difference(cls, breps_a, breps_b):
             [b.native_brep for b in breps_b],
             TOLERANCE,
         )
-        return [RhinoBrep.from_brep(brep) for brep in resulting_breps]
+        return [RhinoBrep.from_native(brep) for brep in resulting_breps]
 
     @classmethod
     def from_boolean_union(cls, breps_a, breps_b):
@@ -280,7 +280,7 @@ def from_boolean_union(cls, breps_a, breps_b):
             breps_b = [breps_b]
 
         resulting_breps = Rhino.Geometry.Brep.CreateBooleanUnion([b.native_brep for b in breps_a + breps_b], TOLERANCE)
-        return [RhinoBrep.from_brep(brep) for brep in resulting_breps]
+        return [RhinoBrep.from_native(brep) for brep in resulting_breps]
 
     @classmethod
     def from_boolean_intersection(cls, breps_a, breps_b):
@@ -308,7 +308,7 @@ def from_boolean_intersection(cls, breps_a, breps_b):
             [b.native_brep for b in breps_b],
             TOLERANCE,
         )
-        return [RhinoBrep.from_brep(brep) for brep in resulting_breps]
+        return [RhinoBrep.from_native(brep) for brep in resulting_breps]
 
     def split(self, cutter):
         """Splits a Brep into pieces using a Brep as a cutter.
@@ -325,7 +325,7 @@ def split(self, cutter):
 
         """
         resulting_breps = self._brep.Split(cutter.native_brep, TOLERANCE)
-        return [RhinoBrep.from_brep(brep) for brep in resulting_breps]
+        return [RhinoBrep.from_native(brep) for brep in resulting_breps]
 
     # ==============================================================================
     # Other Methods

src/compas_rhino/geometry/brep/edge.py

@@ -2,6 +2,7 @@
 from compas.geometry import Line
 from compas.geometry import Point
 from compas.geometry import Circle
+from compas.geometry import Ellipse
 from compas_rhino.geometry import RhinoNurbsCurve
 from compas_rhino.conversions import curve_to_compas_line
 from compas_rhino.conversions import curve_to_compas_circle
@@ -85,7 +86,7 @@ def data(self, value):
         elif curve_type == "circle":
             self._curve = circle_to_rhino_curve(Circle.from_data(value["value"]))  # this returns a Nurbs Curve, why?
         elif curve_type == "ellipse":
-            self._curve = ellipse_to_rhino_curve(value["value"])
+            self._curve = ellipse_to_rhino_curve(Ellipse.from_data(value["value"]))
         else:
             self._curve = RhinoNurbsCurve.from_data(value["value"]).rhino_curve
 

src/compas_rhino/geometry/brep/face.py

@@ -1,4 +1,6 @@
 from compas.geometry import BrepFace
+from compas.geometry import Sphere
+from compas.geometry import Cylinder
 from compas_rhino.geometry import RhinoNurbsSurface
 from compas_rhino.conversions import plane_to_compas
 from compas_rhino.conversions import sphere_to_compas