From: eap Date: Thu, 13 Oct 2011 05:31:21 +0000 (+0000) Subject: 0021096: EDF 1729 SMESH: Create a Projection 1D-2D algorithm X-Git-Tag: V6_4_0a1~32 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5036f6282e3a9123e29035502c9c75069bc87676;p=modules%2Fsmesh.git 0021096: EDF 1729 SMESH: Create a Projection 1D-2D algorithm /*! + * \brief Return nodes in the order they encounter while walking along the side. + * For a closed side, the 1st point repeats at end + */ + std::vector GetOrderedNodes() const; --- diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx index 87af665b6..cf24960b2 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.cxx +++ b/src/StdMeshers/StdMeshers_FaceSide.cxx @@ -248,8 +248,8 @@ const vector& StdMeshers_FaceSide::GetUVPtStruct(bool isXConst, VV[1] = SMESH_MesherHelper::IthVertex( 1, myEdge[i]); const SMDS_MeshNode* node = SMESH_Algo::VertexNode( VV[0], meshDS ); double prevNormPar = ( i == 0 ? 0 : myNormPar[ i-1 ]); // normalized param - if ( node ) { // internal nodes may be missing - u2node.insert( make_pair( prevNormPar, node )); + if ( node ) { // nodes on internal vertices may be missing + u2node.insert( u2node.end(), make_pair( prevNormPar, node )); } else if ( i == 0 ) { MESSAGE(" NO NODE on VERTEX" ); @@ -294,7 +294,8 @@ const vector& StdMeshers_FaceSide::GetUVPtStruct(bool isXConst, double normPar = prevNormPar + r * ( u - myFirst[i] ) / paramSize; u2nodeVec.push_back( make_pair( normPar, node )); } - u2node.insert( u2nodeVec.begin(), u2nodeVec.end() ); + for ( size_t j = 0; j < u2nodeVec.size(); ++j ) + u2node.insert( u2node.end(), u2nodeVec[j] ); // Put 2nd vertex node for a last edge if ( i+1 == myEdge.size() ) { @@ -303,7 +304,7 @@ const vector& StdMeshers_FaceSide::GetUVPtStruct(bool isXConst, MESSAGE(" NO NODE on VERTEX" ); return myPoints; } - u2node.insert( make_pair( 1., node )); + u2node.insert( u2node.end(), make_pair( 1., node )); } } if ( u2node.size() != myNbPonits ) { @@ -412,9 +413,89 @@ const vector& StdMeshers_FaceSide::SimulateUVPtStruct(int nbSeg, } return myFalsePoints; } -// gp_Pnt StdMeshers_FaceSide::Value(double U) const -// { -// } + +//======================================================================= +//function : GetOrderedNodes +//purpose : Return nodes in the order they encounter while walking along the side +//======================================================================= + +std::vector StdMeshers_FaceSide::GetOrderedNodes() const +{ + vector resultNodes; + if ( myPoints.empty() ) + { + if ( NbEdges() == 0 ) return resultNodes; + + SMESHDS_Mesh* meshDS = myMesh->GetMeshDS(); + SMESH_MesherHelper helper(*myMesh); + bool paramOK; + + // Sort nodes of all edges putting them into a map + + map< double, const SMDS_MeshNode*> u2node; + for ( int i = 0; i < myEdge.size(); ++i ) + { + // Put 1st vertex node of a current edge + TopoDS_Vertex VV[2]; // TopExp::FirstVertex() returns NULL for INTERNAL edge + VV[0] = SMESH_MesherHelper::IthVertex( 0, myEdge[i]); + VV[1] = SMESH_MesherHelper::IthVertex( 1, myEdge[i]); + const SMDS_MeshNode* node = SMESH_Algo::VertexNode( VV[0], meshDS ); + double prevNormPar = ( i == 0 ? 0 : myNormPar[ i-1 ]); // normalized param + if ( node ) { // nodes on internal vertices may be missing + u2node.insert( make_pair( prevNormPar, node )); + } + else if ( i == 0 ) { + MESSAGE(" NO NODE on VERTEX" ); + return resultNodes; + } + + // Put internal nodes + SMESHDS_SubMesh* sm = meshDS->MeshElements( myEdge[i] ); + if ( !sm ) continue; + SMDS_NodeIteratorPtr nItr = sm->GetNodes(); + double paramSize = myLast[i] - myFirst[i]; + double r = myNormPar[i] - prevNormPar; + while ( nItr->more() ) + { + const SMDS_MeshNode* node = nItr->next(); + if ( myIgnoreMediumNodes && SMESH_MeshEditor::IsMedium( node, SMDSAbs_Edge )) + continue; + double u = helper.GetNodeU( myEdge[i], node, 0, ¶mOK ); + + // paramSize is signed so orientation is taken into account + double normPar = prevNormPar + r * ( u - myFirst[i] ) / paramSize; + u2node.insert( u2node.end(), make_pair( normPar, node )); + } + + // Put 2nd vertex node for a last edge + if ( i+1 == myEdge.size() ) { + node = SMESH_Algo::VertexNode( VV[1], meshDS ); + if ( !node ) { + return resultNodes; + } + u2node.insert( u2node.end(), make_pair( 1., node )); + } + } + + // Fill the result vector + + if ( u2node.size() == myNbPonits ) + { + resultNodes.reserve( u2node.size() ); + map< double, const SMDS_MeshNode*>::iterator u2n = u2node.begin(); + for ( ; u2n != u2node.end(); ++u2n ) + resultNodes.push_back( u2n->second ); + } + } + else + { + resultNodes.resize( myPoints.size() ); + for ( size_t i = 0; i < myPoints.size(); ++i ) + resultNodes[i] = myPoints[i].node; + } + + return resultNodes; +} //================================================================================ /*! diff --git a/src/StdMeshers/StdMeshers_FaceSide.hxx b/src/StdMeshers/StdMeshers_FaceSide.hxx index 612444eb5..46e6ebc4d 100644 --- a/src/StdMeshers/StdMeshers_FaceSide.hxx +++ b/src/StdMeshers/StdMeshers_FaceSide.hxx @@ -86,16 +86,16 @@ public: /*! * \brief Wrap several edges. Edges must be properly ordered and oriented. */ - StdMeshers_FaceSide(const TopoDS_Face& theFace, + StdMeshers_FaceSide(const TopoDS_Face& theFace, std::list& theEdges, - SMESH_Mesh* theMesh, - const bool theIsForward, - const bool theIgnoreMediumNodes); + SMESH_Mesh* theMesh, + const bool theIsForward, + const bool theIgnoreMediumNodes); /*! - * \brief Wrap for vertex using data from other FaceSide + * \brief Simulate a side from a vertex using data from other FaceSide */ - StdMeshers_FaceSide(const SMDS_MeshNode* theNode, - const gp_Pnt2d thePnt2d, + StdMeshers_FaceSide(const SMDS_MeshNode* theNode, + const gp_Pnt2d thePnt2d, const StdMeshers_FaceSide* theSide); /*! * \brief Return wires of a face as StdMeshers_FaceSide's @@ -130,7 +130,8 @@ public: * \param isXConst - true if normalized parameter X is constant * \param constValue - constant parameter value * - * Missing nodes are allowed only on internal vertices + * Missing nodes are allowed only on internal vertices. + * For a closed side, the 1st point repeats at end */ const std::vector& GetUVPtStruct(bool isXConst =0, double constValue =0) const; /*! @@ -141,6 +142,11 @@ public: const std::vector& SimulateUVPtStruct(int nbSeg, bool isXConst = 0, double constValue = 0) const; + /*! + * \brief Return nodes in the order they encounter while walking along the side. + * For a closed side, the 1st point repeats at end + */ + std::vector GetOrderedNodes() const; /*! * \brief Return edge and parameter on edge by normalized parameter */ @@ -201,7 +207,7 @@ public: protected: - // DON't FORGET tO update Reverse() when adding one more vector! + // DON't FORGET to update Reverse() when adding one more vector! std::vector myPoints, myFalsePoints; std::vector myEdge; std::vector myEdgeID;