-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
if ( gr1It.Value().ShapeType() == TopAbs_FACE )
{
// find a boundary edge of group1 to start from
- TopoDS_Shape bndEdge;
- TopExp_Explorer edgeExp1( theGroup1, TopAbs_EDGE );
- for ( ; bndEdge.IsNull() && edgeExp1.More(); edgeExp1.Next())
- if ( HERE::IsBoundaryEdge( TopoDS::Edge( edgeExp1.Current()), theGroup1, theMesh ))
- bndEdge = edgeExp1.Current();
+ TopoDS_Shape bndEdge = StdMeshers_ProjectionUtils::GetBoundaryEdge( theGroup1, theMesh );
if ( bndEdge.IsNull() )
return false;
ancestIt.Initialize( theMesh.GetAncestors( edge2 ) );
for ( ; ancestIt.More() && face2.IsNull(); ancestIt.Next() ) {
if ( ancestIt.Value().ShapeType() == TopAbs_FACE &&
- !theMap.IsBound( ancestIt.Value() ) &&
+ !theMap.IsBound( ancestIt.Value(), /*is2nd=*/true ) &&
subshapes2.Contains( ancestIt.Value() ))
face2 = ancestIt.Value();
}
return dist2d < tol2d;
}
+ //================================================================================
+ /*!
+ * \brief Returns an EDGE suitable for search of initial vertex association
+ */
+ //================================================================================
+
+ TopoDS_Shape getOuterEdge( const TopoDS_Shape theShape1, SMESH_Mesh& mesh )
+ {
+ TopoDS_Shape edge;
+ if ( theShape1.ShapeType() == TopAbs_COMPOUND )
+ {
+ TopoDS_Iterator it( theShape1 );
+ if ( it.Value().ShapeType() == TopAbs_FACE ) // group of FACEs
+ {
+ // look for a boundary EDGE of a group
+ edge = StdMeshers_ProjectionUtils::GetBoundaryEdge( theShape1, mesh );
+ if ( !edge.IsNull() )
+ return edge;
+ }
+ }
+ edge = theShape1;
+ TopExp_Explorer expF( theShape1, TopAbs_FACE ), expE;
+ if ( expF.More() ) {
+ for ( ; expF.More(); expF.Next() ) {
+ edge.Nullify();
+ TopoDS_Shape wire =
+ StdMeshers_ProjectionUtils::OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE );
+ for ( expE.Init( wire, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
+ if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
+ edge = expE.Current();
+ if ( !edge.IsNull() )
+ break;
+ }
+ } else if (edge.ShapeType() != TopAbs_EDGE) { // no faces
+ edge.Nullify();
+ for ( expE.Init( theShape1, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
+ if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
+ edge = expE.Current();
+ }
+ return edge;
+ }
+
} // namespace
//=======================================================================
/*!
* \brief Looks for association of all sub-shapes of two shapes
- * \param theShape1 - shape 1
+ * \param theShape1 - target shape
* \param theMesh1 - mesh built on shape 1
- * \param theShape2 - shape 2
+ * \param theShape2 - source shape
* \param theMesh2 - mesh built on shape 2
* \param theAssociation - association map to be filled that may
* contain association of one or two pairs of vertices
return FindSubShapeAssociation(group1, theMesh1, group2, theMesh2, theMap );
}
- bool bidirect = ( !theShape1.IsSame( theShape2 ));
-
// ============
// 2) Is partner?
// ============
bool partner = theShape1.IsPartner( theShape2 );
- TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap );
+ TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap._map1to2 );
for ( ; partner && vvIt.More(); vvIt.Next() )
partner = vvIt.Key().IsPartner( vvIt.Value() );
TShapePairsList::iterator s1_s2 = shapesQueue.begin();
for ( ; s1_s2 != shapesQueue.end(); ++s1_s2 )
{
- InsertAssociation( s1_s2->first, s1_s2->second, theMap, bidirect);
+ InsertAssociation( s1_s2->first, s1_s2->second, theMap );
TopoDS_Iterator s1It( s1_s2->first), s2It( s1_s2->second );
for ( ; s1It.More(); s1It.Next(), s2It.Next() )
shapesQueue.push_back( make_pair( s1It.Value(), s2It.Value() ));
int i1 = 0, i2 = 0;
if ( theMap.IsBound( VV1[ i1 ] )) i1 = 1;
if ( theMap.IsBound( VV2[ i2 ] )) i2 = 1;
- InsertAssociation( VV1[ i1 ], VV2[ i2 ], theMap, bidirect);
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( VV1[ i1 ], VV2[ i2 ], theMap );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
// ----------------------------------------------------------------------
list< TopoDS_Edge >::iterator eIt2 = edges2.begin();
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{
- InsertAssociation( *eIt1, *eIt2, theMap, bidirect);
+ InsertAssociation( *eIt1, *eIt2, theMap );
VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, true );
- InsertAssociation( VV1[0], VV2[0], theMap, bidirect);
+ InsertAssociation( VV1[0], VV2[0], theMap );
}
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
// ----------------------------------------------------------------------
TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( edge2, VV2[0], VV2[1], true );
F2 = FF2[ 0 ]; // (F2 !)
- if ( !VV1[ 0 ].IsSame( theMap( VV2[ 0 ]))) {
+ if ( !VV1[ 0 ].IsSame( theMap( VV2[ 0 ], /*is2=*/true))) {
edge2.Reverse();
if ( FF2[ 1 ].IsNull() )
F2.Reverse();
list< TopoDS_Edge > edges1, edges2;
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 );
if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed");
- InsertAssociation( face1, face2, theMap, bidirect); // assoc faces
+ InsertAssociation( face1, face2, theMap ); // assoc faces
MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 ));
if ( nbE == 2 && (edge1.IsSame( edges1.front())) != (edge2.IsSame( edges2.front())))
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{
if ( !boundEdges.Add( *eIt1 )) continue; // already associated
- InsertAssociation( *eIt1, *eIt2, theMap, bidirect); // assoc edges
+ InsertAssociation( *eIt1, *eIt2, theMap ); // assoc edges
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( *eIt1 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( *eIt2 ));
VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, true );
- InsertAssociation( VV1[0], VV2[0], theMap, bidirect); // assoc vertices
+ InsertAssociation( VV1[0], VV2[0], theMap ); // assoc vertices
MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[0] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[0] ));
}
}
}
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
// ----------------------------------------------------------------------
TShapeShapeMap tmpMap;
ok = FindSubShapeAssociation( comp[0], theMesh1, comp[1], theMesh2, tmpMap );
if ( ok ) {
- TopTools_DataMapIteratorOfDataMapOfShapeShape mapIt( tmpMap );
+ TopTools_DataMapIteratorOfDataMapOfShapeShape mapIt( tmpMap._map1to2 );
for ( ; mapIt.More(); mapIt.Next() )
theMap.Bind( mapIt.Key(), mapIt.Value());
}
TopoDS_Edge e1 = TopoDS::Edge( edges1.First() );
v2e[0].UnBind( V[0] );
v2e[1].UnBind( V[1] );
- InsertAssociation( e0, e1, theMap, bidirect );
+ InsertAssociation( e0, e1, theMap );
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 ));
V[0] = GetNextVertex( e0, V[0] );
V[1] = GetNextVertex( e1, V[1] );
if ( !V[0].IsNull() ) {
- InsertAssociation( V[0], V[1], theMap, bidirect );
+ InsertAssociation( V[0], V[1], theMap );
MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( V[0] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] ));
}
} else {
v1n = v1e1; e1b = edges1.First(); e1n = edges1.Last();
}
- InsertAssociation( e0b, e1b, theMap, bidirect );
- InsertAssociation( e0n, e1n, theMap, bidirect );
- InsertAssociation( v0n, v1n, theMap, bidirect );
+ InsertAssociation( e0b, e1b, theMap );
+ InsertAssociation( e0n, e1n, theMap );
+ InsertAssociation( v0n, v1n, theMap );
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b ));
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<<
TopoDS_Vertex VV1[2], VV2[2];
TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( prpEdge, VV2[0], VV2[1], true );
- InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap, bidirect);
- InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap, bidirect);
+ InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
+ InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap );
if ( VV1[0].IsSame( VV1[1] ) || // one of edges is closed
VV2[0].IsSame( VV2[1] ) )
{
- InsertAssociation( edge1, prpEdge, theMap, bidirect); // insert with a proper orientation
+ InsertAssociation( edge1, prpEdge, theMap ); // insert with a proper orientation
}
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true; // done
}
}
SMESH_MesherHelper::IsClosedEdge( edge2 ))
{
// TODO: find out a proper orientation (is it possible?)
- InsertAssociation( edge1, edge2, theMap, bidirect); // insert with a proper orientation
+ InsertAssociation( edge1, edge2, theMap ); // insert with a proper orientation
InsertAssociation( TopExp::FirstVertex(edge1), TopExp::FirstVertex(edge2),
- theMap, bidirect);
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ theMap );
+ InsertAssociation( theShape1, theShape2, theMap );
return true; // done
}
break; // try by vertex closeness
list< TopoDS_Edge >::iterator eIt2 = edges2.begin();
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{
- InsertAssociation( *eIt1, *eIt2, theMap, bidirect);
+ InsertAssociation( *eIt1, *eIt2, theMap );
VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, true );
- InsertAssociation( VV1[0], VV2[0], theMap, bidirect);
+ InsertAssociation( VV1[0], VV2[0], theMap );
}
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
}
if ( AssocGroupsByPropagation( theShape1, theShape2, *theMesh1, theMap ))
return true;
- // find a boundary edge for theShape1
- TopoDS_Edge E;
- for(TopExp_Explorer exp(theShape1, TopAbs_EDGE); exp.More(); exp.Next() ) {
- E = TopoDS::Edge( exp.Current() );
- if ( IsBoundaryEdge( E, theShape1, *theMesh1 ))
- break;
- else
- E.Nullify();
- }
+ // find a boundary edge of theShape1
+ TopoDS_Edge E = GetBoundaryEdge( theShape1, *theMesh1 );
if ( E.IsNull() )
break; // try by vertex closeness
}
}
if ( !VV1[1].IsNull() ) {
- InsertAssociation( VV1[0], VV2[0], theMap, bidirect);
- InsertAssociation( VV1[1], VV2[1], theMap, bidirect);
+ InsertAssociation( VV1[0], VV2[0], theMap );
+ InsertAssociation( VV1[1], VV2[1], theMap );
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
}
}
default:;
}
- // Find association by closeness of vertices
- // ------------------------------------------
+ // 4.b) Find association by closeness of vertices
+ // ----------------------------------------------
TopTools_IndexedMapOfShape vMap1, vMap2;
TopExp::MapShapes( theShape1, TopAbs_VERTEX, vMap1 );
RETURN_BAD_RESULT("Different nb of vertices");
if ( vMap1.Extent() == 1 ) {
- InsertAssociation( vMap1(1), vMap2(1), theMap, bidirect);
+ InsertAssociation( vMap1(1), vMap2(1), theMap );
if ( theShape1.ShapeType() == TopAbs_EDGE ) {
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
}
if ( edgeFound )
{
- InsertAssociation( VV1[0], VV1[0], theMap, bidirect );
- InsertAssociation( VV1[1], VV1[1], theMap, bidirect );
+ InsertAssociation( VV1[0], VV1[0], theMap );
+ InsertAssociation( VV1[1], VV1[1], theMap );
if (FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ))
return true;
}
// Find 2 closest vertices
// get 2 linked vertices of shape 1 not belonging to an inner wire of a face
- TopoDS_Shape edge = theShape1;
- TopExp_Explorer expF( theShape1, TopAbs_FACE ), expE;
- if ( expF.More() ) {
- for ( ; expF.More(); expF.Next() ) {
- edge.Nullify();
- TopoDS_Shape wire = OuterShape( TopoDS::Face( expF.Current() ), TopAbs_WIRE );
- for ( expE.Init( wire, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
- if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
- edge = expE.Current();
- if ( !edge.IsNull() )
- break;
- }
- } else if (edge.ShapeType() != TopAbs_EDGE) { // no faces
- edge.Nullify();
- for ( expE.Init( theShape1, TopAbs_EDGE ); edge.IsNull() && expE.More(); expE.Next() )
- if ( !SMESH_MesherHelper::IsClosedEdge( TopoDS::Edge( expE.Current() )))
- edge = expE.Current();
- }
+ TopoDS_Shape edge = getOuterEdge( theShape1, *theMesh1 );
if ( edge.IsNull() || edge.ShapeType() != TopAbs_EDGE )
RETURN_BAD_RESULT("Edge not found");
}
}
- InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap, bidirect);
- InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap, bidirect);
+ InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
+ InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap );
MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<<
"\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] ));
if ( theShape1.ShapeType() == TopAbs_EDGE ) {
- InsertAssociation( theShape1, theShape2, theMap, bidirect );
+ InsertAssociation( theShape1, theShape2, theMap );
return true;
}
{
bool OK = false;
list< int > nbEInW1, nbEInW2;
+ list< TopoDS_Edge >::iterator edgeIt;
int i_ok_wire_algo = -1;
for ( int outer_wire_algo = 0; outer_wire_algo < 2 && !OK; ++outer_wire_algo )
{
bool reverse = false;
- list< TopoDS_Edge >::iterator edgeIt;
if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
reverse = true;
edgeIt = --edges1.end();
}
}
+ const int nbEdges = nbEInW1.front();
+ if ( OK && nbEdges == 2 )
+ {
+ // if a wire includes 2 edges, it's impossible to associate them using
+ // topological information only. Try to use length of edges for association.
+ double l1[2], l2[2];
+ edgeIt = edges1.begin();
+ l1[0] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ l1[1] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ if ( Abs( l1[0] - l1[1] ) > 0.1 * Max( l1[0], l1[1] ) )
+ {
+ edgeIt = edges2.begin();
+ l2[0] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ l2[1] = SMESH_Algo::EdgeLength( *edgeIt++ );
+ if (( l1[0] < l1[1] ) != ( l2[0] < l2[1] ))
+ {
+ Reverse( edges2, nbEdges );
+ }
+ }
+ }
+
return OK ? nbEInW1.front() : 0;
}
//=======================================================================
void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis* theHyp,
- TShapeShapeMap & theAssociationMap,
- const TopoDS_Shape& theTargetShape)
+ TShapeShapeMap & theAssociationMap)
{
string hypName = theHyp->GetName();
if ( hypName == "ProjectionSource1D" ) {
const StdMeshers_ProjectionSource1D * hyp =
static_cast<const StdMeshers_ProjectionSource1D*>( theHyp );
if ( hyp->HasVertexAssociation() )
- InsertAssociation( hyp->GetSourceVertex(),hyp->GetTargetVertex(),theAssociationMap);
+ InsertAssociation( hyp->GetTargetVertex(),hyp->GetSourceVertex(),theAssociationMap );
}
else if ( hypName == "ProjectionSource2D" ) {
const StdMeshers_ProjectionSource2D * hyp =
static_cast<const StdMeshers_ProjectionSource2D*>( theHyp );
if ( hyp->HasVertexAssociation() ) {
- InsertAssociation( hyp->GetSourceVertex(1),hyp->GetTargetVertex(1),theAssociationMap);
- InsertAssociation( hyp->GetSourceVertex(2),hyp->GetTargetVertex(2),theAssociationMap);
+ InsertAssociation( hyp->GetTargetVertex(1),hyp->GetSourceVertex(1),theAssociationMap);
+ InsertAssociation( hyp->GetTargetVertex(2),hyp->GetSourceVertex(2),theAssociationMap);
}
}
else if ( hypName == "ProjectionSource3D" ) {
const StdMeshers_ProjectionSource3D * hyp =
static_cast<const StdMeshers_ProjectionSource3D*>( theHyp );
if ( hyp->HasVertexAssociation() ) {
- InsertAssociation( hyp->GetSourceVertex(1),hyp->GetTargetVertex(1),theAssociationMap);
- InsertAssociation( hyp->GetSourceVertex(2),hyp->GetTargetVertex(2),theAssociationMap);
+ InsertAssociation( hyp->GetTargetVertex(1),hyp->GetSourceVertex(1),theAssociationMap);
+ InsertAssociation( hyp->GetTargetVertex(2),hyp->GetSourceVertex(2),theAssociationMap);
}
}
}
//=======================================================================
/*!
* \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap
- * \param theShape1 - shape 1
- * \param theShape2 - shape 2
+ * \param theShape1 - target shape
+ * \param theShape2 - source shape
* \param theAssociationMap - association map
* \retval bool - true if there was no association for these shapes before
*/
//=======================================================================
-bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape1,
- const TopoDS_Shape& theShape2,
- TShapeShapeMap & theAssociationMap,
- const bool theBidirectional)
+bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape1, // tgt
+ const TopoDS_Shape& theShape2, // src
+ TShapeShapeMap & theAssociationMap)
{
if ( !theShape1.IsNull() && !theShape2.IsNull() ) {
SHOW_SHAPE(theShape1,"Assoc ");
SHOW_SHAPE(theShape2," to ");
bool isNew = ( theAssociationMap.Bind( theShape1, theShape2 ));
- if ( theBidirectional )
- theAssociationMap.Bind( theShape2, theShape1 );
return isNew;
}
else {
TopoDS_Edge e2 = TopoDS::Edge( eE.Current() );
eE.Next();
// edge 1
- if ( !assocMap.IsBound( e2 ))
+ if ( !assocMap.IsBound( e2, /*is2nd=*/true ))
RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( e2 ));
- TopoDS_Edge e1 = TopoDS::Edge( assocMap( e2 ));
+ TopoDS_Edge e1 = TopoDS::Edge( assocMap( e2, /*is2nd=*/true ));
if ( !helper1.IsSubShape( e1, face1 ))
RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( e1 ) <<
" isn't a sub-shape of face " << meshDS1->ShapeToIndex( face1 ));
// get 2 matching vertices
TopoDS_Vertex V2 = TopExp::FirstVertex( TopoDS::Edge( edge2 ));
- if ( !assocMap.IsBound( V2 ))
+ if ( !assocMap.IsBound( V2, /*is2nd=*/true ))
RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 ));
- TopoDS_Vertex V1 = TopoDS::Vertex( assocMap( V2 ));
+ TopoDS_Vertex V1 = TopoDS::Vertex( assocMap( V2, /*is2nd=*/true ));
// nodes on vertices
const SMDS_MeshNode* vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 );
{
// get 2 other matching vertices
V2 = TopExp::LastVertex( TopoDS::Edge( edge2 ));
- if ( !assocMap.IsBound( V2 ))
+ if ( !assocMap.IsBound( V2, /*is2nd=*/true ))
RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 ));
- V1 = TopoDS::Vertex( assocMap( V2 ));
+ V1 = TopoDS::Vertex( assocMap( V2, /*is2nd=*/true ));
// nodes on vertices
eNode1[0] = SMESH_Algo::VertexNode( V1, meshDS1 );
notInSet.insert( f2 );
for ( int i = 0; i < nbNodes; ++i ) {
const SMDS_MeshNode* n1 = faceToKeep->GetNode( i );
- const SMDS_MeshNode* n2 = faceToKeep->GetNode( i+1 % nbNodes );
+ const SMDS_MeshNode* n2 = faceToKeep->GetNode(( i+1 ) % nbNodes );
f1 = SMESH_MeshEditor::FindFaceInSet( n1, n2, inSet, notInSet );
if ( f1 )
elems.insert( f1 );
// associate matching nodes on the last vertices
V2 = TopExp::LastVertex( TopoDS::Edge( edge2 ));
- if ( !assocMap.IsBound( V2 ))
+ if ( !assocMap.IsBound( V2, /*is2nd=*/true ))
RETURN_BAD_RESULT("Association not found for vertex " << meshDS2->ShapeToIndex( V2 ));
- V1 = TopoDS::Vertex( assocMap( V2 ));
+ V1 = TopoDS::Vertex( assocMap( V2, /*is2nd=*/true ));
vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 );
vNode2 = SMESH_Algo::VertexNode( V2, meshDS2 );
if ( !vNode1 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS1->ShapeToIndex( V1 ));
if ( !srcMesh )
srcMesh = mesh;
- if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ))
- return gen->Compute( *mesh, sm->GetSubShape() );
+ if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ) &&
+ gen->Compute( *mesh, sm->GetSubShape() ))
+ return sm->IsMeshComputed();
return false;
}
//================================================================================
/*!
- * \brief Return true if edge is a boundary of edgeContainer
+ * \brief Return a boundary EDGE of edgeContainer
*/
//================================================================================
-bool StdMeshers_ProjectionUtils::IsBoundaryEdge(const TopoDS_Edge& edge,
- const TopoDS_Shape& edgeContainer,
- SMESH_Mesh& mesh)
+TopoDS_Edge StdMeshers_ProjectionUtils::GetBoundaryEdge(const TopoDS_Shape& edgeContainer,
+ const SMESH_Mesh& mesh)
{
TopTools_IndexedMapOfShape facesOfEdgeContainer, facesNearEdge;
TopExp::MapShapes( edgeContainer, TopAbs_FACE, facesOfEdgeContainer );
- const TopTools_ListOfShape& EAncestors = mesh.GetAncestors(edge);
- TopTools_ListIteratorOfListOfShape itea(EAncestors);
- for(; itea.More(); itea.Next()) {
- if( itea.Value().ShapeType() == TopAbs_FACE &&
- facesOfEdgeContainer.Contains( itea.Value() ))
+ if ( !facesOfEdgeContainer.IsEmpty() )
+ for ( TopExp_Explorer exp(edgeContainer, TopAbs_EDGE); exp.More(); exp.Next() )
{
- facesNearEdge.Add( itea.Value() );
- if ( facesNearEdge.Extent() > 1 )
- return false;
+ const TopoDS_Edge& edge = TopoDS::Edge( exp.Current() );
+ facesNearEdge.Clear();
+ PShapeIteratorPtr faceIt = SMESH_MesherHelper::GetAncestors( edge, mesh, TopAbs_FACE );
+ while ( const TopoDS_Shape* face = faceIt->next() )
+ if ( facesOfEdgeContainer.Contains( *face ))
+ if ( facesNearEdge.Add( *face ) && facesNearEdge.Extent() > 1 )
+ break;
+ if ( facesNearEdge.Extent() == 1 )
+ return edge;
}
- }
- return ( facesNearEdge.Extent() == 1 );
+
+ return TopoDS_Edge();
}
-namespace {
+namespace { // Definition of event listeners
SMESH_subMeshEventListener* GetSrcSubMeshListener();
struct HypModifWaiter: SMESH_subMeshEventListener
{
- HypModifWaiter():SMESH_subMeshEventListener(0){} // won't be deleted by submesh
-
+ HypModifWaiter():SMESH_subMeshEventListener(false,// won't be deleted by submesh
+ "StdMeshers_ProjectionUtils::HypModifWaiter") {}
void ProcessEvent(const int event, const int eventType, SMESH_subMesh* subMesh,
EventListenerData*, const SMESH_Hypothesis*)
{
//================================================================================
SMESH_subMeshEventListener* GetSrcSubMeshListener() {
- static SMESH_subMeshEventListener srcListener(0); // won't be deleted by submesh
+ static SMESH_subMeshEventListener srcListener(false, // won't be deleted by submesh
+ "StdMeshers_ProjectionUtils::SrcSubMeshListener");
return &srcListener;
}
}
