log and update to latest compas

Author: tomvanmele

CHANGELOG.md

@@ -9,8 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `compas_occ.geometry.OCCCurve`.
+* Added `compas_occ.geometry.OCCSurface`.
+* Added `compas_occ.brep.BRep.__add__` to support boolean union through "+".
+* Added `compas_occ.brep.BRep.__sub__` to support boolean difference through "-".
+* Added `compas_occ.brep.BRep.__and__` to support boolean intersection through "&".
+
 ### Changed
 
+* Changed base class of `compas_occ.geometry.OCCNurbsCurve` to `compas_occ.geometry.OCCCurve`.
+* Changed base class of `compas_occ.geometry.OCCNurbsSurface` to `compas_occ.geometry.OCCSurface`.
+* Changed `compas_occ.brep.BRepEdge` to use `compas_occ.geometry.OCCCurve`.
+* Fixed bug in `compas_occ.brep.BRep.to_meshes`.
+* Fixed registration of curve plugin constructors to support multiple inheritance.
+* Fixed registration of surface plugin constructors to support multiple inheritance.
+
 ### Removed
 
 

docs/examples/surface_random.py

@@ -31,6 +31,6 @@
 for col in zip(* surface.points):
     view.add(Polyline(col), show_points=True, pointsize=20, pointcolor=(1, 0, 0), linewidth=2, linecolor=(0.3, 0.3, 0.3))
 
-view.add(surface.to_mesh(nu=100, nv=50))
+view.add(surface.to_mesh(nu=100, nv=100))
 
 view.run()

requirements.txt

@@ -1,3 +1,3 @@
-compas>=1.10
+compas>=1.14
 nptyping
 typing_extensions

src/compas_occ/conversions/primitives.py

@@ -4,12 +4,14 @@
 from compas.geometry import Vector
 from compas.geometry import Line
 from compas.geometry import Frame
+from compas.geometry import Circle
 
 from OCC.Core.gp import gp_Ax3
 from OCC.Core.gp import gp_Pnt
 from OCC.Core.gp import gp_Vec
 from OCC.Core.gp import gp_Dir
 from OCC.Core.gp import gp_Lin
+from OCC.Core.gp import gp_Circ
 
 
 def compas_point_to_occ_point(self: Point) -> gp_Pnt:
@@ -182,3 +184,7 @@ def compas_frame_from_occ_position(cls: Type[Frame], position: gp_Ax3) -> Frame:
         compas_vector_from_occ_direction(Vector, position.XDirection()),
         compas_vector_from_occ_direction(Vector, position.YDirection())
     )
+
+
+def compas_circle_to_occ(circle: Circle) -> gp_Circ:
+    """"""

src/compas_occ/geometry/curves/curve.py

@@ -3,6 +3,8 @@
 from compas.geometry import Frame
 from compas.geometry import Curve
 from compas.geometry import Box
+from compas.geometry import distance_point_point
+
 
 from OCC.Core.gp import gp_Trsf
 from OCC.Core.gp import gp_Pnt
@@ -12,6 +14,14 @@
 from OCC.Core.GCPnts import GCPnts_AbscissaPoint_Length
 from OCC.Core.Bnd import Bnd_Box
 from OCC.Core.BndLib import BndLib_Add3dCurve_Add
+from OCC.Core.GeomAPI import GeomAPI_ProjectPointOnCurve
+from OCC.Core.GeomAPI import GeomAPI_ExtremaCurveCurve
+from OCC.Core.TopoDS import topods_Edge
+from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakeEdge
+from OCC.Core.Interface import Interface_Static_SetCVal
+from OCC.Core.IFSelect import IFSelect_RetDone
+from OCC.Core.STEPControl import STEPControl_Writer
+from OCC.Core.STEPControl import STEPControl_AsIs
 
 from compas_occ.conversions import compas_point_from_occ_point
 from compas_occ.conversions import compas_vector_from_occ_vector
@@ -30,14 +40,8 @@ class OCCCurve(Curve):
 
     Attributes
     ----------
-    continuity : int, read-only
-        The degree of continuity of the curve.
-    degree : int, read-only
-        The degree of the curve.
     dimension : int, read-only
         The dimension of the curve.
-    order : int, read-only
-        The order of the curve (= degree + 1).
     domain : tuple[float, float], read-only
         The domain of the parameter space of the curve.
     start : :class:`~compas.geometry.Point`, read-only
@@ -60,49 +64,32 @@ def __init__(self, name=None):
         super().__init__(name=name)
         self._occ_curve = None
 
-    @property
-    def occ_curve(self):
-        return self._occ_curve
-
-    @occ_curve.setter
-    def occ_curve(self, curve):
-        self._occ_curve = curve
+    def __eq__(self, other):
+        return self.occ_curve.IsEqual(other.occ_curve)
 
     # ==============================================================================
     # Data
     # ==============================================================================
 
     # ==============================================================================
-    # Customization
+    # OCC Properties
     # ==============================================================================
 
-    def __eq__(self, other):
-        return self.occ_curve.IsEqual(other.occ_curve)
-
-    # ==============================================================================
-    # Constructors
-    # ==============================================================================
-
-    @classmethod
-    def from_occ(cls, occ_curve):
-        """Construct a NURBS curve from an existing OCC BSplineCurve.
-
-        Parameters
-        ----------
-        occ_curve : Geom_BSplineCurve
+    @property
+    def occ_curve(self):
+        return self._occ_curve
 
-        Returns
-        -------
-        :class:`OCCNurbsCurve`
+    @occ_curve.setter
+    def occ_curve(self, curve):
+        self._occ_curve = curve
 
-        """
-        curve = cls()
-        curve.occ_curve = occ_curve
-        return curve
+    @property
+    def occ_shape(self):
+        return BRepBuilderAPI_MakeEdge(self.occ_curve).Shape()
 
-    # ==============================================================================
-    # Conversions
-    # ==============================================================================
+    @property
+    def occ_edge(self):
+        return topods_Edge(self.occ_shape)
 
     # ==============================================================================
     # Properties
@@ -113,24 +100,10 @@ def dimension(self):
         if self.occ_curve:
             return 3
 
-    @property
-    def continuity(self):
-        if self.occ_curve:
-            return self.occ_curve.Continuity()
-
-    @property
-    def degree(self):
-        if self.occ_curve:
-            return self.occ_curve.Degree()
-
     @property
     def domain(self):
-        return self.occ_curve.FirstParameter(), self.occ_curve.LastParameter()
-
-    @property
-    def order(self):
         if self.occ_curve:
-            return self.degree + 1
+            return self.occ_curve.FirstParameter(), self.occ_curve.LastParameter()
 
     @property
     def start(self):
@@ -154,10 +127,83 @@ def is_periodic(self):
         if self.occ_curve:
             return self.occ_curve.IsPeriodic()
 
+    # ==============================================================================
+    # Constructors
+    # ==============================================================================
+
+    @classmethod
+    def from_occ(cls, occ_curve):
+        """Construct a NURBS curve from an existing OCC BSplineCurve.
+
+        Parameters
+        ----------
+        occ_curve : Geom_Curve
+
+        Returns
+        -------
+        :class:`OCCCurve`
+
+        """
+        curve = cls()
+        curve.occ_curve = occ_curve
+        return curve
+
+    # @classmethod
+    # def from_circle(cls, circle):
+    #     """Construct a general parametric curve from a circle.
+
+    #     Parameters
+    #     ----------
+    #     circle : :class:`~compas.geometry.Circle`
+    #         A primitive circle.
+
+    #     Returns
+    #     -------
+    #     :class:`OCCCurve`
+
+    #     """
+
+    # ==============================================================================
+    # Conversions
+    # ==============================================================================
+
+    def to_step(self, filepath, schema="AP203"):
+        """Write the curve geometry to a STP file.
+
+        Parameters
+        ----------
+        filepath : str
+        schema : str, optional
+
+        Returns
+        -------
+        None
+
+        """
+        step_writer = STEPControl_Writer()
+        Interface_Static_SetCVal("write.step.schema", schema)
+        step_writer.Transfer(self.occ_edge, STEPControl_AsIs)
+        status = step_writer.Write(filepath)
+        if status != IFSelect_RetDone:
+            raise AssertionError("Operation failed.")
+
     # ==============================================================================
     # Methods
     # ==============================================================================
 
+    def copy(self):
+        """Make an independent copy of the current curve.
+
+        Returns
+        -------
+        :class:`compas_occ.geometry.OCCCurve`
+
+        """
+        cls = type(self)
+        curve = cls()
+        curve.occ_curve = self.occ_curve.Copy()
+        return curve
+
     def transform(self, T):
         """Transform this curve.
 
@@ -288,6 +334,10 @@ def frame_at(self, t):
         self.occ_curve.D2(t, point, uvec, vvec)
         return Frame(Point.from_occ(point), Vector.from_occ(uvec), Vector.from_occ(vvec))
 
+    # ==============================================================================
+    # Methods continued
+    # ==============================================================================
+
     def aabb(self, precision=0.0):
         """Compute the axis aligned bounding box of the curve.
 
@@ -304,7 +354,8 @@ def aabb(self, precision=0.0):
         BndLib_Add3dCurve_Add(GeomAdaptor_Curve(self.occ_curve), precision, box)
         return Box.from_diagonal((
             Point.from_occ(box.CornerMin()),
-            Point.from_occ(box.CornerMax())))
+            Point.from_occ(box.CornerMax())
+        ))
 
     def length(self, precision=1e-3):
         """Compute the length of the curve.
@@ -319,3 +370,91 @@ def length(self, precision=1e-3):
 
         """
         return GCPnts_AbscissaPoint_Length(GeomAdaptor_Curve(self.occ_curve))
+
+    def closest_point(self, point, return_parameter=False):
+        """Compute the closest point on the curve to a given point.
+        If an orthogonal projection is not possible, the start or end point is returned, whichever is closer.
+
+        Parameters
+        ----------
+        point : :class:`~compas.geometry.Point`
+            The point to project to the curve.
+        return_parameter : bool, optional
+            If True, return the curve parameter in addition to the closest point.
+
+        Returns
+        -------
+        :class:`~compas.geometry.Point` | tuple[:class:`~compas.geometry.Point`, float]
+            If `return_parameter` is False, the nearest point on the curve.
+            If `return_parameter` is True, the nearest point on the curve and the corresponding parameter.
+
+        """
+        projector = GeomAPI_ProjectPointOnCurve(point.to_occ(), self.occ_curve)
+        try:
+            point = Point.from_occ(projector.NearestPoint())
+            if return_parameter:
+                parameter = projector.LowerDistanceParameter()
+        except RuntimeError as e:
+            if e.args[0].startswith('StdFail_NotDoneGeomAPI_ProjectPointOnCurve::NearestPoint'):
+                start = self.start
+                end = self.end
+                if distance_point_point(point, start) <= distance_point_point(point, end):
+                    point = start
+                    if return_parameter:
+                        parameter = self.occ_curve.FirstParameter()
+                else:
+                    point = end
+                    if return_parameter:
+                        parameter = self.occ_curve.LastParameter()
+            else:
+                raise
+        if not return_parameter:
+            return point
+        return point, parameter
+
+    def closest_parameters_curve(self, curve, return_distance=False):
+        """Computes the curve parameters where the curve is the closest to another given curve.
+
+        Parameters
+        ----------
+        curve : :class:`~compas_occ.geometry.OCCNurbsCurve`
+            The curve to find the closest distance to.
+        return_distance : bool, optional
+            If True, return the minimum distance between the two curves in addition to the curve parameters.
+
+        Returns
+        -------
+        tuple[float, float] | tuple[tuple[float, float], float]
+            If `return_distance` is False, the lowest distance parameters on the two curves.
+            If `return_distance` is True, the distance between the two curves in addition to the curve parameters.
+
+        """
+        extrema = GeomAPI_ExtremaCurveCurve(self.occ_curve, curve.occ_curve)
+        if not return_distance:
+            return extrema.LowerDistanceParameters()
+        return extrema.LowerDistanceParameters(), extrema.LowerDistance()
+
+    def closest_points_curve(self, curve, return_distance=False):
+        """Computes the points on curves where the curve is the closest to another given curve.
+
+        Parameters
+        ----------
+        curve : :class:`~compas_occ.geometry.OCCNurbsCurve`
+            The curve to find the closest distance to.
+        return_distance : bool, optional
+            If True, return the minimum distance between the curves in addition to the closest points.
+
+        Returns
+        -------
+        tuple[:class:`~compas.geometry.Point`, :class:`~compas.geometry.Point`] | tuple[tuple[:class:`~compas.geometry.Point`, :class:`~compas.geometry.Point`], float]
+            If `return_distance` is False, the closest points.
+            If `return_distance` is True, the distance in addition to the closest points.
+
+        """
+        a, b = gp_Pnt(), gp_Pnt()
+        extrema = GeomAPI_ExtremaCurveCurve(self.occ_curve, curve.occ_curve)
+        extrema.NearestPoints(a, b)
+        points = Point.from_occ(a), Point.from_occ(b)
+        if not return_distance:
+            return points
+        return points, extrema.LowerDistance()