update to latest compas

Author: tomvanmele

requirements.txt

@@ -1 +1 @@
-compas >=2.1
+compas >=2.3

src/compas_occ/geometry/curves/__init__.py

@@ -1,47 +1,35 @@
 from .curve2d import OCCCurve2d  # noqa : F401
-from .curve import OCCCurve  # noqa: F401
+from .curve import OCCCurve
 from .nurbs import OCCNurbsCurve
 
-from compas.geometry import Curve
-from compas.geometry import NurbsCurve
-
 from compas.plugins import plugin
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_curve(cls, *args, **kwargs):
-    # curve = object.__new__(OCCCurve)
-    # return curve
-    return super(Curve, cls).__new__(cls)
+def curve_from_native(cls, *args, **kwargs):
+    return OCCCurve.from_native(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve(cls, *args, **kwargs):
-    # curve = object.__new__(OCCNurbsCurve)
-    # return curve
-    return super(NurbsCurve, cls).__new__(cls)
+def nurbscurve_from_native(cls, *args, **kwargs):
+    return OCCNurbsCurve.from_native(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve_from_native(cls, *args, **kwargs):
-    return OCCNurbsCurve.from_occ(*args, **kwargs)
+def nurbscurve_from_interpolation(cls, *args, **kwargs):
+    return OCCNurbsCurve.from_interpolation(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve_from_parameters(cls, *args, **kwargs):
+def nurbscurve_from_parameters(cls, *args, **kwargs):
     return OCCNurbsCurve.from_parameters(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve_from_points(cls, *args, **kwargs):
+def nurbscurve_from_points(cls, *args, **kwargs):
     return OCCNurbsCurve.from_points(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve_from_interpolation(cls, *args, **kwargs):
-    return OCCNurbsCurve.from_interpolation(*args, **kwargs)
-
-
-@plugin(category="factories", requires=["compas_occ"])
-def new_nurbscurve_from_step(cls, *args, **kwargs):
+def nurbscurve_from_step(cls, *args, **kwargs):
     return OCCNurbsCurve.from_step(*args, **kwargs)

src/compas_occ/geometry/curves/curve.py

@@ -63,11 +63,10 @@ class OCCCurve(Curve):
 
     """
 
-    def __init__(self, occ_curve: Geom_Curve, name=None):
+    def __init__(self, native_curve: Geom_Curve, name=None):
         super().__init__(name=name)
         self._dimension = 3
-        self._occ_curve: Geom_Curve = None  # type: ignore
-        self.occ_curve = occ_curve
+        self._native_curve: Geom_Curve = native_curve
 
     def __eq__(self, other: "OCCCurve") -> bool:
         raise NotImplementedError
@@ -81,16 +80,20 @@ def __eq__(self, other: "OCCCurve") -> bool:
     # ==============================================================================
 
     @property
-    def occ_curve(self) -> Geom_Curve:
-        return self._occ_curve
+    def native_curve(self) -> Geom_Curve:
+        return self._native_curve
 
-    @occ_curve.setter
-    def occ_curve(self, curve: Geom_Curve):
-        self._occ_curve = curve
+    @native_curve.setter
+    def native_curve(self, curve: Geom_Curve):
+        self._native_curve = curve
+
+    @property
+    def occ_curve(self) -> Geom_Curve:
+        return self._native_curve
 
     @property
     def occ_shape(self) -> TopoDS_Shape:
-        return BRepBuilderAPI_MakeEdge(self.occ_curve).Shape()
+        return BRepBuilderAPI_MakeEdge(self.native_curve).Shape()
 
     @property
     def occ_edge(self) -> TopoDS_Edge:
@@ -106,7 +109,7 @@ def dimension(self) -> int:
 
     @property
     def domain(self) -> Tuple[float, float]:
-        return self.occ_curve.FirstParameter(), self.occ_curve.LastParameter()
+        return self.native_curve.FirstParameter(), self.native_curve.LastParameter()
 
     @property
     def start(self) -> Point:
@@ -118,31 +121,50 @@ def end(self) -> Point:
 
     @property
     def is_closed(self) -> bool:
-        return self.occ_curve.IsClosed()
+        return self.native_curve.IsClosed()
 
     @property
     def is_periodic(self) -> bool:
-        return self.occ_curve.IsPeriodic()
+        return self.native_curve.IsPeriodic()
 
     # ==============================================================================
     # Constructors
     # ==============================================================================
 
     @classmethod
-    def from_occ(cls, occ_curve: Geom_Curve) -> "OCCCurve":
-        """Construct a NURBS curve from an existing OCC BSplineCurve.
+    def from_native(cls, native_curve: Geom_Curve) -> "OCCCurve":
+        """Construct a curve from an existing OCC BSplineCurve.
 
         Parameters
         ----------
-        occ_curve : Geom_Curve
+        native_curve : Geom_Curve
 
         Returns
         -------
         :class:`OCCCurve`
 
         """
-        curve = cls(occ_curve)
-        return curve
+        return cls(native_curve)
+
+    @classmethod
+    def from_occ(cls, native_curve: Geom_Curve) -> "OCCCurve":
+        """Construct a curve from an existing OCC BSplineCurve.
+
+        Parameters
+        ----------
+        native_curve : Geom_Curve
+
+        Returns
+        -------
+        :class:`OCCCurve`
+
+        Warnings
+        --------
+        .. deprecated:: 1.3
+            Use `from_native` instead.
+
+        """
+        return cls(native_curve)
 
     # ==============================================================================
     # Conversions
@@ -196,8 +218,8 @@ def copy(self) -> "OCCCurve":
 
         """
         cls = type(self)
-        occ_curve = self.occ_curve.Copy()
-        return cls(occ_curve)  # type: ignore (Copy returns Geom_Geometry)
+        native_curve = self.native_curve.Copy()
+        return cls(native_curve)  # type: ignore (Copy returns Geom_Geometry)
 
     def transform(self, T: Transformation) -> None:
         """Transform this curve.
@@ -211,7 +233,7 @@ def transform(self, T: Transformation) -> None:
         None
 
         """
-        self.occ_curve.Transform(compas_transformation_to_trsf(T))
+        self.native_curve.Transform(compas_transformation_to_trsf(T))
 
     def reverse(self) -> None:
         """Reverse the parametrisation of the curve.
@@ -221,7 +243,7 @@ def reverse(self) -> None:
         None
 
         """
-        self.occ_curve.Reverse()
+        self.native_curve.Reverse()
 
     def point_at(self, t: float) -> Point:
         """Compute the point at a curve parameter.
@@ -241,11 +263,11 @@ def point_at(self, t: float) -> Point:
             If the parameter is not in the curve domain.
 
         """
-        start, end = self.domain  # type: ignore (domain could be None if no occ_curve is set)
+        start, end = self.domain  # type: ignore (domain could be None if no native_curve is set)
         if t < start or t > end:
             raise ValueError("The parameter is not in the domain of the curve. t = {}, domain: {}".format(t, self.domain))
 
-        point = self.occ_curve.Value(t)
+        point = self.native_curve.Value(t)
         return point_to_compas(point)
 
     def tangent_at(self, t: float) -> Vector:
@@ -266,13 +288,13 @@ def tangent_at(self, t: float) -> Vector:
             If the parameter is not in the curve domain.
 
         """
-        start, end = self.domain  # type: ignore (domain could be None if no occ_curve is set)
+        start, end = self.domain  # type: ignore (domain could be None if no native_curve is set)
         if t < start or t > end:
             raise ValueError("The parameter is not in the domain of the curve.")
 
         point = gp_Pnt()
         uvec = gp_Vec()
-        self.occ_curve.D1(t, point, uvec)
+        self.native_curve.D1(t, point, uvec)
 
         return vector_to_compas(uvec)
 
@@ -294,14 +316,14 @@ def curvature_at(self, t: float) -> Vector:
             If the parameter is not in the curve domain.
 
         """
-        start, end = self.domain  # type: ignore (domain could be None if no occ_curve is set)
+        start, end = self.domain  # type: ignore (domain could be None if no native_curve is set)
         if t < start or t > end:
             raise ValueError("The parameter is not in the domain of the curve.")
 
         point = gp_Pnt()
         uvec = gp_Vec()
         vvec = gp_Vec()
-        self.occ_curve.D2(t, point, uvec, vvec)
+        self.native_curve.D2(t, point, uvec, vvec)
 
         return vector_to_compas(vvec)
 
@@ -323,14 +345,14 @@ def frame_at(self, t: float) -> Frame:
             If the parameter is not in the curve domain.
 
         """
-        start, end = self.domain  # type: ignore (domain could be None if no occ_curve is set)
+        start, end = self.domain  # type: ignore (domain could be None if no native_curve is set)
         if t < start or t > end:
             raise ValueError("The parameter is not in the domain of the curve.")
 
         point = gp_Pnt()
         uvec = gp_Vec()
         vvec = gp_Vec()
-        self.occ_curve.D2(t, point, uvec, vvec)
+        self.native_curve.D2(t, point, uvec, vvec)
 
         return Frame(
             point_to_compas(point),
@@ -363,7 +385,7 @@ def parameter_at_distance(
             The new parameter.
 
         """
-        a = GCPnts_AbscissaPoint(GeomAdaptor_Curve(self.occ_curve), distance, t, precision)
+        a = GCPnts_AbscissaPoint(GeomAdaptor_Curve(self.native_curve), distance, t, precision)
         return a.Parameter()
 
     def aabb(self, precision: float = 0.0) -> Box:
@@ -379,7 +401,7 @@ def aabb(self, precision: float = 0.0) -> Box:
 
         """
         box = Bnd_Box()
-        BndLib_Add3dCurve.Add(GeomAdaptor_Curve(self.occ_curve), precision, box)
+        BndLib_Add3dCurve.Add(GeomAdaptor_Curve(self.native_curve), precision, box)
         return Box.from_diagonal(
             (
                 point_to_compas(box.CornerMin()),
@@ -399,7 +421,7 @@ def length(self, precision: float = 1e-3) -> float:
         float
 
         """
-        return GCPnts_AbscissaPoint.Length(GeomAdaptor_Curve(self.occ_curve), precision)
+        return GCPnts_AbscissaPoint.Length(GeomAdaptor_Curve(self.native_curve), precision)
 
     def closest_point(
         self,
@@ -424,7 +446,7 @@ def closest_point(
             If `return_parameter` is True, the nearest point on the curve and the corresponding parameter.
 
         """
-        projector = GeomAPI_ProjectPointOnCurve(point_to_occ(point), self.occ_curve)
+        projector = GeomAPI_ProjectPointOnCurve(point_to_occ(point), self.native_curve)
 
         try:
             point = point_to_compas(projector.NearestPoint())
@@ -448,11 +470,11 @@ def closest_point(
             if d_start <= d_end:
                 if not return_parameter:
                     return start
-                return start, self.occ_curve.FirstParameter()
+                return start, self.native_curve.FirstParameter()
 
             if not return_parameter:
                 return end
-            return end, self.occ_curve.LastParameter()
+            return end, self.native_curve.LastParameter()
 
     def closest_parameters_curve(
         self,
@@ -475,7 +497,7 @@ def closest_parameters_curve(
             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)
+        extrema = GeomAPI_ExtremaCurveCurve(self.native_curve, curve.native_curve)
         if not return_distance:
             return extrema.LowerDistanceParameters()
         return extrema.LowerDistanceParameters(), extrema.LowerDistance()
@@ -502,7 +524,7 @@ def closest_points_curve(
 
         """
         a, b = gp_Pnt(), gp_Pnt()
-        extrema = GeomAPI_ExtremaCurveCurve(self.occ_curve, curve.occ_curve)
+        extrema = GeomAPI_ExtremaCurveCurve(self.native_curve, curve.native_curve)
         extrema.NearestPoints(a, b)
         points = point_to_compas(a), point_to_compas(b)
         if not return_distance:
@@ -540,7 +562,7 @@ def divide_by_count(
         a, b = self.domain
         t = a
         params = [t]
-        adaptor = GeomAdaptor_Curve(self.occ_curve)
+        adaptor = GeomAdaptor_Curve(self.native_curve)
         for _ in range(count - 1):
             a = GCPnts_AbscissaPoint(adaptor, length, t, precision)
             t = a.Parameter()
@@ -587,7 +609,7 @@ def divide_by_length(
         a, b = self.domain
         t = a
         params = [t]
-        adaptor = GeomAdaptor_Curve(self.occ_curve)
+        adaptor = GeomAdaptor_Curve(self.native_curve)
         for _ in range(count - 1):
             a = GCPnts_AbscissaPoint(adaptor, length, t, precision)
             t = a.Parameter()
@@ -611,7 +633,7 @@ def projected(self, surface) -> "OCCCurve":
         :class:`OCCCurve`
 
         """
-        result = geomprojlib.Project(self.occ_curve, surface.occ_surface)
+        result = geomprojlib.Project(self.native_curve, surface.occ_surface)
         curve = OCCCurve.from_occ(result)
         return curve
 
@@ -628,7 +650,7 @@ def embedded(self, surface) -> OCCCurve2d:
         :class:`OCCCurve2d`
 
         """
-        result = geomprojlib.Curve2d(self.occ_curve, surface.occ_surface)
+        result = geomprojlib.Curve2d(self.native_curve, surface.occ_surface)
         curve = OCCCurve2d.from_occ(result)
         return curve
 
@@ -651,9 +673,9 @@ def offset(self, distance: float, direction: Vector) -> "OCCCurve":
         :class:`OCCCurve`
 
         """
-        occ_curve = Geom_OffsetCurve(
-            self.occ_curve,
+        native_curve = Geom_OffsetCurve(
+            self.native_curve,
             distance,
             direction_to_occ(direction),
         )
-        return OCCCurve.from_occ(occ_curve)
+        return OCCCurve.from_occ(native_curve)