X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Projection_2D.cxx;h=8413288b8913ee001ac109dd0d310f5bb5a9a4b5;hp=66c8936280fb7271407aa60b095616cb84c763ae;hb=7d8e88b13c6de670853d475410cc62097be1ba6d;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index 66c893628..8413288b8 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -35,19 +35,22 @@ #include "SMDS_EdgePosition.hxx" #include "SMDS_FacePosition.hxx" #include "SMESHDS_Hypothesis.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESHDS_SubMesh.hxx" #include "SMESH_Block.hxx" #include "SMESH_Comment.hxx" #include "SMESH_Gen.hxx" #include "SMESH_Mesh.hxx" +#include "SMESH_MeshAlgos.hxx" #include "SMESH_MesherHelper.hxx" #include "SMESH_Pattern.hxx" #include "SMESH_subMesh.hxx" #include "SMESH_subMeshEventListener.hxx" -#include "utilities.h" +#include #include +#include #include #include #include @@ -259,7 +262,7 @@ namespace { //================================================================================ /*! * \brief find new nodes belonging to one free border of mesh on face - * \param sm - submesh on edge or vertex containg nodes to choose from + * \param sm - submesh on edge or vertex containing nodes to choose from * \param face - the face bound by the submesh * \param u2nodes - map to fill with nodes * \param seamNodes - set of found nodes @@ -821,8 +824,8 @@ namespace { // find trsf const int totNbSeg = 50; vector< gp_XY > srcPnts, tgtPnts; - srcPnts.resize( totNbSeg ); - tgtPnts.resize( totNbSeg ); + srcPnts.reserve( totNbSeg ); + tgtPnts.reserve( totNbSeg ); for ( size_t iW = 0; iW < srcWires.size(); ++iW ) { const double minSegLen = srcWires[iW]->Length() / totNbSeg; @@ -949,144 +952,144 @@ namespace { TAssocTool::TNodeNodeMap& src2tgtNodes, const bool is1DComputed) { - SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh(); - SMESH_Mesh * srcMesh = srcWires[0]->GetMesh(); - //SMESHDS_Mesh * tgtMeshDS = tgtMesh->GetMeshDS(); - SMESHDS_Mesh * srcMeshDS = srcMesh->GetMeshDS(); - - if ( srcWires[0]->NbEdges() != 4 ) - return false; - if ( !is1DComputed ) - return false; - for ( int iE = 0; iE < 4; ++iE ) - { - SMESHDS_SubMesh* sm = srcMeshDS->MeshElements( srcWires[0]->Edge( iE )); - if ( !sm ) return false; - if ( sm->NbNodes() + sm->NbElements() == 0 ) return false; - } - if ( BRepAdaptor_Surface( tgtFace ).GetType() != GeomAbs_Plane ) - return false; - // if ( BRepAdaptor_Surface( tgtFace ).GetType() == GeomAbs_Plane && - // BRepAdaptor_Surface( srcFace ).GetType() == GeomAbs_Plane ) - // return false; // too easy - - // load EDGEs to SMESH_Block - - SMESH_Block block; - TopTools_IndexedMapOfOrientedShape blockSubShapes; - { - const TopoDS_Solid& box = srcMesh->PseudoShape(); - TopoDS_Shell shell = TopoDS::Shell( TopExp_Explorer( box, TopAbs_SHELL ).Current() ); - TopoDS_Vertex v; - block.LoadBlockShapes( shell, v, v, blockSubShapes ); // fill all since operator[] is missing - } - const SMESH_Block::TShapeID srcFaceBID = SMESH_Block::ID_Fxy0; - const SMESH_Block::TShapeID tgtFaceBID = SMESH_Block::ID_Fxy1; - vector< int > edgeBID; - block.GetFaceEdgesIDs( srcFaceBID, edgeBID ); // u0, u1, 0v, 1v - blockSubShapes.Substitute( edgeBID[0], srcWires[0]->Edge(0) ); - blockSubShapes.Substitute( edgeBID[1], srcWires[0]->Edge(2) ); - blockSubShapes.Substitute( edgeBID[2], srcWires[0]->Edge(3) ); - blockSubShapes.Substitute( edgeBID[3], srcWires[0]->Edge(1) ); - block.GetFaceEdgesIDs( tgtFaceBID, edgeBID ); // u0, u1, 0v, 1v - blockSubShapes.Substitute( edgeBID[0], tgtWires[0]->Edge(0) ); - blockSubShapes.Substitute( edgeBID[1], tgtWires[0]->Edge(2) ); - blockSubShapes.Substitute( edgeBID[2], tgtWires[0]->Edge(3) ); - blockSubShapes.Substitute( edgeBID[3], tgtWires[0]->Edge(1) ); - block.LoadFace( srcFace, srcFaceBID, blockSubShapes ); - block.LoadFace( tgtFace, tgtFaceBID, blockSubShapes ); - - // remember connectivity of new faces in terms of ( node-or-XY ) - - typedef std::pair< const SMDS_MeshNode*, gp_XYZ > TNodeOrXY; // node-or-XY - typedef std::vector< TNodeOrXY* > TFaceConn; // face connectivity - std::vector< TFaceConn > newFacesVec; // connectivity of all faces - std::map< const SMDS_MeshNode*, TNodeOrXY > srcNode2tgtNXY; // src node -> node-or-XY - - TAssocTool::TNodeNodeMap::iterator srcN_tgtN; - std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator srcN_tgtNXY; - std::pair< std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator, bool > n2n_isNew; - TNodeOrXY nullNXY( (SMDS_MeshNode*)NULL, gp_XYZ(0,0,0) ); - - SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace ); - newFacesVec.resize( srcSubDS->NbElements() ); - int iFaceSrc = 0; + // SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh(); + // SMESH_Mesh * srcMesh = srcWires[0]->GetMesh(); + // //SMESHDS_Mesh * tgtMeshDS = tgtMesh->GetMeshDS(); + // SMESHDS_Mesh * srcMeshDS = srcMesh->GetMeshDS(); + + // if ( srcWires[0]->NbEdges() != 4 ) + // return false; + // if ( !is1DComputed ) + // return false; + // for ( int iE = 0; iE < 4; ++iE ) + // { + // SMESHDS_SubMesh* sm = srcMeshDS->MeshElements( srcWires[0]->Edge( iE )); + // if ( !sm ) return false; + // if ( sm->NbNodes() + sm->NbElements() == 0 ) return false; + // } + // if ( BRepAdaptor_Surface( tgtFace ).GetType() != GeomAbs_Plane ) + // return false; + // // if ( BRepAdaptor_Surface( tgtFace ).GetType() == GeomAbs_Plane && + // // BRepAdaptor_Surface( srcFace ).GetType() == GeomAbs_Plane ) + // // return false; // too easy - SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements(); - while ( elemIt->more() ) // loop on all mesh faces on srcFace - { - const SMDS_MeshElement* elem = elemIt->next(); - TFaceConn& tgtNodes = newFacesVec[ iFaceSrc++ ]; + // // load EDGEs to SMESH_Block - const int nbN = elem->NbCornerNodes(); - tgtNodes.resize( nbN ); - for ( int i = 0; i < nbN; ++i ) // loop on nodes of the source element - { - const SMDS_MeshNode* srcNode = elem->GetNode(i); - n2n_isNew = srcNode2tgtNXY.insert( make_pair( srcNode, nullNXY )); - TNodeOrXY & tgtNodeOrXY = n2n_isNew.first->second; - if ( n2n_isNew.second ) // new src node encounters - { - srcN_tgtN = src2tgtNodes.find( srcNode ); - if ( srcN_tgtN != src2tgtNodes.end() ) - { - tgtNodeOrXY.first = srcN_tgtN->second; // tgt node exists - } - else - { - // find XY of src node withing the quadrilateral srcFace - if ( !block.ComputeParameters( SMESH_TNodeXYZ( srcNode ), - tgtNodeOrXY.second, srcFaceBID )) - return false; - } - } - tgtNodes[ i ] = & tgtNodeOrXY; - } - } + // SMESH_Block block; + // TopTools_IndexedMapOfOrientedShape blockSubShapes; + // { + // const TopoDS_Solid& box = srcMesh->PseudoShape(); + // TopoDS_Shell shell = TopoDS::Shell( TopExp_Explorer( box, TopAbs_SHELL ).Current() ); + // TopoDS_Vertex v; + // block.LoadBlockShapes( shell, v, v, blockSubShapes ); // fill all since operator[] is missing + // } + // const SMESH_Block::TShapeID srcFaceBID = SMESH_Block::ID_Fxy0; + // const SMESH_Block::TShapeID tgtFaceBID = SMESH_Block::ID_Fxy1; + // vector< int > edgeBID; + // block.GetFaceEdgesIDs( srcFaceBID, edgeBID ); // u0, u1, 0v, 1v + // blockSubShapes.Substitute( edgeBID[0], srcWires[0]->Edge(0) ); + // blockSubShapes.Substitute( edgeBID[1], srcWires[0]->Edge(2) ); + // blockSubShapes.Substitute( edgeBID[2], srcWires[0]->Edge(3) ); + // blockSubShapes.Substitute( edgeBID[3], srcWires[0]->Edge(1) ); + // block.GetFaceEdgesIDs( tgtFaceBID, edgeBID ); // u0, u1, 0v, 1v + // blockSubShapes.Substitute( edgeBID[0], tgtWires[0]->Edge(0) ); + // blockSubShapes.Substitute( edgeBID[1], tgtWires[0]->Edge(2) ); + // blockSubShapes.Substitute( edgeBID[2], tgtWires[0]->Edge(3) ); + // blockSubShapes.Substitute( edgeBID[3], tgtWires[0]->Edge(1) ); + // block.LoadFace( srcFace, srcFaceBID, blockSubShapes ); + // block.LoadFace( tgtFace, tgtFaceBID, blockSubShapes ); + + // // remember connectivity of new faces in terms of ( node-or-XY ) + + // typedef std::pair< const SMDS_MeshNode*, gp_XYZ > TNodeOrXY; // node-or-XY + // typedef std::vector< TNodeOrXY* > TFaceConn; // face connectivity + // std::vector< TFaceConn > newFacesVec; // connectivity of all faces + // std::map< const SMDS_MeshNode*, TNodeOrXY > srcNode2tgtNXY; // src node -> node-or-XY + + // TAssocTool::TNodeNodeMap::iterator srcN_tgtN; + // std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator srcN_tgtNXY; + // std::pair< std::map< const SMDS_MeshNode*, TNodeOrXY >::iterator, bool > n2n_isNew; + // TNodeOrXY nullNXY( (SMDS_MeshNode*)NULL, gp_XYZ(0,0,0) ); + + // SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace ); + // newFacesVec.resize( srcSubDS->NbElements() ); + // int iFaceSrc = 0; + + // SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements(); + // while ( elemIt->more() ) // loop on all mesh faces on srcFace + // { + // const SMDS_MeshElement* elem = elemIt->next(); + // TFaceConn& tgtNodes = newFacesVec[ iFaceSrc++ ]; + + // const int nbN = elem->NbCornerNodes(); + // tgtNodes.resize( nbN ); + // for ( int i = 0; i < nbN; ++i ) // loop on nodes of the source element + // { + // const SMDS_MeshNode* srcNode = elem->GetNode(i); + // n2n_isNew = srcNode2tgtNXY.insert( make_pair( srcNode, nullNXY )); + // TNodeOrXY & tgtNodeOrXY = n2n_isNew.first->second; + // if ( n2n_isNew.second ) // new src node encounters + // { + // srcN_tgtN = src2tgtNodes.find( srcNode ); + // if ( srcN_tgtN != src2tgtNodes.end() ) + // { + // tgtNodeOrXY.first = srcN_tgtN->second; // tgt node exists + // } + // else + // { + // // find XY of src node withing the quadrilateral srcFace + // if ( !block.ComputeParameters( SMESH_TNodeXYZ( srcNode ), + // tgtNodeOrXY.second, srcFaceBID )) + // return false; + // } + // } + // tgtNodes[ i ] = & tgtNodeOrXY; + // } + // } - // as all XY are computed, create tgt nodes and faces + // // as all XY are computed, create tgt nodes and faces - SMESH_MesherHelper helper( *tgtMesh ); - helper.SetSubShape( tgtFace ); - if ( is1DComputed ) - helper.IsQuadraticSubMesh( tgtFace ); - else - helper.SetIsQuadratic( srcSubDS->GetElements()->next()->IsQuadratic() ); - helper.SetElementsOnShape( true ); - Handle(Geom_Surface) tgtSurface = BRep_Tool::Surface( tgtFace ); + // SMESH_MesherHelper helper( *tgtMesh ); + // helper.SetSubShape( tgtFace ); + // if ( is1DComputed ) + // helper.IsQuadraticSubMesh( tgtFace ); + // else + // helper.SetIsQuadratic( srcSubDS->GetElements()->next()->IsQuadratic() ); + // helper.SetElementsOnShape( true ); + // Handle(Geom_Surface) tgtSurface = BRep_Tool::Surface( tgtFace ); - SMESH_MesherHelper srcHelper( *srcMesh ); - srcHelper.SetSubShape( srcFace ); + // SMESH_MesherHelper srcHelper( *srcMesh ); + // srcHelper.SetSubShape( srcFace ); - vector< const SMDS_MeshNode* > tgtNodes; - gp_XY uv; + // vector< const SMDS_MeshNode* > tgtNodes; + // gp_XY uv; - for ( size_t iFaceTgt = 0; iFaceTgt < newFacesVec.size(); ++iFaceTgt ) - { - TFaceConn& tgtConn = newFacesVec[ iFaceTgt ]; - tgtNodes.resize( tgtConn.size() ); - for ( size_t iN = 0; iN < tgtConn.size(); ++iN ) - { - const SMDS_MeshNode* & tgtN = tgtConn[ iN ]->first; - if ( !tgtN ) // create a node - { - if ( !block.FaceUV( tgtFaceBID, tgtConn[iN]->second, uv )) - return false; - gp_Pnt p = tgtSurface->Value( uv.X(), uv.Y() ); - tgtN = helper.AddNode( p.X(), p.Y(), p.Z(), uv.X(), uv.Y() ); - } - tgtNodes[ tgtNodes.size() - iN - 1] = tgtN; // reversed orientation - } - switch ( tgtNodes.size() ) - { - case 3: helper.AddFace(tgtNodes[0], tgtNodes[1], tgtNodes[2]); break; - case 4: helper.AddFace(tgtNodes[0], tgtNodes[1], tgtNodes[2], tgtNodes[3]); break; - default: - if ( tgtNodes.size() > 4 ) - helper.AddPolygonalFace( tgtNodes ); - } - } - return true; + // for ( size_t iFaceTgt = 0; iFaceTgt < newFacesVec.size(); ++iFaceTgt ) + // { + // TFaceConn& tgtConn = newFacesVec[ iFaceTgt ]; + // tgtNodes.resize( tgtConn.size() ); + // for ( size_t iN = 0; iN < tgtConn.size(); ++iN ) + // { + // const SMDS_MeshNode* & tgtN = tgtConn[ iN ]->first; + // if ( !tgtN ) // create a node + // { + // if ( !block.FaceUV( tgtFaceBID, tgtConn[iN]->second, uv )) + // return false; + // gp_Pnt p = tgtSurface->Value( uv.X(), uv.Y() ); + // tgtN = helper.AddNode( p.X(), p.Y(), p.Z(), uv.X(), uv.Y() ); + // } + // tgtNodes[ tgtNodes.size() - iN - 1] = tgtN; // reversed orientation + // } + // switch ( tgtNodes.size() ) + // { + // case 3: helper.AddFace(tgtNodes[0], tgtNodes[1], tgtNodes[2]); break; + // case 4: helper.AddFace(tgtNodes[0], tgtNodes[1], tgtNodes[2], tgtNodes[3]); break; + // default: + // if ( tgtNodes.size() > 4 ) + // helper.AddPolygonalFace( tgtNodes ); + // } + // } + return false; //true; } // bool projectQuads(...) @@ -1101,7 +1104,7 @@ namespace { { SMESH_subMesh* faceSM = helper.GetMesh()->GetSubMesh( helper.GetSubShape() ); - if ( helper.IsDistorted2D( faceSM, /*checkUV=*/false )) + if ( helper.IsDistorted2D( faceSM, /*checkUV=*/true )) { SMESH_MeshEditor editor( helper.GetMesh() ); SMESHDS_SubMesh* smDS = faceSM->GetSubMeshDS(); @@ -1147,6 +1150,284 @@ namespace { return true; } + typedef list< pair< const SMDS_MeshNode*, const BRepMesh_Triangle* > > TNodeTriaList; + + //================================================================================ + /*! + * \brief Add in-FACE nodes surrounding a given node to a queue + */ + //================================================================================ + + void addCloseNodes( const SMDS_MeshNode* srcNode, + const BRepMesh_Triangle* bmTria, + const int srcFaceID, + TNodeTriaList & noTriQueue ) + { + // find in-FACE nodes + SMDS_ElemIteratorPtr elems = srcNode->GetInverseElementIterator(SMDSAbs_Face); + while ( elems->more() ) + { + const SMDS_MeshElement* elem = elems->next(); + if ( elem->getshapeId() == srcFaceID ) + { + for ( int i = 0, nb = elem->NbNodes(); i < nb; ++i ) + { + const SMDS_MeshNode* n = elem->GetNode( i ); + if ( !n->isMarked() ) + noTriQueue.push_back( make_pair( n, bmTria )); + } + } + } + } + + //================================================================================ + /*! + * \brief Find a delauney triangle containing a given 2D point and return + * barycentric coordinates within the found triangle + */ + //================================================================================ + + const BRepMesh_Triangle* findTriangle( const gp_XY& uv, + const BRepMesh_Triangle* bmTria, + Handle(BRepMesh_DataStructureOfDelaun)& triaDS, + double bc[3] ) + { + int nodeIDs[3]; + gp_XY nodeUVs[3]; + int linkIDs[3]; + Standard_Boolean ori[3]; + + while ( bmTria ) + { + // check bmTria + + triaDS->ElementNodes( *bmTria, nodeIDs ); + nodeUVs[0] = triaDS->GetNode( nodeIDs[0] ).Coord(); + nodeUVs[1] = triaDS->GetNode( nodeIDs[1] ).Coord(); + nodeUVs[2] = triaDS->GetNode( nodeIDs[2] ).Coord(); + + 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 ) + { + bc[2] = 1 - bc[0] - bc[1]; + return bmTria; + } + + // look for a neighbor triangle, which is adjacent to a link intersected + // by a segment( triangle center -> uv ) + + gp_XY gc = ( nodeUVs[0] + nodeUVs[1] + nodeUVs[2] ) / 3.; + gp_XY seg = uv - gc; + + bmTria->Edges( linkIDs, ori ); + int triaID = triaDS->IndexOf( *bmTria ); + bmTria = 0; + + for ( int i = 0; i < 3; ++i ) + { + const BRepMesh_PairOfIndex & triIDs = triaDS->ElementsConnectedTo( linkIDs[i] ); + if ( triIDs.Extent() < 2 ) + continue; // no neighbor triangle + + // check if a link intersects gc2uv + const BRepMesh_Edge & link = triaDS->GetLink( linkIDs[i] ); + const BRepMesh_Vertex & n1 = triaDS->GetNode( link.FirstNode() ); + const BRepMesh_Vertex & n2 = triaDS->GetNode( link.LastNode() ); + gp_XY uv1 = n1.Coord(); + gp_XY lin = n2.Coord() - uv1; // link direction + + double crossSegLin = seg ^ lin; + if ( Abs( crossSegLin ) < std::numeric_limits::min() ) + continue; // parallel + + double uSeg = ( uv1 - gc ) ^ lin / crossSegLin; + if ( 0. <= uSeg && uSeg <= 1. ) + { + bmTria = & triaDS->GetElement( triIDs.Index( 1 + ( triIDs.Index(1) == triaID ))); + break; + } + } + } + return bmTria; + } + + //================================================================================ + /*! + * \brief Morph mesh on the target face to lie within FACE boundary w/o distortion + * + * algo: + * - make a CDT on the src FACE + * - find a triangle containing a src node and get its barycentric coordinates + * - move the node to a point with the same barycentric coordinates in a corresponding + * tgt triangle + */ + //================================================================================ + + bool morph( SMESH_MesherHelper& tgtHelper, + const TopoDS_Face& tgtFace, + const TopoDS_Face& srcFace, + const TSideVector& tgtWires, + const TSideVector& srcWires, + const TAssocTool::TNodeNodeMap& src2tgtNodes ) + { + if ( srcWires.size() != tgtWires.size() ) return false; + + // count boundary points + int iP = 1, nbP = 0; + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) + nbP += srcWires[iW]->NbPoints() - 1; // 1st and last points coincide + + // fill boundary points + BRepMesh::Array1OfVertexOfDelaun srcVert( 1, 1 + nbP ), tgtVert( 1, 1 + nbP ); + vector< const SMDS_MeshNode* > bndSrcNodes( nbP + 1 ); bndSrcNodes[0] = 0; + BRepMesh_Vertex v( 0, 0, BRepMesh_Frontier ); + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) + { + const UVPtStructVec& srcPnt = srcWires[iW]->GetUVPtStruct(); + const UVPtStructVec& tgtPnt = tgtWires[iW]->GetUVPtStruct(); + if ( srcPnt.size() != tgtPnt.size() ) return false; + + for ( int i = 0, nb = srcPnt.size() - 1; i < nb; ++i, ++iP ) + { + bndSrcNodes[ iP ] = srcPnt[i].node; + srcPnt[i].node->setIsMarked( true ); + + v.ChangeCoord() = srcPnt[i].UV(); + srcVert( iP ) = v; + v.ChangeCoord() = tgtPnt[i].UV(); + tgtVert( iP ) = v; + } + } + // triangulate the srcFace in 2D + BRepMesh_Delaun delauney( srcVert ); + Handle(BRepMesh_DataStructureOfDelaun) triaDS = delauney.Result(); + + Handle(ShapeAnalysis_Surface) tgtSurface = tgtHelper.GetSurface( tgtFace ); + SMESHDS_Mesh* srcMesh = srcWires[0]->GetMesh()->GetMeshDS(); + SMESHDS_Mesh* tgtMesh = tgtHelper.GetMeshDS(); + const SMDS_MeshNode *srcNode, *tgtNode; + const BRepMesh_Triangle *bmTria; + + // un-mark internal src nodes; later we will mark moved nodes + SMDS_NodeIteratorPtr nIt = srcMesh->MeshElements( srcFace )->GetNodes(); + if ( !nIt || !nIt->more() ) return true; + while ( nIt->more() ) + ( srcNode = nIt->next() )->setIsMarked( false ); + + // initialize a queue of nodes with starting triangles + const int srcFaceID = srcNode->getshapeId(); + TNodeTriaList noTriQueue; + size_t iBndSrcN = 1; + for ( ; iBndSrcN < bndSrcNodes.size() && noTriQueue.empty(); ++iBndSrcN ) + { + // get a triangle + const BRepMesh::ListOfInteger & linkIds = triaDS->LinksConnectedTo( iBndSrcN ); + const BRepMesh_PairOfIndex & triaIds = triaDS->ElementsConnectedTo( linkIds.First() ); + const BRepMesh_Triangle& tria = triaDS->GetElement( triaIds.Index(1) ); + + addCloseNodes( bndSrcNodes[ iBndSrcN ], &tria, srcFaceID, noTriQueue ); + } + + // Move tgt nodes + + double bc[3]; // barycentric coordinates + int nodeIDs[3]; + bool checkUV = true; + const SMDS_FacePosition* pos; + + while ( !noTriQueue.empty() ) + { + srcNode = noTriQueue.front().first; + bmTria = noTriQueue.front().second; + noTriQueue.pop_front(); + if ( srcNode->isMarked() ) + continue; + srcNode->setIsMarked( true ); + + // find a delauney triangle containing the src node + gp_XY uv = tgtHelper.GetNodeUV( srcFace, srcNode, NULL, &checkUV ); + bmTria = findTriangle( uv, bmTria, triaDS, bc ); + if ( !bmTria ) + continue; + + // compute new coordinates for a corresponding tgt node + gp_XY uvNew( 0., 0. ), nodeUV; + triaDS->ElementNodes( *bmTria, nodeIDs ); + for ( int i = 0; i < 3; ++i ) + uvNew += bc[i] * tgtVert( nodeIDs[i]).Coord(); + gp_Pnt xyz = tgtSurface->Value( uvNew ); + + // find and move tgt node + TAssocTool::TNodeNodeMap::const_iterator n2n = src2tgtNodes.find( srcNode ); + if ( n2n == src2tgtNodes.end() ) continue; + tgtNode = n2n->second; + tgtMesh->MoveNode( tgtNode, xyz.X(), xyz.Y(), xyz.Z() ); + + if (( pos = dynamic_cast< const SMDS_FacePosition* >( tgtNode->GetPosition() ))) + const_cast( pos )->SetParameters( uvNew.X(), uvNew.Y() ); + + addCloseNodes( srcNode, bmTria, srcFaceID, noTriQueue ); + + // assure that all src nodes are visited + for ( ; iBndSrcN < bndSrcNodes.size() && noTriQueue.empty(); ++iBndSrcN ) + { + const BRepMesh::ListOfInteger & linkIds = triaDS->LinksConnectedTo( iBndSrcN ); + const BRepMesh_PairOfIndex & triaIds = triaDS->ElementsConnectedTo( linkIds.First() ); + const BRepMesh_Triangle& tria = triaDS->GetElement( triaIds.Index(1) ); + addCloseNodes( bndSrcNodes[ iBndSrcN ], &tria, srcFaceID, noTriQueue ); + } + } + + return true; + } + + //======================================================================= + /* + * Set initial association of VERTEXes for the case of projection + * from a quadrangle FACE to a closed FACE, where opposite src EDGEs + * have different nb of segments + */ + //======================================================================= + + void initAssoc4Quad2Closed(const TopoDS_Shape& tgtFace, + SMESH_MesherHelper& tgtHelper, + const TopoDS_Shape& srcFace, + SMESH_Mesh* srcMesh, + TAssocTool::TShapeShapeMap & assocMap) + { + if ( !tgtHelper.HasRealSeam() || srcFace.ShapeType() != TopAbs_FACE ) + return; // no seam edge + list< TopoDS_Edge > tgtEdges, srcEdges; + list< int > tgtNbEW, srcNbEW; + int tgtNbW = SMESH_Block::GetOrderedEdges( TopoDS::Face( tgtFace ), tgtEdges, tgtNbEW ); + int srcNbW = SMESH_Block::GetOrderedEdges( TopoDS::Face( srcFace ), srcEdges, srcNbEW ); + if ( tgtNbW != 1 || srcNbW != 1 || + tgtNbEW.front() != 4 || srcNbEW.front() != 4 ) + return; // not quads + + int srcNbSeg[4]; + list< TopoDS_Edge >::iterator edgeS = srcEdges.begin(), edgeT = tgtEdges.begin(); + for ( int i = 0; edgeS != srcEdges.end(); ++i, ++edgeS ) + if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( *edgeS )) + srcNbSeg[ i ] = sm->NbNodes(); + else + return; // not meshed + if ( srcNbSeg[0] == srcNbSeg[2] && srcNbSeg[1] == srcNbSeg[3] ) + return; // same nb segments + if ( srcNbSeg[0] != srcNbSeg[2] && srcNbSeg[1] != srcNbSeg[3] ) + return; // all different nb segments + + edgeS = srcEdges.begin(); + if ( srcNbSeg[0] != srcNbSeg[2] ) + ++edgeS; + TAssocTool::InsertAssociation( tgtHelper.IthVertex( 0,*edgeT ), + tgtHelper.IthVertex( 0,*edgeS ), assocMap ); + TAssocTool::InsertAssociation( tgtHelper.IthVertex( 1,*edgeT ), + tgtHelper.IthVertex( 1,*edgeS ), assocMap ); + } + } // namespace @@ -1159,7 +1440,6 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& { _src2tgtNodes.clear(); - MESSAGE("Projection_2D Compute"); if ( !_sourceHypo ) return false; @@ -1178,8 +1458,12 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& TopoDS_Face tgtFace = TopoDS::Face( theShape.Oriented(TopAbs_FORWARD)); TopoDS_Shape srcShape = _sourceHypo->GetSourceFace().Oriented(TopAbs_FORWARD); + helper.SetSubShape( tgtFace ); + TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap ); + if ( shape2ShapeMap.IsEmpty() ) + initAssoc4Quad2Closed( tgtFace, helper, srcShape, srcMesh, shape2ShapeMap ); if ( !TAssocTool::FindSubShapeAssociation( tgtFace, tgtMesh, srcShape, srcMesh, shape2ShapeMap) || !shape2ShapeMap.IsBound( tgtFace )) @@ -1197,23 +1481,6 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& } TopoDS_Face srcFace = TopoDS::Face( shape2ShapeMap( tgtFace ).Oriented(TopAbs_FORWARD)); - // orient faces - // if ( srcMesh == tgtMesh ) - // { - // TopoDS_Shape solid = - // helper.GetCommonAncestor( srcFace, tgtFace, *tgtMesh, TopAbs_SOLID ); - // if ( !solid.IsNull() ) - // { - // srcFace.Orientation( helper.GetSubShapeOri( solid, srcFace )); - // tgtFace.Orientation( helper.GetSubShapeOri( solid, tgtFace )); - // } - // else if ( helper.NbAncestors( srcFace, *tgtMesh, TopAbs_SOLID ) == 1 && - // helper.NbAncestors( tgtFace, *tgtMesh, TopAbs_SOLID ) == 1 ) - // { - // srcFace.Orientation( helper.GetSubShapeOri( tgtMesh->GetShapeToMesh(), srcFace )); - // tgtFace.Orientation( helper.GetSubShapeOri( tgtMesh->GetShapeToMesh(), tgtFace )); - // } - // } // ---------------------------------------------- // Assure that mesh on a source Face is computed // ---------------------------------------------- @@ -1257,17 +1524,16 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& { // projection in case if the faces are similar in 2D space projDone = projectBy2DSimilarity( tgtFace, srcFace, tgtWires, srcWires, - shape2ShapeMap, _src2tgtNodes, is1DComputed); + shape2ShapeMap, _src2tgtNodes, is1DComputed ); } if ( !projDone ) { // projection in case of quadrilateral faces - // projDone = projectQuads( tgtFace, srcFace, tgtWires, srcWires, - // shape2ShapeMap, _src2tgtNodes, is1DComputed); + // NOT IMPLEMENTED, returns false + projDone = projectQuads( tgtFace, srcFace, tgtWires, srcWires, + shape2ShapeMap, _src2tgtNodes, is1DComputed); } - helper.SetSubShape( tgtFace ); - // it will remove mesh built on edges and vertices in failure case MeshCleaner cleaner( tgtSubMesh ); @@ -1392,10 +1658,19 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& } } } - else if ( nbEdgesInWires.front() == 1 ) + else if ( nbEdgesInWires.front() == 1 ) // a sole edge in a wire { - // TODO::Compare orientation of curves in a sole edge - //RETURN_BAD_RESULT("Not implemented case"); + TopoDS_Edge srcE1 = srcEdges.front(), tgtE1 = tgtEdges.front(); + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) + { + StdMeshers_FaceSidePtr srcWire = srcWires[iW]; + for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) + if ( srcE1.IsSame( srcWire->Edge( iE ))) + { + reverse = ( tgtE1.Orientation() != tgtWires[iW]->Edge( iE ).Orientation() ); + break; + } + } } else { @@ -1404,7 +1679,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // Load pattern from the source face SMESH_Pattern mapper; - mapper.Load( srcMesh, srcFace, toProjectNodes, srcV1 ); + mapper.Load( srcMesh, srcFace, toProjectNodes, srcV1, /*keepNodes=*/true ); if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) return error(COMPERR_BAD_INPUT_MESH,"Can't load mesh pattern from the source face"); @@ -1428,6 +1703,18 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& if ( mapper.GetErrorCode() != SMESH_Pattern::ERR_OK ) return error("Can't make mesh by source mesh pattern"); + // fill _src2tgtNodes + std::vector< const SMDS_MeshNode* > *srcNodes, *tgtNodes; + mapper.GetInOutNodes( srcNodes, tgtNodes ); + size_t nbN = std::min( srcNodes->size(), tgtNodes->size() ); + for ( size_t i = 0; i < nbN; ++i ) + if ( (*srcNodes)[i] && (*tgtNodes)[i] ) + _src2tgtNodes.insert( make_pair( (*srcNodes)[i], (*tgtNodes)[i] )); + + + } // end of projection using Pattern mapping + + { // ------------------------------------------------------------------------- // mapper doesn't take care of nodes already existing on edges and vertices, // so we must merge nodes created by it with existing ones @@ -1467,7 +1754,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& continue; // do not treat sm of degen VERTEX } - // Sort new and old nodes of a submesh separately + // Sort new and old nodes of a sub-mesh separately bool isSeam = helper.IsRealSeam( sm->GetId() ); @@ -1591,6 +1878,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // The mapper can't create quadratic elements, so convert if needed // ---------------------------------------------------------------- + SMDS_ElemIteratorPtr faceIt; faceIt = srcSubMesh->GetSubMeshDS()->GetElements(); bool srcIsQuad = faceIt->next()->IsQuadratic(); faceIt = tgtSubMesh->GetSubMeshDS()->GetElements(); @@ -1604,8 +1892,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces, false); } - - } // end of projection using Pattern mapping + } // end of coincident nodes and quadratic elements treatment if ( !projDone || is1DComputed ) @@ -1614,9 +1901,13 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // boundary, also bad face can be created if EDGEs already discretized // --> fix bad faces by smoothing // ---------------------------------------------------------------- - if ( !fixDistortedFaces( helper, tgtWires )) - return error("Invalid mesh generated"); + if ( helper.IsDistorted2D( tgtSubMesh, /*checkUV=*/false )) + { + morph( helper, tgtFace, srcFace, tgtWires, srcWires, _src2tgtNodes ); + if ( !fixDistortedFaces( helper, tgtWires )) + return error("Invalid mesh generated"); + } // --------------------------- // Check elements orientation // ---------------------------