Geom evaluator

src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx

@@ -18,6 +18,7 @@
 
 #include <Geom2d_Curve.hxx>
 #include <Geom2d_Line.hxx>
+#include <Geom2dAdaptor_Curve.hxx>
 #include <Geom_Curve.hxx>
 #include <Geom_Surface.hxx>
 #include <GeomAdaptor_Curve.hxx>

src/ModelingAlgorithms/TKShHealing/ShapeUpgrade/ShapeUpgrade_SplitSurface.cxx

@@ -22,6 +22,7 @@
 #include <Geom_Surface.hxx>
 #include <Geom_SurfaceOfLinearExtrusion.hxx>
 #include <Geom_SurfaceOfRevolution.hxx>
+#include <gp_Ax1.hxx>
 #include <Precision.hxx>
 #include <ShapeExtend.hxx>
 #include <ShapeExtend_CompositeSurface.hxx>

src/ModelingData/TKBRep/BRepAdaptor/BRepAdaptor_Curve2d.cxx

@@ -38,14 +38,32 @@ Handle(Adaptor2d_Curve2d) BRepAdaptor_Curve2d::ShallowCopy() const
 {
   Handle(BRepAdaptor_Curve2d) aCopy = new BRepAdaptor_Curve2d();
 
-  aCopy->myCurve        = myCurve;
-  aCopy->myTypeCurve    = myTypeCurve;
-  aCopy->myFirst        = myFirst;
-  aCopy->myLast         = myLast;
-  aCopy->myBSplineCurve = myBSplineCurve;
-  if (!myNestedEvaluator.IsNull())
+  aCopy->myCurve     = myCurve;
+  aCopy->myTypeCurve = myTypeCurve;
+  aCopy->myFirst     = myFirst;
+  aCopy->myLast      = myLast;
+
+  // Copy curve-specific data based on variant type
+  if (const auto* anOffsetData = std::get_if<OffsetData>(&myCurveData))
+  {
+    OffsetData aNewData;
+    if (!anOffsetData->BasisAdaptor.IsNull())
+    {
+      aNewData.BasisAdaptor =
+        Handle(Geom2dAdaptor_Curve)::DownCast(anOffsetData->BasisAdaptor->ShallowCopy());
+    }
+    aNewData.Offset    = anOffsetData->Offset;
+    aCopy->myCurveData = std::move(aNewData);
+  }
+  else if (const auto* aBSplineData = std::get_if<BSplineData>(&myCurveData))
+  {
+    BSplineData aNewData;
+    aNewData.Curve     = aBSplineData->Curve;
+    aCopy->myCurveData = std::move(aNewData);
+  }
+  else if (std::holds_alternative<BezierData>(myCurveData))
   {
-    aCopy->myNestedEvaluator = myNestedEvaluator->ShallowCopy();
+    aCopy->myCurveData = BezierData{};
   }
 
   return aCopy;

src/ModelingData/TKG2d/Adaptor2d/Adaptor2d_OffsetCurve.cxx

@@ -14,7 +14,7 @@
 #include <Adaptor2d_OffsetCurve.hxx>
 #include <Geom2d_BezierCurve.hxx>
 #include <Geom2d_BSplineCurve.hxx>
-#include <Geom2dEvaluator.hxx>
+#include <Geom2d_OffsetUtils.pxx>
 #include <gp_Ax22d.hxx>
 #include <gp_Circ2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -282,7 +282,7 @@ gp_Pnt2d Adaptor2d_OffsetCurve::Value(const Standard_Real U) const
     gp_Pnt2d aP;
     gp_Vec2d aV;
     myCurve->D1(U, aP, aV);
-    Geom2dEvaluator::CalculateD0(aP, aV, myOffset);
+    Geom2d_OffsetUtils::CalculateD0(aP, aV, myOffset);
     return aP;
   }
   else
@@ -306,7 +306,7 @@ void Adaptor2d_OffsetCurve::D1(const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V)
   {
     gp_Vec2d aV2;
     myCurve->D2(U, P, V, aV2);
-    Geom2dEvaluator::CalculateD1(P, V, aV2, myOffset);
+    Geom2d_OffsetUtils::CalculateD1(P, V, aV2, myOffset);
   }
   else
   {
@@ -322,7 +322,7 @@ void Adaptor2d_OffsetCurve::D2(const Standard_Real U, gp_Pnt2d& P, gp_Vec2d& V1,
   {
     gp_Vec2d aV3;
     myCurve->D3(U, P, V1, V2, aV3);
-    Geom2dEvaluator::CalculateD2(P, V1, V2, aV3, Standard_False, myOffset);
+    Geom2d_OffsetUtils::CalculateD2(P, V1, V2, aV3, Standard_False, myOffset);
   }
   else
   {
@@ -342,7 +342,7 @@ void Adaptor2d_OffsetCurve::D3(const Standard_Real U,
   {
     gp_Vec2d aV4 = myCurve->DN(U, 4);
     myCurve->D3(U, P, V1, V2, V3);
-    Geom2dEvaluator::CalculateD3(P, V1, V2, V3, aV4, Standard_False, myOffset);
+    Geom2d_OffsetUtils::CalculateD3(P, V1, V2, V3, aV4, Standard_False, myOffset);
   }
   else
   {

src/ModelingData/TKG2d/Geom2d/FILES.cmake

@@ -31,6 +31,7 @@ set(OCCT_Geom2d_FILES
   Geom2d_Line.hxx
   Geom2d_OffsetCurve.cxx
   Geom2d_OffsetCurve.hxx
+  Geom2d_OffsetUtils.pxx
   Geom2d_Parabola.cxx
   Geom2d_Parabola.hxx
   Geom2d_Point.cxx