X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Projection_2D.cxx;h=d2b943b5bacee02c9184ede2cc0aaecf8434118d;hp=7467a19f9b5a9c913ea337c36cb15fd082ac4337;hb=eb22cf46cb0f386218d79291dfebcec8fc831055;hpb=9a54694a0ab1e5cbc558a35c4606ceea4f7af2ef diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index 7467a19f9..d2b943b5b 100644 --- a/src/StdMeshers/StdMeshers_Projection_2D.cxx +++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -47,8 +47,10 @@ #include "utilities.h" +#include #include #include +#include #include #include #include @@ -62,7 +64,8 @@ using namespace std; #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } -typedef StdMeshers_ProjectionUtils TAssocTool; +namespace TAssocTool = StdMeshers_ProjectionUtils; +//typedef StdMeshers_ProjectionUtils TAssocTool; //======================================================================= //function : StdMeshers_Projection_2D @@ -138,6 +141,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& !SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid source vertices"); SCRUTE((edge.IsNull())); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, srcMesh ))); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, _sourceHypo->GetSourceFace() ))); @@ -150,6 +154,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& if ( edge.IsNull() || !SMESH_MesherHelper::IsSubShape( edge, tgtMesh )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid target vertices"); SCRUTE((edge.IsNull())); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, tgtMesh ))); } @@ -158,6 +163,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& !SMESH_MesherHelper::IsSubShape( edge, theShape )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid target vertices"); SCRUTE((SMESH_MesherHelper::IsSubShape( edge, theShape ))); } } @@ -167,6 +173,7 @@ bool StdMeshers_Projection_2D::CheckHypothesis(SMESH_Mesh& ( srcMesh == tgtMesh && theShape == _sourceHypo->GetSourceFace() )) { theStatus = HYP_BAD_PARAMETER; + error("Invalid source face"); SCRUTE((SMESH_MesherHelper::IsSubShape( _sourceHypo->GetSourceFace(), srcMesh ))); SCRUTE((srcMesh == tgtMesh)); SCRUTE(( theShape == _sourceHypo->GetSourceFace() )); @@ -189,7 +196,7 @@ namespace { */ //================================================================================ - bool isOldNode( const SMDS_MeshNode* node/*, const bool is1DComputed*/ ) + bool isOldNode( const SMDS_MeshNode* node ) { // old nodes are shared by edges and new ones are shared // only by faces created by mapper @@ -369,189 +376,262 @@ namespace { //================================================================================ /*! - * \brief Preform projection in case if tgtFace.IsPartner( srcFace ) and in case - * if projection by transformation is possible + * \brief Check if two consecutive EDGEs are connected in 2D + * \param [in] E1 - a well oriented non-seam EDGE + * \param [in] E2 - a possibly well oriented seam EDGE + * \param [in] F - a FACE + * \return bool - result */ //================================================================================ - bool projectPartner(const TopoDS_Face& tgtFace, - const TopoDS_Face& srcFace, - SMESH_Mesh * tgtMesh, - SMESH_Mesh * srcMesh, - const TAssocTool::TShapeShapeMap& shape2ShapeMap) + bool are2dConnected( const TopoDS_Edge & E1, + const TopoDS_Edge & E2, + const TopoDS_Face & F ) { - MESSAGE("projectPartner"); - const double tol = 1.e-7*srcMesh->GetMeshDS()->getMaxDim(); + double f,l; + Handle(Geom2d_Curve) c1 = BRep_Tool::CurveOnSurface( E1, F, f, l ); + gp_Pnt2d uvLast1 = c1->Value( E1.Orientation() == TopAbs_REVERSED ? f : l ); - gp_Trsf trsf; // transformation to get location of target nodes from source ones - if ( tgtFace.IsPartner( srcFace )) - { - gp_Trsf srcTrsf = srcFace.Location(); - gp_Trsf tgtTrsf = tgtFace.Location(); - trsf = srcTrsf.Inverted() * tgtTrsf; - } - else + Handle(Geom2d_Curve) c2 = BRep_Tool::CurveOnSurface( E2, F, f, l ); + gp_Pnt2d uvFirst2 = c2->Value( f ); + gp_Pnt2d uvLast2 = c2->Value( l ); + double tol2 = 1e-5 * uvLast2.SquareDistance( uvFirst2 ); + + return (( uvLast1.SquareDistance( uvFirst2 ) < tol2 ) || + ( uvLast1.SquareDistance( uvLast2 ) < tol2 )); + } + + //================================================================================ + /*! + * \brief Compose TSideVector for both FACEs keeping matching order of EDGEs + * and fill src2tgtNodes map + */ + //================================================================================ + + TError getWires(const TopoDS_Face& tgtFace, + const TopoDS_Face& srcFace, + SMESH_Mesh * tgtMesh, + SMESH_Mesh * srcMesh, + const TAssocTool::TShapeShapeMap& shape2ShapeMap, + TSideVector& srcWires, + TSideVector& tgtWires, + TAssocTool::TNodeNodeMap& src2tgtNodes, + bool& is1DComputed) + { + SMESHDS_Mesh* tgtMeshDS = tgtMesh->GetMeshDS(); + SMESHDS_Mesh* srcMeshDS = srcMesh->GetMeshDS(); + + src2tgtNodes.clear(); + + // get ordered src EDGEs + TError err; + srcWires = StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*skipMediumNodes=*/0, err); + if ( err && !err->IsOK() ) + return err; + + // make corresponding sequence of tgt EDGEs + tgtWires.resize( srcWires.size() ); + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) { - // Try to find the transformation - - // make any local coord systems of src and tgt faces - vector srcPP, tgtPP; // 3 points on face boundaries to make axes of CS - int tgtNbVert = SMESH_MesherHelper::Count( tgtFace, TopAbs_VERTEX, /*ignoreSame=*/true ); - int srcNbVert = SMESH_MesherHelper::Count( srcFace, TopAbs_VERTEX, /*ignoreSame=*/true ); - SMESH_subMesh * srcSM = srcMesh->GetSubMesh( srcFace ); - SMESH_subMeshIteratorPtr smIt = srcSM->getDependsOnIterator(/*includeSelf=*/false,false); - srcSM = smIt->next(); // sm of a vertex - while ( smIt->more() && srcPP.size() < 3 ) + list< TopoDS_Edge > tgtEdges; + StdMeshers_FaceSidePtr srcWire = srcWires[iW]; + TopTools_IndexedMapOfShape edgeMap; // to detect seam edges + for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) { - srcSM = smIt->next(); - SMESHDS_SubMesh* srcSmds = srcSM->GetSubMeshDS(); - if ( !srcSmds ) continue; - SMDS_NodeIteratorPtr nIt = srcSmds->GetNodes(); - while ( nIt->more() ) + TopoDS_Edge srcE = srcWire->Edge( iE ); + TopoDS_Edge tgtE = TopoDS::Edge( shape2ShapeMap( srcE, /*isSrc=*/true)); + // reverse a seam edge encountered for the second time + const int index = edgeMap.Add( tgtE ); + if ( index < edgeMap.Extent() ) // E is a seam { - SMESH_TNodeXYZ p ( nIt->next()); - bool pOK = false; - switch ( srcPP.size() ) + // check which of edges to reverse, E or one already being in tgtEdges + if ( are2dConnected( tgtEdges.back(), tgtE, tgtFace )) { - case 0: pOK = true; break; - - case 1: pOK = ( srcPP[0].SquareDistance( p ) > 10*tol ); break; - - case 2: - { - gp_Vec p0p1( srcPP[0], srcPP[1] ), p0p( srcPP[0], p ); - // pOK = !p0p1.IsParallel( p0p, tol ); - pOK = !p0p1.IsParallel( p0p, 3.14/20 ); // angle min 18 degrees - break; - } + list< TopoDS_Edge >::iterator eIt = tgtEdges.begin(); + std::advance( eIt, index-1 ); + eIt->Reverse(); } - if ( !pOK ) - continue; - - // find corresponding point on target shape - pOK = false; - gp_Pnt tgtP; - const TopoDS_Shape& tgtShape = shape2ShapeMap( srcSM->GetSubShape(), /*isSrc=*/true ); - if ( tgtShape.ShapeType() == TopAbs_VERTEX ) + else { - tgtP = BRep_Tool::Pnt( TopoDS::Vertex( tgtShape )); - if ( srcNbVert == tgtNbVert || tgtPP.empty() ) - pOK = true; - else - pOK = (( tgtP.Distance( tgtPP[0] ) > tol*tol ) && - ( tgtPP.size() == 1 || tgtP.Distance( tgtPP[1] ) > tol*tol )); - //cout << "V - nS " << p._node->GetID() << " - nT " << SMESH_Algo::VertexNode(TopoDS::Vertex( tgtShape),tgtMesh->GetMeshDS())->GetID() << endl; + tgtE.Reverse(); } - else if ( tgtPP.size() > 0 ) + } + if ( srcWire->NbEdges() == 1 && tgtMesh == srcMesh ) // circle + { + // try to verify ori by propagation + pair nE = + StdMeshers_ProjectionUtils::GetPropagationEdge( srcMesh, tgtE, srcE ); + if ( !nE.second.IsNull() ) + tgtE = nE.second; + } + tgtEdges.push_back( tgtE ); + + + // Fill map of src to tgt nodes with nodes on edges + + if ( srcMesh->GetSubMesh( srcE )->IsEmpty() || + tgtMesh->GetSubMesh( tgtE )->IsEmpty() ) + { + // add nodes on VERTEXes for a case of not meshes EDGEs + const TopoDS_Shape& srcV = SMESH_MesherHelper::IthVertex( 0, srcE ); + const TopoDS_Shape& tgtV = shape2ShapeMap( srcV, /*isSrc=*/true ); + const SMDS_MeshNode* srcN = SMESH_Algo::VertexNode( TopoDS::Vertex( srcV ), srcMeshDS ); + const SMDS_MeshNode* tgtN = SMESH_Algo::VertexNode( TopoDS::Vertex( tgtV ), tgtMeshDS ); + if ( srcN && tgtN ) + src2tgtNodes.insert( make_pair( srcN, tgtN )); + } + else + { + map< double, const SMDS_MeshNode* > srcNodes, tgtNodes; + if (( ! SMESH_Algo::GetSortedNodesOnEdge( srcMeshDS, TopoDS::Edge( srcE ), + /*ignoreMediumNodes = */true, + srcNodes )) + || + ( ! SMESH_Algo::GetSortedNodesOnEdge( tgtMeshDS, TopoDS::Edge( tgtE ), + /*ignoreMediumNodes = */true, + tgtNodes )) + ) + return SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH, + "Invalid node parameters on edges"); + + if (( srcNodes.size() != tgtNodes.size() ) && tgtNodes.size() > 0 ) + return SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH, + "Different number of nodes on edges"); + if ( !tgtNodes.empty() ) { - if ( SMESHDS_SubMesh* tgtSmds = tgtMesh->GetMeshDS()->MeshElements( tgtShape )) - { - double srcDist = srcPP[0].Distance( p ); - double eTol = BRep_Tool::Tolerance( TopoDS::Edge( tgtShape )); - if (eTol < tol) eTol = tol; - SMDS_NodeIteratorPtr nItT = tgtSmds->GetNodes(); - while ( nItT->more() && !pOK ) - { - const SMDS_MeshNode* n = nItT->next(); - tgtP = SMESH_TNodeXYZ( n ); - pOK = ( fabs( srcDist - tgtPP[0].Distance( tgtP )) < 2*eTol ); - //cout << "E - nS " << p._node->GetID() << " - nT " << n->GetID()<< " OK - " << pOK<< " " << fabs( srcDist - tgtPP[0].Distance( tgtP ))<< " tol " << eTol<< endl; - } - } - } - if ( !pOK ) - continue; + map< double, const SMDS_MeshNode* >::iterator u_tn = tgtNodes.begin(); + map< double, const SMDS_MeshNode* >::iterator u_sn = srcNodes.begin(); + for ( ; u_tn != tgtNodes.end(); ++u_tn, ++u_sn) + src2tgtNodes.insert( make_pair( u_sn->second, u_tn->second )); - srcPP.push_back( p ); - tgtPP.push_back( tgtP ); + is1DComputed = true; + } } - } - if ( srcPP.size() != 3 ) - return false; + } // loop on EDGEs of a WIRE - // make transformation - gp_Trsf fromTgtCS, toSrcCS; // from/to global CS - gp_Ax2 srcCS( srcPP[0], gp_Vec( srcPP[0], srcPP[1] ), gp_Vec( srcPP[0], srcPP[2])); - gp_Ax2 tgtCS( tgtPP[0], gp_Vec( tgtPP[0], tgtPP[1] ), gp_Vec( tgtPP[0], tgtPP[2])); - toSrcCS .SetTransformation( gp_Ax3( srcCS )); - fromTgtCS.SetTransformation( gp_Ax3( tgtCS )); - fromTgtCS.Invert(); + tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh, + /*theIsForward = */ true, + /*theIgnoreMediumNodes = */false)); + } // loop on WIREs - trsf = fromTgtCS * toSrcCS; - } + return TError(); + } - // Fill map of src to tgt nodes with nodes on edges + //================================================================================ + /*! + * \brief Preform projection in case if tgtFace.IsPartner( srcFace ) and in case + * if projection by 3D transformation is possible + */ + //================================================================================ - map src2tgtNodes; - map::iterator srcN_tgtN; + bool projectPartner(const TopoDS_Face& tgtFace, + const TopoDS_Face& srcFace, + const TSideVector& tgtWires, + const TSideVector& srcWires, + const TAssocTool::TShapeShapeMap& shape2ShapeMap, + 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(); + SMESH_MesherHelper helper( *tgtMesh ); + + const double tol = 1.e-7 * srcMeshDS->getMaxDim(); - for ( TopExp_Explorer srcEdge( srcFace, TopAbs_EDGE); srcEdge.More(); srcEdge.Next() ) + // transformation to get location of target nodes from source ones + StdMeshers_ProjectionUtils::TrsfFinder3D trsf; + if ( tgtFace.IsPartner( srcFace )) { - const TopoDS_Shape& tgtEdge = shape2ShapeMap( srcEdge.Current(), /*isSrc=*/true ); - - map< double, const SMDS_MeshNode* > srcNodes, tgtNodes; - if ( !SMESH_Algo::GetSortedNodesOnEdge( srcMesh->GetMeshDS(), - TopoDS::Edge( srcEdge.Current() ), - /*ignoreMediumNodes = */true, - srcNodes ) - || - !SMESH_Algo::GetSortedNodesOnEdge( tgtMesh->GetMeshDS(), - TopoDS::Edge( tgtEdge ), - /*ignoreMediumNodes = */true, - tgtNodes ) - || - srcNodes.size() != tgtNodes.size()) - return false; + gp_Trsf srcTrsf = srcFace.Location(); + gp_Trsf tgtTrsf = tgtFace.Location(); + trsf.Set( srcTrsf.Inverted() * tgtTrsf ); + } + else + { + // Try to find the 3D transformation - if ( !tgtEdge.IsPartner( srcEdge.Current() )) + const int totNbSeg = 50; + vector< gp_XYZ > srcPnts, tgtPnts; + srcPnts.reserve( totNbSeg ); + tgtPnts.reserve( totNbSeg ); + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) { - // check that transformation is OK by three nodes - gp_Pnt p0S = SMESH_TNodeXYZ( (srcNodes.begin()) ->second); - gp_Pnt p1S = SMESH_TNodeXYZ( (srcNodes.rbegin()) ->second); - gp_Pnt p2S = SMESH_TNodeXYZ( (++srcNodes.begin())->second); - - gp_Pnt p0T = SMESH_TNodeXYZ( (tgtNodes.begin()) ->second); - gp_Pnt p1T = SMESH_TNodeXYZ( (tgtNodes.rbegin()) ->second); - gp_Pnt p2T = SMESH_TNodeXYZ( (++tgtNodes.begin())->second); - - // transform source points, they must coincide with target ones - if ( p0T.SquareDistance( p0S.Transformed( trsf )) > tol || - p1T.SquareDistance( p1S.Transformed( trsf )) > tol || - p2T.SquareDistance( p2S.Transformed( trsf )) > tol ) + const double minSegLen = srcWires[iW]->Length() / totNbSeg; + for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE ) { - //cout << "KO trsf, 3 dist: " - //<< p0T.SquareDistance( p0S.Transformed( trsf ))<< ", " - //<< p1T.SquareDistance( p1S.Transformed( trsf ))<< ", " - //<< p2T.SquareDistance( p2S.Transformed( trsf ))<< ", "<EdgeLength( iE ) / minSegLen )); + double srcU = srcWires[iW]->FirstParameter( iE ); + double tgtU = tgtWires[iW]->FirstParameter( iE ); + double srcDu = ( srcWires[iW]->LastParameter( iE )- srcU ) / nbSeg; + double tgtDu = ( tgtWires[iW]->LastParameter( iE )- tgtU ) / nbSeg; + for ( size_t i = 0; i < nbSeg; ++i ) + { + srcPnts.push_back( srcWires[iW]->Value3d( srcU ).XYZ() ); + tgtPnts.push_back( tgtWires[iW]->Value3d( tgtU ).XYZ() ); + srcU += srcDu; + tgtU += tgtDu; + } } } + if ( !trsf.Solve( srcPnts, tgtPnts )) + return false; - map< double, const SMDS_MeshNode* >::iterator u_tn = tgtNodes.begin(); - map< double, const SMDS_MeshNode* >::iterator u_sn = srcNodes.begin(); - for ( ; u_tn != tgtNodes.end(); ++u_tn, ++u_sn) - src2tgtNodes.insert( make_pair( u_sn->second, u_tn->second )); + // check trsf + + bool trsfIsOK = true; + const int nbTestPnt = 20; + const size_t iStep = Max( 1, int( srcPnts.size() / nbTestPnt )); + // check boundary + for ( size_t i = 0; ( i < srcPnts.size() && trsfIsOK ); i += iStep ) + { + gp_Pnt trsfTgt = trsf.Transform( srcPnts[i] ); + trsfIsOK = ( trsfTgt.SquareDistance( tgtPnts[i] ) < tol*tol ); + } + // check an in-FACE point + if ( trsfIsOK ) + { + BRepAdaptor_Surface srcSurf( srcFace ); + gp_Pnt srcP = + srcSurf.Value( 0.5 * ( srcSurf.FirstUParameter() + srcSurf.LastUParameter() ), + 0.5 * ( srcSurf.FirstVParameter() + srcSurf.LastVParameter() )); + gp_Pnt tgtTrsfP = trsf.Transform( srcP ); + TopLoc_Location loc; + GeomAPI_ProjectPointOnSurf& proj = helper.GetProjector( tgtFace, loc, 0.1*tol ); + if ( !loc.IsIdentity() ) + tgtTrsfP.Transform( loc.Transformation().Inverted() ); + proj.Perform( tgtTrsfP ); + trsfIsOK = ( proj.IsDone() && + proj.NbPoints() > 0 && + proj.LowerDistance() < tol ); + } + if ( !trsfIsOK ) + return false; } // Make new faces // prepare the helper to adding quadratic elements if necessary - SMESH_MesherHelper helper( *tgtMesh ); helper.SetSubShape( tgtFace ); helper.IsQuadraticSubMesh( tgtFace ); - helper.SetElementsOnShape( true ); + + SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace ); + if ( !is1DComputed && srcSubDS->NbElements() ) + helper.SetIsQuadratic( srcSubDS->GetElements()->next()->IsQuadratic() ); SMESH_MesherHelper srcHelper( *srcMesh ); srcHelper.SetSubShape( srcFace ); const SMDS_MeshNode* nullNode = 0; + TAssocTool::TNodeNodeMap::iterator srcN_tgtN; // indices of nodes to create properly oriented faces + bool isReverse = ( !trsf.IsIdentity() ); int tri1 = 1, tri2 = 2, quad1 = 1, quad3 = 3; - if ( trsf.Form() != gp_Identity ) + if ( isReverse ) std::swap( tri1, tri2 ), std::swap( quad1, quad3 ); - SMESHDS_SubMesh* srcSubDS = srcMesh->GetMeshDS()->MeshElements( srcFace ); SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements(); vector< const SMDS_MeshNode* > tgtNodes; while ( elemIt->more() ) // loop on all mesh faces on srcFace @@ -559,6 +639,7 @@ namespace { const SMDS_MeshElement* elem = elemIt->next(); const int nbN = elem->NbCornerNodes(); tgtNodes.resize( nbN ); + helper.SetElementsOnShape( false ); for ( int i = 0; i < nbN; ++i ) // loop on nodes of the source element { const SMDS_MeshNode* srcNode = elem->GetNode(i); @@ -566,23 +647,86 @@ namespace { if ( srcN_tgtN->second == nullNode ) { // create a new node - gp_Pnt tgtP = gp_Pnt(srcNode->X(),srcNode->Y(),srcNode->Z()).Transformed( trsf ); + gp_Pnt tgtP = trsf.Transform( SMESH_TNodeXYZ( srcNode )); SMDS_MeshNode* n = helper.AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() ); srcN_tgtN->second = n; - - gp_Pnt2d srcUV = srcHelper.GetNodeUV( srcFace, srcNode, - elem->GetNode( helper.WrapIndex(i+1,nbN))); - n->SetPosition( new SMDS_FacePosition( srcUV.X(), srcUV.Y() )); + switch ( srcNode->GetPosition()->GetTypeOfPosition() ) + { + case SMDS_TOP_FACE: + { + gp_Pnt2d srcUV = srcHelper.GetNodeUV( srcFace, srcNode ); + tgtMeshDS->SetNodeOnFace( n, helper.GetSubShapeID(), srcUV.X(), srcUV.Y() ); + break; + } + case SMDS_TOP_EDGE: + { + const TopoDS_Shape & srcE = srcMeshDS->IndexToShape( srcNode->getshapeId() ); + const TopoDS_Shape & tgtE = shape2ShapeMap( srcE, /*isSrc=*/true ); + double srcU = srcHelper.GetNodeU( TopoDS::Edge( srcE ), srcNode ); + tgtMeshDS->SetNodeOnEdge( n, TopoDS::Edge( tgtE ), srcU ); + break; + } + case SMDS_TOP_VERTEX: + { + const TopoDS_Shape & srcV = srcMeshDS->IndexToShape( srcNode->getshapeId() ); + const TopoDS_Shape & tgtV = shape2ShapeMap( srcV, /*isSrc=*/true ); + tgtMeshDS->SetNodeOnVertex( n, TopoDS::Vertex( tgtV )); + break; + } + default:; + } } tgtNodes[i] = srcN_tgtN->second; } // create a new face + helper.SetElementsOnShape( true ); switch ( nbN ) { case 3: helper.AddFace(tgtNodes[0], tgtNodes[tri1], tgtNodes[tri2]); break; case 4: helper.AddFace(tgtNodes[0], tgtNodes[quad1], tgtNodes[2], tgtNodes[quad3]); break; + default: + if ( isReverse ) std::reverse( tgtNodes.begin(), tgtNodes.end() ); + helper.AddPolygonalFace( tgtNodes ); } } + + // check node positions + + if ( !tgtFace.IsPartner( srcFace ) ) + { + int nbOkPos = 0; + const double tol2d = 1e-12; + srcN_tgtN = src2tgtNodes.begin(); + for ( ; srcN_tgtN != src2tgtNodes.end(); ++srcN_tgtN ) + { + const SMDS_MeshNode* n = srcN_tgtN->second; + switch ( n->GetPosition()->GetTypeOfPosition() ) + { + case SMDS_TOP_FACE: + { + gp_XY uv = helper.GetNodeUV( tgtFace, n ), uvBis = uv; + if (( helper.CheckNodeUV( tgtFace, n, uv, tol )) && + (( uv - uvBis ).SquareModulus() < tol2d ) && + ( ++nbOkPos > 10 )) + return true; + else + nbOkPos = 0; + break; + } + case SMDS_TOP_EDGE: + { + const TopoDS_Edge & tgtE = TopoDS::Edge( tgtMeshDS->IndexToShape( n->getshapeId() )); + double u = helper.GetNodeU( tgtE, n ), uBis = u; + if (( !helper.CheckNodeU( tgtE, n, u, tol )) || + (( u - uBis ) < tol2d )) + nbOkPos = 0; + break; + } + default:; + } + } + } + return true; } // bool projectPartner() @@ -593,50 +737,23 @@ namespace { */ //================================================================================ - bool projectBy2DSimilarity(const TopoDS_Face& tgtFace, - const TopoDS_Face& srcFace, - SMESH_Mesh * tgtMesh, - SMESH_Mesh * srcMesh, - const TAssocTool::TShapeShapeMap& shape2ShapeMap, - const bool is1DComputed) + bool projectBy2DSimilarity(const TopoDS_Face& tgtFace, + const TopoDS_Face& srcFace, + const TSideVector& tgtWires, + const TSideVector& srcWires, + const TAssocTool::TShapeShapeMap& shape2ShapeMap, + TAssocTool::TNodeNodeMap& src2tgtNodes, + const bool is1DComputed) { - // 1) Preparation + SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh(); + SMESH_Mesh * srcMesh = srcWires[0]->GetMesh(); - // get ordered src EDGEs - TError err; - TSideVector srcWires = - StdMeshers_FaceSide::GetFaceWires( srcFace, *srcMesh,/*ignoreMediumNodes = */false, err); - if ( err && !err->IsOK() ) - return false; + // WARNING: we can have problems if the FACE is symmetrical in 2D, + // then the projection can be mirrored relating to what is expected - // make corresponding sequence of tgt EDGEs - TSideVector tgtWires( srcWires.size() ); - for ( unsigned iW = 0; iW < srcWires.size(); ++iW ) - { - list< TopoDS_Edge > tgtEdges; - StdMeshers_FaceSidePtr srcWire = srcWires[iW]; - TopTools_IndexedMapOfShape edgeMap; // to detect seam edges - for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) - { - tgtEdges.push_back( TopoDS::Edge( shape2ShapeMap( srcWire->Edge( iE ), /*isSrc=*/true))); - // reverse a seam edge encountered for the second time - const int oldExtent = edgeMap.Extent(); - edgeMap.Add( tgtEdges.back() ); - if ( oldExtent == edgeMap.Extent() ) - tgtEdges.back().Reverse(); - } - tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh, - /*theIsForward = */ true, - /*theIgnoreMediumNodes = */false)); - if ( is1DComputed && - srcWires[iW]->GetUVPtStruct().size() != - tgtWires[iW]->GetUVPtStruct().size()) - return false; - } - - // 2) Find transformation + // 1) Find 2D transformation - gp_Trsf2d trsf; + StdMeshers_ProjectionUtils::TrsfFinder2D trsf; { // get 2 pairs of corresponding UVs gp_Pnt2d srcP0 = srcWires[0]->Value2d(0.0); @@ -651,50 +768,63 @@ namespace { toSrcCS .SetTransformation( srcCS ); fromTgtCS.SetTransformation( tgtCS ); fromTgtCS.Invert(); - - trsf = fromTgtCS * toSrcCS; + trsf.Set( fromTgtCS * toSrcCS ); // check transformation + bool trsfIsOK = true; const double tol = 1e-5 * gp_Vec2d( srcP0, srcP1 ).Magnitude(); - for ( double u = 0.12; u < 1.; u += 0.1 ) + for ( double u = 0.12; ( u < 1. && trsfIsOK ); u += 0.1 ) { - gp_Pnt2d srcUV = srcWires[0]->Value2d( u ); - gp_Pnt2d tgtUV = tgtWires[0]->Value2d( u ); - gp_Pnt2d tgtUV2 = srcUV.Transformed( trsf ); - if ( tgtUV.Distance( tgtUV2 ) > tol ) - return false; + gp_Pnt2d srcUV = srcWires[0]->Value2d( u ); + gp_Pnt2d tgtUV = tgtWires[0]->Value2d( u ); + gp_Pnt2d tgtUV2 = trsf.Transform( srcUV ); + trsfIsOK = ( tgtUV.Distance( tgtUV2 ) < tol ); } - } - // 3) Projection + // Find trsf using a least-square approximation + if ( !trsfIsOK ) + { + // find trsf + const int totNbSeg = 50; + vector< gp_XY > srcPnts, tgtPnts; + srcPnts.resize( totNbSeg ); + tgtPnts.resize( totNbSeg ); + for ( size_t iW = 0; iW < srcWires.size(); ++iW ) + { + const double minSegLen = srcWires[iW]->Length() / totNbSeg; + for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE ) + { + int nbSeg = Max( 1, int( srcWires[iW]->EdgeLength( iE ) / minSegLen )); + double srcU = srcWires[iW]->FirstParameter( iE ); + double tgtU = tgtWires[iW]->FirstParameter( iE ); + double srcDu = ( srcWires[iW]->LastParameter( iE )- srcU ) / nbSeg; + double tgtDu = ( tgtWires[iW]->LastParameter( iE )- tgtU ) / nbSeg; + for ( size_t i = 0; i < nbSeg; ++i, srcU += srcDu, tgtU += tgtDu ) + { + srcPnts.push_back( srcWires[iW]->Value2d( srcU ).XY() ); + tgtPnts.push_back( tgtWires[iW]->Value2d( tgtU ).XY() ); + } + } + } + if ( !trsf.Solve( srcPnts, tgtPnts )) + return false; - typedef map TN2NMap; - TN2NMap src2tgtNodes; - TN2NMap::iterator srcN_tgtN; + // check trsf - // fill src2tgtNodes in with nodes on EDGEs - for ( unsigned iW = 0; iW < srcWires.size(); ++iW ) - if ( is1DComputed ) - { - const vector& srcUVs = srcWires[iW]->GetUVPtStruct(); - const vector& tgtUVs = tgtWires[iW]->GetUVPtStruct(); - for ( unsigned i = 0; i < srcUVs.size(); ++i ) - src2tgtNodes.insert( make_pair( srcUVs[i].node, tgtUVs[i].node )); - } - else - { - for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE ) + trsfIsOK = true; + const int nbTestPnt = 10; + const size_t iStep = Max( 1, int( srcPnts.size() / nbTestPnt )); + for ( size_t i = 0; ( i < srcPnts.size() && trsfIsOK ); i += iStep ) { - TopoDS_Vertex srcV = srcWires[iW]->FirstVertex(iE); - TopoDS_Vertex tgtV = tgtWires[iW]->FirstVertex(iE); - const SMDS_MeshNode* srcNode = SMESH_Algo::VertexNode( srcV, srcMesh->GetMeshDS() ); - const SMDS_MeshNode* tgtNode = SMESH_Algo::VertexNode( tgtV, tgtMesh->GetMeshDS() ); - if ( tgtNode && srcNode ) - src2tgtNodes.insert( make_pair( srcNode, tgtNode )); + gp_Pnt2d trsfTgt = trsf.Transform( srcPnts[i] ); + trsfIsOK = ( trsfTgt.Distance( tgtPnts[i] ) < tol ); } + if ( !trsfIsOK ) + return false; } + } // "Find transformation" block - // make elements + // 2) Projection SMESHDS_SubMesh* srcSubDS = srcMesh->GetMeshDS()->MeshElements( srcFace ); @@ -712,6 +842,7 @@ namespace { srcHelper.SetSubShape( srcFace ); const SMDS_MeshNode* nullNode = 0; + TAssocTool::TNodeNodeMap::iterator srcN_tgtN; SMDS_ElemIteratorPtr elemIt = srcSubDS->GetElements(); vector< const SMDS_MeshNode* > tgtNodes; @@ -730,8 +861,8 @@ namespace { // create a new node gp_Pnt2d srcUV = srcHelper.GetNodeUV( srcFace, srcNode, elem->GetNode( helper.WrapIndex(i+1,nbN)), &uvOK); - gp_Pnt2d tgtUV = srcUV.Transformed( trsf ); - gp_Pnt tgtP = tgtSurface->Value( tgtUV.X(), tgtUV.Y() ); + gp_Pnt2d tgtUV = trsf.Transform( srcUV ); + gp_Pnt tgtP = tgtSurface->Value( tgtUV.X(), tgtUV.Y() ); SMDS_MeshNode* n = tgtMeshDS->AddNode( tgtP.X(), tgtP.Y(), tgtP.Z() ); switch ( srcNode->GetPosition()->GetTypeOfPosition() ) { @@ -770,16 +901,110 @@ namespace { } // bool projectBy2DSimilarity(...) + //================================================================================ + /*! + * \brief Fix bad faces by smoothing + */ + //================================================================================ + + void fixDistortedFaces( SMESH_MesherHelper& helper, + TSideVector& ) + { + // Detect bad faces + + bool haveBadFaces = false; + + const TopoDS_Face& F = TopoDS::Face( helper.GetSubShape() ); + SMESHDS_SubMesh* smDS = helper.GetMeshDS()->MeshElements( F ); + if ( !smDS || smDS->NbElements() == 0 ) return; + + SMDS_ElemIteratorPtr faceIt = smDS->GetElements(); + double prevArea2D = 0; + vector< const SMDS_MeshNode* > nodes; + vector< gp_XY > uv; + while ( faceIt->more() && !haveBadFaces ) + { + const SMDS_MeshElement* face = faceIt->next(); + + // get nodes + nodes.resize( face->NbCornerNodes() ); + SMDS_MeshElement::iterator n = face->begin_nodes(); + for ( size_t i = 0; i < nodes.size(); ++n, ++i ) + nodes[ i ] = *n; + + // get UVs + const SMDS_MeshNode* inFaceNode = 0; + if ( helper.HasSeam() ) + for ( size_t i = 0; ( i < nodes.size() && !inFaceNode ); ++i ) + if ( !helper.IsSeamShape( nodes[ i ]->getshapeId() )) + inFaceNode = nodes[ i ]; + + uv.resize( nodes.size() ); + for ( size_t i = 0; i < nodes.size(); ++i ) + uv[ i ] = helper.GetNodeUV( F, nodes[ i ], inFaceNode ); + + // compare orientation of triangles + for ( int iT = 0, nbT = nodes.size()-2; iT < nbT; ++iT ) + { + gp_XY v1 = uv[ iT+1 ] - uv[ 0 ]; + gp_XY v2 = uv[ iT+2 ] - uv[ 0 ]; + double area2D = v2 ^ v1; + if (( haveBadFaces = ( area2D * prevArea2D < 0 ))) + break; + prevArea2D = area2D; + } + } + + // Fix faces + + if ( haveBadFaces ) + { + SMESH_MeshEditor editor( helper.GetMesh() ); + + TIDSortedElemSet faces; + for ( faceIt = smDS->GetElements(); faceIt->more(); ) + faces.insert( faces.end(), faceIt->next() ); + + // choose smoothing algo + //SMESH_MeshEditor:: SmoothMethod algo = SMESH_MeshEditor::CENTROIDAL; + bool isConcaveBoundary = false; + TError err; + TSideVector tgtWires = + StdMeshers_FaceSide::GetFaceWires( F, *helper.GetMesh(),/*skipMediumNodes=*/0, err); + for ( size_t iW = 0; iW < tgtWires.size() && !isConcaveBoundary; ++iW ) + { + TopoDS_Edge prevEdge = tgtWires[iW]->Edge( tgtWires[iW]->NbEdges() - 1 ); + for ( int iE = 0; iE < tgtWires[iW]->NbEdges() && !isConcaveBoundary; ++iE ) + { + double angle = helper.GetAngle( prevEdge, tgtWires[iW]->Edge( iE ), + F, tgtWires[iW]->FirstVertex( iE )); + isConcaveBoundary = ( angle < -5. * M_PI / 180. ); + + prevEdge = tgtWires[iW]->Edge( iE ); + } + } + SMESH_MeshEditor:: SmoothMethod algo = + isConcaveBoundary ? SMESH_MeshEditor::CENTROIDAL : SMESH_MeshEditor::LAPLACIAN; + + // smoothing + set fixedNodes; + editor.Smooth( faces, fixedNodes, algo, /*nbIterations=*/ 10, + /*theTgtAspectRatio=*/1.0, /*the2D=*/false); + } + } + } // namespace //======================================================================= //function : Compute -//purpose : +//purpose : //======================================================================= bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& theShape) { + _src2tgtNodes.clear(); + MESSAGE("Projection_2D Compute"); if ( !_sourceHypo ) return false; @@ -824,52 +1049,55 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcFace ); SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( tgtFace ); + string srcMeshError; if ( tgtMesh == srcMesh ) { - if ( !TAssocTool::MakeComputed( srcSubMesh ) || !srcSubMesh->IsMeshComputed() ) - return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"); + if ( !TAssocTool::MakeComputed( srcSubMesh )) + srcMeshError = TAssocTool::SourceNotComputedError( srcSubMesh, this ); } else { if ( !srcSubMesh->IsMeshComputed() ) - return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"); + srcMeshError = TAssocTool::SourceNotComputedError(); } + if ( !srcMeshError.empty() ) + return error(COMPERR_BAD_INPUT_MESH, srcMeshError ); // =========== // Projection // =========== - // find out if EDGEs are meshed or not - bool is1DComputed = false; - SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false, - /*complexShapeFirst=*/true); - while ( smIt->more() && !is1DComputed ) - { - SMESH_subMesh* sm = smIt->next(); - if ( sm->GetSubShape().ShapeType() == TopAbs_EDGE ) - is1DComputed = sm->IsMeshComputed(); - } + // get ordered src and tgt EDGEs + TSideVector srcWires, tgtWires; + bool is1DComputed = false; // if any tgt EDGE is meshed + TError err = getWires( tgtFace, srcFace, tgtMesh, srcMesh, + shape2ShapeMap, srcWires, tgtWires, _src2tgtNodes, is1DComputed ); + if ( err && !err->IsOK() ) + return error( err ); bool done = false; - if ( !done ) + if ( !done ) { // try to project from the same face with different location - done = projectPartner( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap ); + done = projectPartner( tgtFace, srcFace, tgtWires, srcWires, + shape2ShapeMap, _src2tgtNodes, is1DComputed ); } if ( !done ) { // projection in case if the faces are similar in 2D space - done = projectBy2DSimilarity( tgtFace, srcFace, tgtMesh, srcMesh, shape2ShapeMap, is1DComputed); + done = projectBy2DSimilarity( tgtFace, srcFace, tgtWires, srcWires, + shape2ShapeMap, _src2tgtNodes, is1DComputed); } + SMESH_MesherHelper helper( theMesh ); + helper.SetSubShape( tgtFace ); + if ( !done ) { + _src2tgtNodes.clear(); // -------------------- // Prepare to mapping // -------------------- - SMESH_MesherHelper helper( theMesh ); - helper.SetSubShape( tgtFace ); - // Check if node projection to a face is needed Bnd_B2d uvBox; SMDS_ElemIteratorPtr faceIt = srcSubMesh->GetSubMeshDS()->GetElements(); @@ -947,7 +1175,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& return error(COMPERR_BAD_INPUT_MESH,"Can't load mesh pattern from the source face"); // -------------------- - // Perform 2D mapping + // Perform 2D mapping // -------------------- // Compute mesh on a target face @@ -969,7 +1197,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // ------------------------------------------------------------------------- // mapper doesn't take care of nodes already existing on edges and vertices, - // so we must merge nodes created by it with existing ones + // so we must merge nodes created by it with existing ones // ------------------------------------------------------------------------- SMESH_MeshEditor::TListOfListOfNodes groupsOfNodes; @@ -977,7 +1205,8 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& // Make groups of nodes to merge // loop on EDGE and VERTEX sub-meshes of a target FACE - smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false,/*complexShapeFirst=*/false); + SMESH_subMeshIteratorPtr smIt = tgtSubMesh->getDependsOnIterator(/*includeSelf=*/false, + /*complexShapeFirst=*/false); while ( smIt->more() ) { SMESH_subMesh* sm = smIt->next(); @@ -985,7 +1214,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& if ( !smDS || smDS->NbNodes() == 0 ) continue; //if ( !is1DComputed && sm->GetSubShape().ShapeType() == TopAbs_EDGE ) - //break; + // break; if ( helper.IsDegenShape( sm->GetId() ) ) // to merge all nodes on degenerated { @@ -1014,9 +1243,9 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& map< double, const SMDS_MeshNode* >::iterator u_oldNode, u_newNode, u_newOnSeam, newEnd; set< const SMDS_MeshNode* > seamNodes; - // mapper puts on a seam edge nodes from 2 edges + // mapper changed, no more "mapper puts on a seam edge nodes from 2 edges" if ( isSeam && ! getBoundaryNodes ( sm, tgtFace, u2nodesOnSeam, seamNodes )) - RETURN_BAD_RESULT("getBoundaryNodes() failed"); + ;//RETURN_BAD_RESULT("getBoundaryNodes() failed"); SMDS_NodeIteratorPtr nIt = smDS->GetNodes(); while ( nIt->more() ) @@ -1125,6 +1354,14 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& if ( nbFaceBeforeMerge != nbFaceAtferMerge && !helper.HasDegeneratedEdges() ) return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces"); + + // ---------------------------------------------------------------- + // The mapper can create distorted faces by placing nodes out of the FACE + // boundary -- fix bad faces by smoothing + // ---------------------------------------------------------------- + + fixDistortedFaces( helper, tgtWires ); + // ---------------------------------------------------------------- // The mapper can't create quadratic elements, so convert if needed // ---------------------------------------------------------------- @@ -1140,7 +1377,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& while ( faceIt->more() ) tgtFaces.insert( tgtFaces.end(), faceIt->next() ); - editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces); + editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces, false); } cleaner.Release(); // not to remove mesh @@ -1182,7 +1419,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape& } } // Fix orientation - if ( SMESH_Algo::IsReversedSubMesh( face, meshDS )) + if ( helper.IsReversedSubMesh( face )) { SMESH_MeshEditor editor( tgtMesh ); SMDS_ElemIteratorPtr eIt = meshDS->MeshElements( face )->GetElements();