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

0020452: EDF 1056 SMESH : 2D Projection Issue

Browse Source 
1) in FindSubShapeAssociation(): use shape partnership (TopoDS_Shape::IsPartner())
   for association
2) in FindFaceAssociation(): try two algoritms to find a correct outer wire
This commit is contained in:
eap 2009-08-20 07:40:08 +00:00
parent b32884a5f8
commit c9d6ead3f5
1 changed files with 105 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -67,13 +67,15 @@ using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \ #define CONT_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); continue; }
// if ( v.IsNull() ) cout << msg << " NULL SHAPE" << endl; \ #define SHOW_VERTEX(v,msg) \
// else if (v.ShapeType() == TopAbs_VERTEX) {\ // { \
// gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( v ));\ // if ( (v).IsNull() ) cout << msg << " NULL SHAPE" << endl; \
// cout << msg << (v).TShape().operator->()<<" ( " <<p.X()<<", "<<p.Y()<<", "<<p.Z()<<" )"<<endl;}\ // else if ((v).ShapeType() == TopAbs_VERTEX) {\
// gp_Pnt p = BRep_Tool::Pnt( TopoDS::Vertex( (v) ));\
// cout<<msg<<" "<<(v).TShape().operator->()<<" ( "<<p.X()<<", "<<p.Y()<<", "<<p.Z()<<" )"<<endl;}\
// else {\ // else {\
// cout << msg << " "; TopAbs::Print(v.ShapeType(),cout) <<" "<<(v).TShape().operator->()<<endl;}\ // cout << msg << " "; TopAbs::Print((v).ShapeType(),cout) <<" "<<(v).TShape().operator->()<<endl;}\
// } // }
#define SHOW_LIST(msg,l) \ #define SHOW_LIST(msg,l) \
// { \ // { \
@ -369,8 +371,28 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
SMESH_Mesh* theMesh2, SMESH_Mesh* theMesh2,
TShapeShapeMap & theMap) TShapeShapeMap & theMap)
{ {
// Structure of this long function is following
// 1) Group->group projection: theShape1 is a group member,
// theShape2 is a group. We find a group theShape1 is in and recall self.
// 2) Accosiate same shapes with different location (partners).
// 3) If vertex association is given, perform accosiation according to shape type:
// switch ( ShapeType ) {
// case TopAbs_EDGE:
// case ...:
// }
// else try to accosiate in different ways:
// a) accosiate shapes by propagation and other simple cases
// switch ( ShapeType ) {
// case TopAbs_EDGE:
// case ...:
// }
// b) find association of a couple of vertices and recall self.
//
// =================================================================================
// Is it the case of associating a group member -> another group? (PAL16202, 16203)
// =================================================================================
if ( theShape1.ShapeType() != theShape2.ShapeType() ) { if ( theShape1.ShapeType() != theShape2.ShapeType() ) {
// is it the case of a group member -> another group? (PAL16202, 16203)
TopoDS_Shape group1, group2; TopoDS_Shape group1, group2;
if ( theShape1.ShapeType() == TopAbs_COMPOUND ) { if ( theShape1.ShapeType() == TopAbs_COMPOUND ) {
group1 = theShape1; group1 = theShape1;
@ -387,6 +409,31 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
bool bidirect = ( !theShape1.IsSame( theShape2 )); bool bidirect = ( !theShape1.IsSame( theShape2 ));
// ============
// Is partner?
// ============
bool partner = theShape1.IsPartner( theShape2 );
TopTools_DataMapIteratorOfDataMapOfShapeShape vvIt( theMap );
for ( ; partner && vvIt.More(); vvIt.Next() )
partner = vvIt.Key().IsPartner( vvIt.Value() );
if ( partner ) // Same shape with different location
{
// recursively associate all subshapes of theShape1 and theShape2
typedef list< pair< TopoDS_Shape, TopoDS_Shape > > TShapePairsList;
TShapePairsList shapesQueue( 1, make_pair( theShape1, theShape2 ));
TShapePairsList::iterator s1_s2 = shapesQueue.begin();
for ( ; s1_s2 != shapesQueue.end(); ++s1_s2 )
{
InsertAssociation( s1_s2->first, s1_s2->second, theMap, bidirect);
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() ));
}
return true;
}
if ( !theMap.IsEmpty() ) if ( !theMap.IsEmpty() )
{ {
//====================================================================== //======================================================================
@ -884,6 +931,7 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
pair<int,TopoDS_Edge> step_edge = GetPropagationEdge( theMesh1, edge2, edge1 ); pair<int,TopoDS_Edge> step_edge = GetPropagationEdge( theMesh1, edge2, edge1 );
if ( !step_edge.second.IsNull() ) { // propagation found if ( !step_edge.second.IsNull() ) { // propagation found
propag_edges.insert( step_edge ); propag_edges.insert( step_edge );
if ( step_edge.first == 1 ) break; // most close found
} }
} }
if ( !propag_edges.empty() ) // propagation found if ( !propag_edges.empty() ) // propagation found
@ -1105,66 +1153,69 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
*/ */
//================================================================================ //================================================================================
int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1, int StdMeshers_ProjectionUtils::FindFaceAssociation(const TopoDS_Face& face1,
TopoDS_Vertex VV1[2], TopoDS_Vertex VV1[2],
const TopoDS_Face& face2, const TopoDS_Face& face2,
TopoDS_Vertex VV2[2], TopoDS_Vertex VV2[2],
list< TopoDS_Edge > & edges1, list< TopoDS_Edge > & edges1,
list< TopoDS_Edge > & edges2) list< TopoDS_Edge > & edges2)
{ {
edges1.clear();
edges2.clear();
list< int > nbVInW1, nbVInW2; list< int > nbVInW1, nbVInW2;
if ( SMESH_Block::GetOrderedEdges( face1, VV1[0], edges1, nbVInW1) != for ( int outer_wire_algo = 0; outer_wire_algo < 2; ++outer_wire_algo )
SMESH_Block::GetOrderedEdges( face2, VV2[0], edges2, nbVInW2) ) {
RETURN_BAD_RESULT("Different number of wires in faces "); edges1.clear();
edges2.clear();
if ( nbVInW1.front() != nbVInW2.front() ) if ( SMESH_Block::GetOrderedEdges( face1, VV1[0], edges1, nbVInW1, outer_wire_algo) !=
RETURN_BAD_RESULT("Different number of edges in faces: " << SMESH_Block::GetOrderedEdges( face2, VV2[0], edges2, nbVInW2, outer_wire_algo) )
CONT_BAD_RESULT("Different number of wires in faces ");
if ( nbVInW1.front() != nbVInW2.front() )
CONT_BAD_RESULT("Different number of edges in faces: " <<
nbVInW1.front() << " != " << nbVInW2.front()); nbVInW1.front() << " != " << nbVInW2.front());
// Define if we need to reverse one of wires to make edges in lists match each other // Define if we need to reverse one of wires to make edges in lists match each other
bool reverse = false; bool reverse = false;
list< TopoDS_Edge >::iterator eBackIt; list< TopoDS_Edge >::iterator edgeIt;
if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) { if ( !VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) {
reverse = true; reverse = true;
eBackIt = --edges1.end(); edgeIt = --edges1.end();
// check if the second vertex belongs to the first or last edge in the wire // check if the second vertex belongs to the first or last edge in the wire
if ( !VV1[1].IsSame( TopExp::FirstVertex( *eBackIt, true ))) { if ( !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
bool KO = true; // belongs to none bool KO = true; // belongs to none
if ( nbVInW1.size() > 1 ) { // several wires if ( nbVInW1.size() > 1 ) { // several wires
eBackIt = edges1.begin(); edgeIt = edges1.begin();
for ( int i = 1; i < nbVInW1.front(); ++i ) ++eBackIt; for ( int i = 1; i < nbVInW1.front(); ++i ) ++edgeIt;
KO = !VV1[1].IsSame( TopExp::FirstVertex( *eBackIt, true )); KO = !VV1[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
}
if ( KO )
CONT_BAD_RESULT("GetOrderedEdges() failed");
} }
if ( KO )
RETURN_BAD_RESULT("GetOrderedEdges() failed");
} }
} edgeIt = --edges2.end();
eBackIt = --edges2.end(); if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))) {
if ( !VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))) { reverse = !reverse;
reverse = !reverse; // check if the second vertex belongs to the first or last edge in the wire
// check if the second vertex belongs to the first or last edge in the wire if ( !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ))) {
if ( !VV2[1].IsSame( TopExp::FirstVertex( *eBackIt, true ))) { bool KO = true; // belongs to none
bool KO = true; // belongs to none if ( nbVInW2.size() > 1 ) { // several wires
if ( nbVInW2.size() > 1 ) { // several wires edgeIt = edges2.begin();
eBackIt = edges2.begin(); for ( int i = 1; i < nbVInW2.front(); ++i ) ++edgeIt;
for ( int i = 1; i < nbVInW2.front(); ++i ) ++eBackIt; KO = !VV2[1].IsSame( TopExp::FirstVertex( *edgeIt, true ));
KO = !VV2[1].IsSame( TopExp::FirstVertex( *eBackIt, true )); }
if ( KO )
CONT_BAD_RESULT("GetOrderedEdges() failed");
} }
if ( KO )
RETURN_BAD_RESULT("GetOrderedEdges() failed");
} }
} if ( reverse )
if ( reverse ) {
{ Reverse( edges2 , nbVInW2.front());
Reverse( edges2 , nbVInW2.front()); if (( VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) !=
if (( VV1[1].IsSame( TopExp::LastVertex( edges1.front(), true ))) != ( VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true ))))
( VV2[1].IsSame( TopExp::LastVertex( edges2.front(), true )))) CONT_BAD_RESULT("GetOrderedEdges() failed");
RETURN_BAD_RESULT("GetOrderedEdges() failed"); }
} }
return nbVInW2.front(); return nbVInW2.front();
} }