ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-06 23:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL22863 TC6.5.0: Projection_1D2D gives exception

Browse Source 
Replace TopTools_DataMapOfShapeShape with
StdMeshers_ShapeShapeBiDirectionMap which includes 2
TopTools_DataMapOfShapeShape's, one per a mapping direction
This commit is contained in:
eap 2012-04-23 10:13:52 +00:00
parent 547f8b8e54
commit 6fee24f068
6 changed files with 105 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -418,9 +418,9 @@ namespace {
//======================================================================= //=======================================================================
/*! /*!
* \brief Looks for association of all sub-shapes of two shapes * \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 theMesh1 - mesh built on shape 1
* \param theShape2 - shape 2 * \param theShape2 - source shape
* \param theMesh2 - mesh built on shape 2 * \param theMesh2 - mesh built on shape 2
* \param theAssociation - association map to be filled that may * \param theAssociation - association map to be filled that may
* contain association of one or two pairs of vertices * contain association of one or two pairs of vertices
@ -474,13 +474,11 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
return FindSubShapeAssociation(group1, theMesh1, group2, theMesh2, theMap ); return FindSubShapeAssociation(group1, theMesh1, group2, theMesh2, theMap );
} }
bool bidirect = ( !theShape1.IsSame( theShape2 ));
// ============ // ============
// 2) Is partner? // 2) Is partner?
// ============ // ============
bool partner = theShape1.IsPartner( theShape2 ); bool partner = theShape1.IsPartner( theShape2 );
TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap ); TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap._map1to2 );
for ( ; partner && vvIt.More(); vvIt.Next() ) for ( ; partner && vvIt.More(); vvIt.Next() )
partner = vvIt.Key().IsPartner( vvIt.Value() ); partner = vvIt.Key().IsPartner( vvIt.Value() );
@ -492,7 +490,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TShapePairsList::iterator s1_s2 = shapesQueue.begin(); TShapePairsList::iterator s1_s2 = shapesQueue.begin();
for ( ; s1_s2 != shapesQueue.end(); ++s1_s2 ) 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 ); TopoDS_Iterator s1It( s1_s2->first), s2It( s1_s2->second );
for ( ; s1It.More(); s1It.Next(), s2It.Next() ) for ( ; s1It.More(); s1It.Next(), s2It.Next() )
shapesQueue.push_back( make_pair( s1It.Value(), s2It.Value() )); shapesQueue.push_back( make_pair( s1It.Value(), s2It.Value() ));
@ -521,8 +519,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
int i1 = 0, i2 = 0; int i1 = 0, i2 = 0;
if ( theMap.IsBound( VV1[ i1 ] )) i1 = 1; if ( theMap.IsBound( VV1[ i1 ] )) i1 = 1;
if ( theMap.IsBound( VV2[ i2 ] )) i2 = 1; if ( theMap.IsBound( VV2[ i2 ] )) i2 = 1;
InsertAssociation( VV1[ i1 ], VV2[ i2 ], theMap, bidirect); InsertAssociation( VV1[ i1 ], VV2[ i2 ], theMap );
InsertAssociation( theShape1, theShape2, theMap, bidirect ); InsertAssociation( theShape1, theShape2, theMap );
return true; return true;
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@ -561,12 +559,12 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
list< TopoDS_Edge >::iterator eIt2 = edges2.begin(); list< TopoDS_Edge >::iterator eIt2 = edges2.begin();
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{ {
InsertAssociation( *eIt1, *eIt2, theMap, bidirect); InsertAssociation( *eIt1, *eIt2, theMap );
VV1[0] = TopExp::FirstVertex( *eIt1, true ); VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, 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; return true;
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@ -647,7 +645,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopExp::Vertices( edge1, VV1[0], VV1[1], true ); TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( edge2, VV2[0], VV2[1], true ); TopExp::Vertices( edge2, VV2[0], VV2[1], true );
F2 = FF2[ 0 ]; // (F2 !) F2 = FF2[ 0 ]; // (F2 !)
if ( !VV1[ 0 ].IsSame( theMap( VV2[ 0 ]))) { if ( !VV1[ 0 ].IsSame( theMap( VV2[ 0 ], /*is2=*/true))) {
edge2.Reverse(); edge2.Reverse();
if ( FF2[ 1 ].IsNull() ) if ( FF2[ 1 ].IsNull() )
F2.Reverse(); F2.Reverse();
@ -674,7 +672,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
list< TopoDS_Edge > edges1, edges2; list< TopoDS_Edge > edges1, edges2;
int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 ); int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2 );
if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed"); 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 )<< MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 ));
if ( nbE == 2 && (edge1.IsSame( edges1.front())) != (edge2.IsSame( edges2.front()))) if ( nbE == 2 && (edge1.IsSame( edges1.front())) != (edge2.IsSame( edges2.front())))
@ -686,12 +684,12 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{ {
if ( !boundEdges.Add( *eIt1 )) continue; // already associated 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 )<< MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( *eIt1 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( *eIt2 )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( *eIt2 ));
VV1[0] = TopExp::FirstVertex( *eIt1, true ); VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, 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] )<< MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[0] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[0] )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[0] ));
@ -704,7 +702,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
} }
} }
InsertAssociation( theShape1, theShape2, theMap, bidirect ); InsertAssociation( theShape1, theShape2, theMap );
return true; return true;
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
@ -826,7 +824,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TShapeShapeMap tmpMap; TShapeShapeMap tmpMap;
ok = FindSubShapeAssociation( comp[0], theMesh1, comp[1], theMesh2, tmpMap ); ok = FindSubShapeAssociation( comp[0], theMesh1, comp[1], theMesh2, tmpMap );
if ( ok ) { if ( ok ) {
TopTools_DataMapIteratorOfDataMapOfShapeShape mapIt( tmpMap ); TopTools_DataMapIteratorOfDataMapOfShapeShape mapIt( tmpMap._map1to2 );
for ( ; mapIt.More(); mapIt.Next() ) for ( ; mapIt.More(); mapIt.Next() )
theMap.Bind( mapIt.Key(), mapIt.Value()); theMap.Bind( mapIt.Key(), mapIt.Value());
} }
@ -885,13 +883,13 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopoDS_Edge e1 = TopoDS::Edge( edges1.First() ); TopoDS_Edge e1 = TopoDS::Edge( edges1.First() );
v2e[0].UnBind( V[0] ); v2e[0].UnBind( V[0] );
v2e[1].UnBind( V[1] ); v2e[1].UnBind( V[1] );
InsertAssociation( e0, e1, theMap, bidirect ); InsertAssociation( e0, e1, theMap );
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<< MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 ));
V[0] = GetNextVertex( e0, V[0] ); V[0] = GetNextVertex( e0, V[0] );
V[1] = GetNextVertex( e1, V[1] ); V[1] = GetNextVertex( e1, V[1] );
if ( !V[0].IsNull() ) { 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] )<< MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( V[0] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] ));
} }
@ -917,9 +915,9 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} else { } else {
v1n = v1e1; e1b = edges1.First(); e1n = edges1.Last(); v1n = v1e1; e1b = edges1.First(); e1n = edges1.Last();
} }
InsertAssociation( e0b, e1b, theMap, bidirect ); InsertAssociation( e0b, e1b, theMap );
InsertAssociation( e0n, e1n, theMap, bidirect ); InsertAssociation( e0n, e1n, theMap );
InsertAssociation( v0n, v1n, theMap, bidirect ); InsertAssociation( v0n, v1n, theMap );
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<< MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b ));
MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<< MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<<
@ -963,14 +961,14 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
TopoDS_Vertex VV1[2], VV2[2]; TopoDS_Vertex VV1[2], VV2[2];
TopExp::Vertices( edge1, VV1[0], VV1[1], true ); TopExp::Vertices( edge1, VV1[0], VV1[1], true );
TopExp::Vertices( prpEdge, VV2[0], VV2[1], true ); TopExp::Vertices( prpEdge, VV2[0], VV2[1], true );
InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap, bidirect); InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap, bidirect); InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap );
if ( VV1[0].IsSame( VV1[1] ) || // one of edges is closed if ( VV1[0].IsSame( VV1[1] ) || // one of edges is closed
VV2[0].IsSame( VV2[1] ) ) 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 return true; // done
} }
} }
@ -978,10 +976,10 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
SMESH_MesherHelper::IsClosedEdge( edge2 )) SMESH_MesherHelper::IsClosedEdge( edge2 ))
{ {
// TODO: find out a proper orientation (is it possible?) // 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), InsertAssociation( TopExp::FirstVertex(edge1), TopExp::FirstVertex(edge2),
theMap, bidirect); theMap );
InsertAssociation( theShape1, theShape2, theMap, bidirect ); InsertAssociation( theShape1, theShape2, theMap );
return true; // done return true; // done
} }
break; // try by vertex closeness break; // try by vertex closeness
@ -1031,12 +1029,12 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
list< TopoDS_Edge >::iterator eIt2 = edges2.begin(); list< TopoDS_Edge >::iterator eIt2 = edges2.begin();
for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 ) for ( ; eIt1 != edges1.end(); ++eIt1, ++eIt2 )
{ {
InsertAssociation( *eIt1, *eIt2, theMap, bidirect); InsertAssociation( *eIt1, *eIt2, theMap );
VV1[0] = TopExp::FirstVertex( *eIt1, true ); VV1[0] = TopExp::FirstVertex( *eIt1, true );
VV2[0] = TopExp::FirstVertex( *eIt2, 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; return true;
} }
} }
@ -1099,8 +1097,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
} }
if ( !VV1[1].IsNull() ) { if ( !VV1[1].IsNull() ) {
InsertAssociation( VV1[0], VV2[0], theMap, bidirect); InsertAssociation( VV1[0], VV2[0], theMap );
InsertAssociation( VV1[1], VV2[1], theMap, bidirect); InsertAssociation( VV1[1], VV2[1], theMap );
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap); return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
} }
} }
@ -1121,9 +1119,9 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
RETURN_BAD_RESULT("Different nb of vertices"); RETURN_BAD_RESULT("Different nb of vertices");
if ( vMap1.Extent() == 1 ) { if ( vMap1.Extent() == 1 ) {
InsertAssociation( vMap1(1), vMap2(1), theMap, bidirect); InsertAssociation( vMap1(1), vMap2(1), theMap );
if ( theShape1.ShapeType() == TopAbs_EDGE ) { if ( theShape1.ShapeType() == TopAbs_EDGE ) {
InsertAssociation( theShape1, theShape2, theMap, bidirect ); InsertAssociation( theShape1, theShape2, theMap );
return true; return true;
} }
return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap); return FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap);
@ -1147,8 +1145,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
if ( edgeFound ) if ( edgeFound )
{ {
InsertAssociation( VV1[0], VV1[0], theMap, bidirect ); InsertAssociation( VV1[0], VV1[0], theMap );
InsertAssociation( VV1[1], VV1[1], theMap, bidirect ); InsertAssociation( VV1[1], VV1[1], theMap );
if (FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap )) if (FindSubShapeAssociation( theShape1, theMesh1, theShape2, theMesh2, theMap ))
return true; return true;
} }
@ -1203,14 +1201,14 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
} }
InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap, bidirect); InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap );
InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap, bidirect); InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap );
MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<< MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<< " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<<
"\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<< "\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<<
" to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] )); " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] ));
if ( theShape1.ShapeType() == TopAbs_EDGE ) { if ( theShape1.ShapeType() == TopAbs_EDGE ) {
InsertAssociation( theShape1, theShape2, theMap, bidirect ); InsertAssociation( theShape1, theShape2, theMap );
return true; return true;
} }
@ -1378,30 +1376,29 @@ int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
//======================================================================= //=======================================================================
void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis* theHyp, void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis* theHyp,
TShapeShapeMap & theAssociationMap, TShapeShapeMap & theAssociationMap)
const TopoDS_Shape& theTargetShape)
{ {
string hypName = theHyp->GetName(); string hypName = theHyp->GetName();
if ( hypName == "ProjectionSource1D" ) { if ( hypName == "ProjectionSource1D" ) {
const StdMeshers_ProjectionSource1D * hyp = const StdMeshers_ProjectionSource1D * hyp =
static_cast<const StdMeshers_ProjectionSource1D*>( theHyp ); static_cast<const StdMeshers_ProjectionSource1D*>( theHyp );
if ( hyp->HasVertexAssociation() ) if ( hyp->HasVertexAssociation() )
InsertAssociation( hyp->GetSourceVertex(),hyp->GetTargetVertex(),theAssociationMap); InsertAssociation( hyp->GetTargetVertex(),hyp->GetSourceVertex(),theAssociationMap );
} }
else if ( hypName == "ProjectionSource2D" ) { else if ( hypName == "ProjectionSource2D" ) {
const StdMeshers_ProjectionSource2D * hyp = const StdMeshers_ProjectionSource2D * hyp =
static_cast<const StdMeshers_ProjectionSource2D*>( theHyp ); static_cast<const StdMeshers_ProjectionSource2D*>( theHyp );
if ( hyp->HasVertexAssociation() ) { if ( hyp->HasVertexAssociation() ) {
InsertAssociation( hyp->GetSourceVertex(1),hyp->GetTargetVertex(1),theAssociationMap); InsertAssociation( hyp->GetTargetVertex(1),hyp->GetSourceVertex(1),theAssociationMap);
InsertAssociation( hyp->GetSourceVertex(2),hyp->GetTargetVertex(2),theAssociationMap); InsertAssociation( hyp->GetTargetVertex(2),hyp->GetSourceVertex(2),theAssociationMap);
} }
} }
else if ( hypName == "ProjectionSource3D" ) { else if ( hypName == "ProjectionSource3D" ) {
const StdMeshers_ProjectionSource3D * hyp = const StdMeshers_ProjectionSource3D * hyp =
static_cast<const StdMeshers_ProjectionSource3D*>( theHyp ); static_cast<const StdMeshers_ProjectionSource3D*>( theHyp );
if ( hyp->HasVertexAssociation() ) { if ( hyp->HasVertexAssociation() ) {
InsertAssociation( hyp->GetSourceVertex(1),hyp->GetTargetVertex(1),theAssociationMap); InsertAssociation( hyp->GetTargetVertex(1),hyp->GetSourceVertex(1),theAssociationMap);
InsertAssociation( hyp->GetSourceVertex(2),hyp->GetTargetVertex(2),theAssociationMap); InsertAssociation( hyp->GetTargetVertex(2),hyp->GetSourceVertex(2),theAssociationMap);
} }
} }
} }
@ -1409,24 +1406,21 @@ void StdMeshers_ProjectionUtils::InitVertexAssociation( const SMESH_Hypothesis*
//======================================================================= //=======================================================================
/*! /*!
* \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap * \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap
* \param theShape1 - shape 1 * \param theShape1 - target shape
* \param theShape2 - shape 2 * \param theShape2 - source shape
* \param theAssociationMap - association map * \param theAssociationMap - association map
* \retval bool - true if there was no association for these shapes before * \retval bool - true if there was no association for these shapes before
*/ */
//======================================================================= //=======================================================================
bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape1, bool StdMeshers_ProjectionUtils::InsertAssociation( const TopoDS_Shape& theShape1, // tgt
const TopoDS_Shape& theShape2, const TopoDS_Shape& theShape2, // src
TShapeShapeMap & theAssociationMap, TShapeShapeMap & theAssociationMap)
const bool theBidirectional)
{ {
if ( !theShape1.IsNull() && !theShape2.IsNull() ) { if ( !theShape1.IsNull() && !theShape2.IsNull() ) {
SHOW_SHAPE(theShape1,"Assoc "); SHOW_SHAPE(theShape1,"Assoc ");
SHOW_SHAPE(theShape2," to "); SHOW_SHAPE(theShape2," to ");
bool isNew = ( theAssociationMap.Bind( theShape1, theShape2 )); bool isNew = ( theAssociationMap.Bind( theShape1, theShape2 ));
if ( theBidirectional )
theAssociationMap.Bind( theShape2, theShape1 );
return isNew; return isNew;
} }
else { else {
@ -1647,9 +1641,9 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
TopoDS_Edge e2 = TopoDS::Edge( eE.Current() ); TopoDS_Edge e2 = TopoDS::Edge( eE.Current() );
eE.Next(); eE.Next();
// edge 1 // edge 1
if ( !assocMap.IsBound( e2 )) if ( !assocMap.IsBound( e2, /*is2nd=*/true ))
RETURN_BAD_RESULT("Association not found for edge " << meshDS2->ShapeToIndex( e2 )); 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 )) if ( !helper1.IsSubShape( e1, face1 ))
RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( e1 ) << RETURN_BAD_RESULT("Wrong association, edge " << meshDS1->ShapeToIndex( e1 ) <<
" isn't a sub-shape of face " << meshDS1->ShapeToIndex( face1 )); " isn't a sub-shape of face " << meshDS1->ShapeToIndex( face1 ));
@ -1691,9 +1685,9 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
// get 2 matching vertices // get 2 matching vertices
TopoDS_Vertex V2 = TopExp::FirstVertex( TopoDS::Edge( edge2 )); 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 )); 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 // nodes on vertices
const SMDS_MeshNode* vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 ); const SMDS_MeshNode* vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 );
@ -1742,9 +1736,9 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
{ {
// get 2 other matching vertices // get 2 other matching vertices
V2 = TopExp::LastVertex( TopoDS::Edge( edge2 )); 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 )); 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 // nodes on vertices
eNode1[0] = SMESH_Algo::VertexNode( V1, meshDS1 ); eNode1[0] = SMESH_Algo::VertexNode( V1, meshDS1 );
@ -1896,9 +1890,9 @@ FindMatchingNodesOnFaces( const TopoDS_Face& face1,
// associate matching nodes on the last vertices // associate matching nodes on the last vertices
V2 = TopExp::LastVertex( TopoDS::Edge( edge2 )); 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 )); 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 ); vNode1 = SMESH_Algo::VertexNode( V1, meshDS1 );
vNode2 = SMESH_Algo::VertexNode( V2, meshDS2 ); vNode2 = SMESH_Algo::VertexNode( V2, meshDS2 );
if ( !vNode1 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS1->ShapeToIndex( V1 )); if ( !vNode1 ) RETURN_BAD_RESULT("No node on vertex #" << meshDS1->ShapeToIndex( V1 ));

39
src/StdMeshers/StdMeshers_ProjectionUtils.hxx
View File

@ -45,6 +45,29 @@ class SMESH_Hypothesis;
class SMESH_subMesh; class SMESH_subMesh;
class TopTools_IndexedDataMapOfShapeListOfShape; class TopTools_IndexedDataMapOfShapeListOfShape;
/*!
* \brief Struct used instead of a sole TopTools_DataMapOfShapeShape to avoid
* problems with bidirectional bindings
*/
struct StdMeshers_ShapeShapeBiDirectionMap
{
TopTools_DataMapOfShapeShape _map1to2, _map2to1;
// convension: s1 - target, s2 - source
bool Bind( const TopoDS_Shape& s1, const TopoDS_Shape& s2 )
{ _map1to2.Bind( s1, s2 ); return _map2to1.Bind( s2, s1 ); }
bool IsBound( const TopoDS_Shape& s, const bool isShape2=false ) const
{ return (isShape2 ? _map2to1 : _map1to2).IsBound( s ); }
bool IsEmpty() const { return _map1to2.IsEmpty(); }
int Extent() const { return _map1to2.Extent(); }
void Clear() { _map1to2.Clear(); _map2to1.Clear(); }
const TopoDS_Shape& operator()( const TopoDS_Shape& s, const bool isShape2=false ) const
{ // if we get a Standard_NoSuchObject here, it means that the calling code
// passes incorrect isShape2
return (isShape2 ? _map2to1 : _map1to2)( s );
}
};
/*! /*!
* \brief Class encapsulating methods common to Projection algorithms * \brief Class encapsulating methods common to Projection algorithms
*/ */
@ -52,7 +75,7 @@ class StdMeshers_ProjectionUtils
{ {
public: public:
typedef TopTools_DataMapOfShapeShape TShapeShapeMap; typedef StdMeshers_ShapeShapeBiDirectionMap TShapeShapeMap;
typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap; typedef TopTools_IndexedDataMapOfShapeListOfShape TAncestorMap;
typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap; typedef std::map<const SMDS_MeshNode*, const SMDS_MeshNode*> TNodeNodeMap;
@ -96,21 +119,19 @@ class StdMeshers_ProjectionUtils
* \param theTargetShape - the shape theHyp assigned to * \param theTargetShape - the shape theHyp assigned to
*/ */
static void InitVertexAssociation( const SMESH_Hypothesis* theHyp, static void InitVertexAssociation( const SMESH_Hypothesis* theHyp,
TShapeShapeMap & theAssociationMap, TShapeShapeMap & theAssociationMap);
const TopoDS_Shape& theTargetShape);
/*! /*!
* \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap * \brief Inserts association theShape1 <-> theShape2 to TShapeShapeMap
* \param theShape1 - shape 1 * \param theShape1 - target shape
* \param theShape2 - shape 2 * \param theShape2 - source shape
* \param theAssociationMap - association map * \param theAssociationMap - association map
* \param theBidirectional - if false, inserts theShape1 -> theShape2 association * \param theBidirectional - if false, inserts theShape1 -> theShape2 association
* \retval bool - true if there was no association for these shapes before * \retval bool - true if there was no association for these shapes before
*/ */
static bool InsertAssociation( const TopoDS_Shape& theShape1, static bool InsertAssociation( const TopoDS_Shape& theShape1, // target
const TopoDS_Shape& theShape2, const TopoDS_Shape& theShape2, // source
TShapeShapeMap & theAssociationMap, TShapeShapeMap & theAssociationMap);
const bool theBidirectional=true);
/*! /*!
* \brief Finds an edge by its vertices in a main shape of the mesh * \brief Finds an edge by its vertices in a main shape of the mesh

4
src/StdMeshers/StdMeshers_Projection_1D.cxx
View File

@ -217,7 +217,7 @@ bool StdMeshers_Projection_1D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
TopoDS_Shape srcShape = _sourceHypo->GetSourceEdge().Oriented(TopAbs_FORWARD); TopoDS_Shape srcShape = _sourceHypo->GetSourceEdge().Oriented(TopAbs_FORWARD);
TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::TShapeShapeMap shape2ShapeMap;
TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap, tgtEdge ); TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !TAssocTool::FindSubShapeAssociation( tgtEdge, tgtMesh, srcShape, srcMesh, if ( !TAssocTool::FindSubShapeAssociation( tgtEdge, tgtMesh, srcShape, srcMesh,
shape2ShapeMap) || shape2ShapeMap) ||
!shape2ShapeMap.IsBound( tgtEdge )) !shape2ShapeMap.IsBound( tgtEdge ))
@ -401,7 +401,7 @@ bool StdMeshers_Projection_1D::Evaluate(SMESH_Mesh& theMesh,
TopoDS_Shape srcShape = _sourceHypo->GetSourceEdge().Oriented(TopAbs_FORWARD); TopoDS_Shape srcShape = _sourceHypo->GetSourceEdge().Oriented(TopAbs_FORWARD);
TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::TShapeShapeMap shape2ShapeMap;
TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap, tgtEdge ); TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !TAssocTool::FindSubShapeAssociation( tgtEdge, tgtMesh, srcShape, srcMesh, if ( !TAssocTool::FindSubShapeAssociation( tgtEdge, tgtMesh, srcShape, srcMesh,
shape2ShapeMap) || shape2ShapeMap) ||
!shape2ShapeMap.IsBound( tgtEdge )) !shape2ShapeMap.IsBound( tgtEdge ))

2
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
View File

@ -196,7 +196,7 @@ bool StdMeshers_Projection_1D2D::Evaluate(SMESH_Mesh& theMesh,
typedef StdMeshers_ProjectionUtils SPU; typedef StdMeshers_ProjectionUtils SPU;
SPU::TShapeShapeMap shape2ShapeMap; SPU::TShapeShapeMap shape2ShapeMap;
SPU::InitVertexAssociation( _sourceHypo, shape2ShapeMap, theShape ); SPU::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !SPU::FindSubShapeAssociation( theShape, &theMesh, srcFace, srcMesh, shape2ShapeMap)) if ( !SPU::FindSubShapeAssociation( theShape, &theMesh, srcFace, srcMesh, shape2ShapeMap))
return error(COMPERR_BAD_SHAPE,"Topology of source and target faces seems different" ); return error(COMPERR_BAD_SHAPE,"Topology of source and target faces seems different" );

20
src/StdMeshers/StdMeshers_Projection_2D.cxx
View File

@ -428,7 +428,7 @@ namespace {
// find corresponding point on target shape // find corresponding point on target shape
pOK = false; pOK = false;
gp_Pnt tgtP; gp_Pnt tgtP;
const TopoDS_Shape& tgtShape = shape2ShapeMap( srcSM->GetSubShape() ); const TopoDS_Shape& tgtShape = shape2ShapeMap( srcSM->GetSubShape(), /*isSrc=*/true );
if ( tgtShape.ShapeType() == TopAbs_VERTEX ) if ( tgtShape.ShapeType() == TopAbs_VERTEX )
{ {
tgtP = BRep_Tool::Pnt( TopoDS::Vertex( tgtShape )); tgtP = BRep_Tool::Pnt( TopoDS::Vertex( tgtShape ));
@ -480,7 +480,7 @@ namespace {
for ( TopExp_Explorer srcEdge( srcFace, TopAbs_EDGE); srcEdge.More(); srcEdge.Next() ) for ( TopExp_Explorer srcEdge( srcFace, TopAbs_EDGE); srcEdge.More(); srcEdge.Next() )
{ {
const TopoDS_Shape& tgtEdge = shape2ShapeMap( srcEdge.Current() ); const TopoDS_Shape& tgtEdge = shape2ShapeMap( srcEdge.Current(), /*isSrc=*/true );
map< double, const SMDS_MeshNode* > srcNodes, tgtNodes; map< double, const SMDS_MeshNode* > srcNodes, tgtNodes;
if ( !SMESH_Algo::GetSortedNodesOnEdge( srcMesh->GetMeshDS(), if ( !SMESH_Algo::GetSortedNodesOnEdge( srcMesh->GetMeshDS(),
@ -611,7 +611,7 @@ namespace {
TopTools_IndexedMapOfShape edgeMap; // to detect seam edges TopTools_IndexedMapOfShape edgeMap; // to detect seam edges
for ( int iE = 0; iE < srcWire->NbEdges(); ++iE ) for ( int iE = 0; iE < srcWire->NbEdges(); ++iE )
{ {
tgtEdges.push_back( TopoDS::Edge( shape2ShapeMap( srcWire->Edge( iE )))); tgtEdges.push_back( TopoDS::Edge( shape2ShapeMap( srcWire->Edge( iE ), /*isSrc=*/true)));
// reverse a seam edge encountered for the second time // reverse a seam edge encountered for the second time
const int oldExtent = edgeMap.Extent(); const int oldExtent = edgeMap.Extent();
edgeMap.Add( tgtEdges.back() ); edgeMap.Add( tgtEdges.back() );
@ -734,14 +734,14 @@ namespace {
} }
case SMDS_TOP_EDGE: { case SMDS_TOP_EDGE: {
TopoDS_Shape srcEdge = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() ); TopoDS_Shape srcEdge = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() );
TopoDS_Shape tgtEdge = shape2ShapeMap( srcEdge ); TopoDS_Shape tgtEdge = shape2ShapeMap( srcEdge, /*isSrc=*/true );
double U = srcHelper.GetNodeU( TopoDS::Edge( srcEdge ), srcNode ); double U = srcHelper.GetNodeU( TopoDS::Edge( srcEdge ), srcNode );
tgtMeshDS->SetNodeOnEdge( n, TopoDS::Edge( tgtEdge ), U); tgtMeshDS->SetNodeOnEdge( n, TopoDS::Edge( tgtEdge ), U);
break; break;
} }
case SMDS_TOP_VERTEX: { case SMDS_TOP_VERTEX: {
TopoDS_Shape srcV = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() ); TopoDS_Shape srcV = srcHelper.GetSubShapeByNode( srcNode, srcHelper.GetMeshDS() );
TopoDS_Shape tgtV = shape2ShapeMap( srcV ); TopoDS_Shape tgtV = shape2ShapeMap( srcV, /*isSrc=*/true );
tgtMeshDS->SetNodeOnVertex( n, TopoDS::Vertex( tgtV )); tgtMeshDS->SetNodeOnVertex( n, TopoDS::Vertex( tgtV ));
break; break;
} }
@ -790,7 +790,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
TopoDS_Shape srcShape = _sourceHypo->GetSourceFace().Oriented(TopAbs_FORWARD); TopoDS_Shape srcShape = _sourceHypo->GetSourceFace().Oriented(TopAbs_FORWARD);
TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::TShapeShapeMap shape2ShapeMap;
TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap, tgtFace ); TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !TAssocTool::FindSubShapeAssociation( tgtFace, tgtMesh, srcShape, srcMesh, if ( !TAssocTool::FindSubShapeAssociation( tgtFace, tgtMesh, srcShape, srcMesh,
shape2ShapeMap) || shape2ShapeMap) ||
!shape2ShapeMap.IsBound( tgtFace )) !shape2ShapeMap.IsBound( tgtFace ))
@ -881,9 +881,9 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
TopoDS_Vertex srcV1 = TopoDS::Vertex( mapper.GetSubShape( 1 )); TopoDS_Vertex srcV1 = TopoDS::Vertex( mapper.GetSubShape( 1 ));
if ( srcV1.IsNull() ) if ( srcV1.IsNull() )
RETURN_BAD_RESULT("Mesh is not bound to the face"); RETURN_BAD_RESULT("Mesh is not bound to the face");
if ( !shape2ShapeMap.IsBound( srcV1 )) if ( !shape2ShapeMap.IsBound( srcV1, /*isSrc=*/true ))
RETURN_BAD_RESULT("Not associated vertices, srcV1 " << srcV1.TShape().operator->() ); RETURN_BAD_RESULT("Not associated vertices, srcV1 " << srcV1.TShape().operator->() );
TopoDS_Vertex tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1 )); TopoDS_Vertex tgtV1 = TopoDS::Vertex( shape2ShapeMap( srcV1, /*isSrc=*/true ));
if ( !SMESH_MesherHelper::IsSubShape( srcV1, srcFace )) if ( !SMESH_MesherHelper::IsSubShape( srcV1, srcFace ))
RETURN_BAD_RESULT("Wrong srcV1 " << srcV1.TShape().operator->()); RETURN_BAD_RESULT("Wrong srcV1 " << srcV1.TShape().operator->());
@ -1087,7 +1087,7 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// Check elements orientation // Check elements orientation
// --------------------------- // ---------------------------
TopoDS_Face face = tgtFace; TopoDS_Face face = TopoDS::Face( theShape );
if ( !theMesh.IsMainShape( tgtFace )) if ( !theMesh.IsMainShape( tgtFace ))
{ {
// find the main shape // find the main shape
@ -1157,7 +1157,7 @@ bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh,
TopoDS_Shape srcShape = _sourceHypo->GetSourceFace().Oriented(TopAbs_FORWARD); TopoDS_Shape srcShape = _sourceHypo->GetSourceFace().Oriented(TopAbs_FORWARD);
TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::TShapeShapeMap shape2ShapeMap;
TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap, tgtFace ); TAssocTool::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !TAssocTool::FindSubShapeAssociation( tgtFace, tgtMesh, srcShape, srcMesh, if ( !TAssocTool::FindSubShapeAssociation( tgtFace, tgtMesh, srcShape, srcMesh,
shape2ShapeMap) || shape2ShapeMap) ||
!shape2ShapeMap.IsBound( tgtFace )) !shape2ShapeMap.IsBound( tgtFace ))

8
src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
View File

@ -176,8 +176,8 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// ---------------------------------- // ----------------------------------
TAssocTool::TShapeShapeMap shape2ShapeMap; TAssocTool::TShapeShapeMap shape2ShapeMap;
if ( !TAssocTool::FindSubShapeAssociation( outerShell, &aMesh, if ( !TAssocTool::FindSubShapeAssociation( innerShell, &aMesh,
innerShell, &aMesh, outerShell, &aMesh,
shape2ShapeMap) ) shape2ShapeMap) )
return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" ); return error(COMPERR_BAD_SHAPE,"Topology of inner and outer shells seems different" );
@ -193,11 +193,11 @@ bool StdMeshers_RadialPrism_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& a
// Corresponding sub-shapes // Corresponding sub-shapes
TopoDS_Face outFace = TopoDS::Face( exp.Current() ); TopoDS_Face outFace = TopoDS::Face( exp.Current() );
TopoDS_Face inFace; TopoDS_Face inFace;
if ( !shape2ShapeMap.IsBound( outFace )) { if ( !shape2ShapeMap.IsBound( outFace, /*isOut=*/true )) {
return error(SMESH_Comment("Corresponding inner face not found for face #" ) return error(SMESH_Comment("Corresponding inner face not found for face #" )
<< meshDS->ShapeToIndex( outFace )); << meshDS->ShapeToIndex( outFace ));
} else { } else {
inFace = TopoDS::Face( shape2ShapeMap( outFace )); inFace = TopoDS::Face( shape2ShapeMap( outFace, /*isOut=*/true ));
} }
// Find matching nodes of in and out faces // Find matching nodes of in and out faces