X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Projection_2D.cxx;h=fed12f5a5d8c0e03cec39371e51595f7aaf55a9e;hb=a17b36970bc61da1d664453c615754997c925b18;hp=70833b1b4f10c3c7752c24ea11fc4694e44bb8b5;hpb=53a2fb6d670a8c71eb30dfa339447a25cd728e80;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx index 70833b1b4..fed12f5a5 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 @@ -394,15 +394,16 @@ namespace { { 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_Pnt2d uvFirst1 = c1->Value( f ); + gp_Pnt2d uvLast1 = c1->Value( l ); 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 ); + gp_Pnt2d uvFirst2 = c2->Value( E2.Orientation() == TopAbs_REVERSED ? l : f ); + double tol2 = Max( Precision::PConfusion() * Precision::PConfusion(), + 1e-5 * uvLast1.SquareDistance( uvFirst1 )); - return (( uvLast1.SquareDistance( uvFirst2 ) < tol2 ) || - ( uvLast1.SquareDistance( uvLast2 ) < tol2 )); + return (( uvFirst2.SquareDistance( uvFirst1 ) < tol2 ) || + ( uvFirst2.SquareDistance( uvLast1 ) < tol2 )); } //================================================================================ @@ -422,15 +423,13 @@ namespace { 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() || srcWires.empty() ) + if (( err && !err->IsOK() ) || + ( srcWires.empty() )) return err; SMESH_MesherHelper srcHelper( *srcMesh ); @@ -440,32 +439,7 @@ namespace { tgtWires.resize( srcWires.size() ); for ( size_t iW = 0; iW < srcWires.size(); ++iW ) { - // check ori - bool reverse = false; StdMeshers_FaceSidePtr srcWire = srcWires[iW]; - // for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) - // { - // if ( srcHelper.IsRealSeam( srcWire->EdgeID( iE ))) - // continue; - // TopoDS_Shape srcE = srcWire->Edge( iE ); - // TopoDS_Shape tgtE = shape2ShapeMap( srcE, /*isSrc=*/true); - // if ( shape2ShapeMap._assocType == TShapeShapeMap::PROPAGATION || - // shape2ShapeMap._assocType == TShapeShapeMap::PROPAGATION) - // { - // reverse = false; - // } - // else if ( tgtMesh == srcMesh ) - // { - // reverse = (( srcE.Orientation() == srcHelper.GetSubShapeOri( srcFace, srcE )) != - // ( tgtE.Orientation() == srcHelper.GetSubShapeOri( tgtFace, tgtE ))); - // } - // else - // { - // TopoDS_Shape srcEbis = shape2ShapeMap( tgtE, /*isSrc=*/false ); - // reverse = ( srcE.Orientation() != srcEbis.Orientation() ); - // } - // break; - // } list< TopoDS_Edge > tgtEdges; TopTools_IndexedMapOfShape edgeMap; // to detect seam edges @@ -475,7 +449,6 @@ namespace { TopoDS_Edge tgtE = TopoDS::Edge( shape2ShapeMap( srcE, /*isSrc=*/true)); TopoDS_Shape srcEbis = shape2ShapeMap( tgtE, /*isSrc=*/false ); if ( srcE.Orientation() != srcEbis.Orientation() ) - //if ( reverse ) tgtE.Reverse(); // reverse a seam edge encountered for the second time const int index = edgeMap.Add( tgtE ); @@ -486,7 +459,8 @@ namespace { { list< TopoDS_Edge >::iterator eIt = tgtEdges.begin(); std::advance( eIt, index-1 ); - eIt->Reverse(); + if ( are2dConnected( tgtEdges.back(), *eIt, tgtFace )) + eIt->Reverse(); } else { @@ -502,56 +476,58 @@ namespace { tgtE = nE.second; } tgtEdges.push_back( tgtE ); + } + tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh, + /*theIsForward = */ true, + /*theIgnoreMediumNodes = */false)); + StdMeshers_FaceSidePtr tgtWire = tgtWires[ iW ]; - // Fill map of src to tgt nodes with nodes on edges + // Fill map of src to tgt nodes with nodes on edges - if ( srcMesh->GetSubMesh( srcE )->IsEmpty() || - tgtMesh->GetSubMesh( tgtE )->IsEmpty() ) + for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) + { + if ( srcMesh->GetSubMesh( srcWire->Edge(iE) )->IsEmpty() || + tgtMesh->GetSubMesh( tgtWire->Edge(iE) )->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 ); + const SMDS_MeshNode* srcN = srcWire->VertexNode( iE ); + const SMDS_MeshNode* tgtN = tgtWire->VertexNode( iE ); if ( srcN && tgtN ) src2tgtNodes.insert( make_pair( srcN, tgtN )); } else { - const bool skipMediumNodes = true; - map< double, const SMDS_MeshNode* > srcNodes, tgtNodes; - if ( !SMESH_Algo::GetSortedNodesOnEdge( srcMeshDS, srcE, skipMediumNodes, srcNodes) || - !SMESH_Algo::GetSortedNodesOnEdge( tgtMeshDS, tgtE, skipMediumNodes, tgtNodes )) - return SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH, - "Invalid node parameters on edges"); + const bool skipMedium = true, isFwd = true; + StdMeshers_FaceSide srcEdge( srcFace, srcWire->Edge(iE), srcMesh, isFwd, skipMedium); + StdMeshers_FaceSide tgtEdge( tgtFace, tgtWire->Edge(iE), tgtMesh, isFwd, skipMedium); + + vector< const SMDS_MeshNode* > srcNodes = srcEdge.GetOrderedNodes(); + vector< const SMDS_MeshNode* > tgtNodes = tgtEdge.GetOrderedNodes(); 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() ) { - map< double, const SMDS_MeshNode* >::iterator u_tn = tgtNodes.begin(); - if ( srcE.Orientation() == tgtE.Orientation() ) - { - 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 )); - } - else + vector< const SMDS_MeshNode* >::iterator tn = tgtNodes.begin(); + //if ( srcWire->Edge(iE).Orientation() == tgtWire->Edge(iE).Orientation() ) { - map< double, const SMDS_MeshNode* >::reverse_iterator u_sn = srcNodes.rbegin(); - for ( ; u_tn != tgtNodes.end(); ++u_tn, ++u_sn) - src2tgtNodes.insert( make_pair( u_sn->second, u_tn->second )); + vector< const SMDS_MeshNode* >::iterator sn = srcNodes.begin(); + for ( ; tn != tgtNodes.end(); ++tn, ++sn) + src2tgtNodes.insert( make_pair( *sn, *tn )); } + // else + // { + // vector< const SMDS_MeshNode* >::reverse_iterator sn = srcNodes.rbegin(); + // for ( ; tn != tgtNodes.end(); ++tn, ++sn) + // src2tgtNodes.insert( make_pair( *sn, *tn )); + // } is1DComputed = true; } } } // loop on EDGEs of a WIRE - tgtWires[ iW ].reset( new StdMeshers_FaceSide( tgtFace, tgtEdges, tgtMesh, - /*theIsForward = */ true, - /*theIgnoreMediumNodes = */false)); } // loop on WIREs return TError(); @@ -613,7 +589,7 @@ namespace { 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 )); + size_t 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; @@ -668,7 +644,7 @@ namespace { // Make new faces // prepare the helper to adding quadratic elements if necessary - helper.SetSubShape( tgtFace ); + //helper.SetSubShape( tgtFace ); helper.IsQuadraticSubMesh( tgtFace ); SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace ); @@ -845,14 +821,14 @@ 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; for ( int iE = 0; iE < srcWires[iW]->NbEdges(); ++iE ) { - int nbSeg = Max( 1, int( srcWires[iW]->EdgeLength( iE ) / minSegLen )); + size_t 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; @@ -942,6 +918,7 @@ namespace { tgtMeshDS->SetNodeOnVertex( n, TopoDS::Vertex( tgtV )); break; } + default:; } srcN_tgtN->second = n; } @@ -974,7 +951,7 @@ namespace { { SMESH_Mesh * tgtMesh = tgtWires[0]->GetMesh(); SMESH_Mesh * srcMesh = srcWires[0]->GetMesh(); - SMESHDS_Mesh * tgtMeshDS = tgtMesh->GetMeshDS(); + //SMESHDS_Mesh * tgtMeshDS = tgtMesh->GetMeshDS(); SMESHDS_Mesh * srcMeshDS = srcMesh->GetMeshDS(); if ( srcWires[0]->NbEdges() != 4 ) @@ -1029,7 +1006,7 @@ namespace { 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( 0, gp_XYZ(0,0,0) ); + TNodeOrXY nullNXY( (SMDS_MeshNode*)NULL, gp_XYZ(0,0,0) ); SMESHDS_SubMesh* srcSubDS = srcMeshDS->MeshElements( srcFace ); newFacesVec.resize( srcSubDS->NbElements() ); @@ -1415,10 +1392,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 {