From 426282e4b05257489259ced7b14220e2be4cf00e Mon Sep 17 00:00:00 2001 From: asozinov Date: Thu, 13 Apr 2023 14:40:38 +0100 Subject: [PATCH] Porting to OCCT 7.7.0 --- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 2d9ff3b..0345bf4 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -76,6 +76,7 @@ #include #include +#include // Netgen include files #ifndef OCCGEOMETRY #define OCCGEOMETRY @@ -876,12 +877,21 @@ void NETGENPlugin_Mesher::SetLocalSizeForChordalError( netgen::OCCGeometry& occg { Standard_Integer n1,n2,n3; triangulation->Triangles()(i).Get( n1,n2,n3 ); +#if OCC_VERSION_LARGE < 0x07060000 p [0] = triangulation->Nodes()(n1).Transformed(loc).XYZ(); p [1] = triangulation->Nodes()(n2).Transformed(loc).XYZ(); p [2] = triangulation->Nodes()(n3).Transformed(loc).XYZ(); uv[0] = triangulation->UVNodes()(n1).XY(); uv[1] = triangulation->UVNodes()(n2).XY(); uv[2] = triangulation->UVNodes()(n3).XY(); +#elif + p[0] = triangulation->Node(n1).Transformed(loc).XYZ(); + p[1] = triangulation->Node(n2).Transformed(loc).XYZ(); + p[2] = triangulation->Node(n3).Transformed(loc).XYZ(); + uv[0] = triangulation->UVNode(n1).XY(); + uv[1] = triangulation->UVNode(n2).XY(); + uv[2] = triangulation->UVNode(n3).XY(); +#endif surfProp.SetParameters( uv[0].X(), uv[0].Y() ); if ( !surfProp.IsCurvatureDefined() ) break; @@ -1039,7 +1049,14 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom, BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc); if ( triangulation.IsNull() ) continue; const double fTol = BRep_Tool::Tolerance( TopoDS::Face( fExp.Current() )); - const TColgp_Array1OfPnt& points = triangulation->Nodes(); +#if OCC_VERSION_HEX < 0x070600 + const TColgp_Array1OfPnt& points = triangulation->Nodes(); +#else + auto points = [&triangulation](Standard_Integer index) { + return triangulation->Node(index); + }; +#endif + const Poly_Array1OfTriangle& trias = triangulation->Triangles(); for ( int iT = trias.Lower(); iT <= trias.Upper(); ++iT ) {