X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHUtils%2FSMESH_Delaunay.cxx;h=4771c6da890a3fd79abe7e32eb71e2b409b8cae3;hb=ad718f985481e242cb34b54e1b373066b1a5bda3;hp=e53bfd8fcda9257d91bf8ca1026e9f07e372cab1;hpb=651e7566c8d9c267c71320c63d3742a92426aa3e;p=modules%2Fsmesh.git diff --git a/src/SMESHUtils/SMESH_Delaunay.cxx b/src/SMESHUtils/SMESH_Delaunay.cxx index e53bfd8fc..4771c6da8 100644 --- a/src/SMESHUtils/SMESH_Delaunay.cxx +++ b/src/SMESHUtils/SMESH_Delaunay.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -32,13 +32,14 @@ #include #include +#include + //================================================================================ /*! * \brief Construct a Delaunay triangulation of given boundary nodes * \param [in] boundaryNodes - vector of nodes of a wire * \param [in] face - the face * \param [in] faceID - the face ID - * \param [in] nbNodesToVisit - nb of non-marked nodes on the face */ //================================================================================ @@ -54,6 +55,8 @@ SMESH_Delaunay::SMESH_Delaunay(const std::vector< const UVPtStructVec* > & bound const int nbDiv = 100; const double uRange = surf.LastUParameter() - surf.FirstUParameter(); const double vRange = surf.LastVParameter() - surf.FirstVParameter(); + const double uFixed = surf.FirstUParameter() + 0.5 * uRange; + const double vFixed = surf.FirstVParameter() + 0.5 * vRange; const double dU = uRange / nbDiv; const double dV = vRange / nbDiv; double u = surf.FirstUParameter(), v = surf.FirstVParameter(); @@ -61,10 +64,10 @@ SMESH_Delaunay::SMESH_Delaunay(const std::vector< const UVPtStructVec* > & bound double lenU = 0, lenV = 0; for ( ; u < surf.LastUParameter(); u += dU, v += dV ) { - gp_Pnt p1U = surf.Value( u, surf.FirstVParameter() ); + gp_Pnt p1U = surf.Value( u, vFixed ); lenU += p1U.Distance( p0U ); p0U = p1U; - gp_Pnt p1V = surf.Value( surf.FirstUParameter(), v ); + gp_Pnt p1V = surf.Value( uFixed, v ); lenV += p1V.Distance( p0V ); p0V = p1V; } @@ -82,7 +85,11 @@ SMESH_Delaunay::SMESH_Delaunay(const std::vector< const UVPtStructVec* > & bound _bndNodes.resize( nbP ); // fill boundary points +#if OCC_VERSION_LARGE <= 0x07030000 BRepMesh::Array1OfVertexOfDelaun bndVert( 1, 1 + nbP ); +#else + IMeshData::Array1OfVertexOfDelaun bndVert( 1, 1 + nbP ); +#endif BRepMesh_Vertex v( 0, 0, BRepMesh_Frontier ); for ( size_t iW = 0; iW < boundaryNodes.size(); ++iW ) { @@ -193,21 +200,22 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY& nodeUVs[1] = _triaDS->GetNode( nodeIDs[1] ).Coord(); nodeUVs[2] = _triaDS->GetNode( nodeIDs[2] ).Coord(); - if ( _triaDS->GetNode( nodeIDs[0] ).Movability() == BRepMesh_Frontier && - _triaDS->GetNode( nodeIDs[1] ).Movability() == BRepMesh_Frontier && - _triaDS->GetNode( nodeIDs[2] ).Movability() == BRepMesh_Frontier ) + SMESH_MeshAlgos::GetBarycentricCoords( uv, + nodeUVs[0], nodeUVs[1], nodeUVs[2], + bc[0], bc[1] ); + if ( bc[0] >= 0 && bc[1] >= 0 && bc[0] + bc[1] <= 1 ) { - SMESH_MeshAlgos::GetBarycentricCoords( uv, - nodeUVs[0], nodeUVs[1], nodeUVs[2], - bc[0], bc[1] ); - if ( bc[0] >= 0 && bc[1] >= 0 && bc[0] + bc[1] <= 1 ) + if ( _triaDS->GetNode( nodeIDs[0] ).Movability() != BRepMesh_Frontier || + _triaDS->GetNode( nodeIDs[1] ).Movability() != BRepMesh_Frontier || + _triaDS->GetNode( nodeIDs[2] ).Movability() != BRepMesh_Frontier ) { - bc[2] = 1 - bc[0] - bc[1]; - triaNodes[0] = nodeIDs[0] - 1; - triaNodes[1] = nodeIDs[1] - 1; - triaNodes[2] = nodeIDs[2] - 1; - return tria; + return 0; } + bc[2] = 1 - bc[0] - bc[1]; + triaNodes[0] = nodeIDs[0] - 1; + triaNodes[1] = nodeIDs[1] - 1; + triaNodes[2] = nodeIDs[2] - 1; + return tria; } // look for a neighbor triangle, which is adjacent to a link intersected @@ -217,7 +225,11 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY& gp_XY seg = uv - gc; tria->Edges( linkIDs, ori ); +#if OCC_VERSION_LARGE <= 0x07030000 int triaID = _triaDS->IndexOf( *tria ); +#else + int triaID = tria - & ( _triaDS->GetElement( 0 )); +#endif tria = 0; for ( int i = 0; i < 3; ++i ) @@ -259,10 +271,17 @@ const BRepMesh_Triangle* SMESH_Delaunay::FindTriangle( const gp_XY& const BRepMesh_Triangle* SMESH_Delaunay::GetTriangleNear( int iBndNode ) { + if ( iBndNode >= _triaDS->NbNodes() ) + return 0; int nodeIDs[3]; int nbNbNodes = _bndNodes.size(); - const BRepMesh::ListOfInteger & linkIds = _triaDS->LinksConnectedTo( iBndNode + 1 ); - BRepMesh::ListOfInteger::const_iterator iLink = linkIds.cbegin(); +#if OCC_VERSION_LARGE <= 0x07030000 + typedef BRepMesh::ListOfInteger TLinkList; +#else + typedef IMeshData::ListOfInteger TLinkList; +#endif + const TLinkList & linkIds = _triaDS->LinksConnectedTo( iBndNode + 1 ); + TLinkList::const_iterator iLink = linkIds.cbegin(); for ( ; iLink != linkIds.cend(); ++iLink ) { const BRepMesh_PairOfIndex & triaIds = _triaDS->ElementsConnectedTo( *iLink ); @@ -344,7 +363,7 @@ void SMESH_Delaunay::ToPython() const text << "import salome, SMESH\n"; text << "salome.salome_init()\n"; text << "from salome.smesh import smeshBuilder\n"; - text << "smesh = smeshBuilder.New(salome.myStudy)\n"; + text << "smesh = smeshBuilder.New()\n"; text << "mesh=smesh.Mesh()\n"; const char* endl = "\n"; @@ -369,5 +388,5 @@ void SMESH_Delaunay::ToPython() const file.remove(); file.openForWriting(); file.write( text.c_str(), text.size() ); - cout << "execfile( '" << fileName << "')" << endl; + std::cout << "exec(open('" << fileName << "', 'rb').read())"; }