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

0021556: EDF 2222 SMESH: 3D mesh after projection impossible

Browse Source 
Fix association of FACEs by propagation in case if many propagation
ways are available.
This commit is contained in:
eap 2013-04-03 12:37:35 +00:00
parent 5601792b85
commit 1ade2bddc1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -1000,7 +1000,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
// get outer edge of theShape1 // get outer edge of theShape1
TopoDS_Shape wire = OuterShape( face1, TopAbs_WIRE ); TopoDS_Shape wire = OuterShape( face1, TopAbs_WIRE );
//edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE )); //edge1 = TopoDS::Edge( OuterShape( face1, TopAbs_EDGE ));
map<int,TopoDS_Edge> propag_edges; // use map to find the closest propagation edge // use map to find the closest propagation edge
map<int, pair< TopoDS_Edge, TopoDS_Edge > > propag_edges;
for ( TopoDS_Iterator edgeIt( wire ); edgeIt.More(); edgeIt.Next() ) for ( TopoDS_Iterator edgeIt( wire ); edgeIt.More(); edgeIt.Next() )
{ {
edge1 = TopoDS::Edge( edgeIt.Value() ); edge1 = TopoDS::Edge( edgeIt.Value() );
@ -1009,7 +1010,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
edge2 = TopoDS::Edge( exp.Current() ); edge2 = TopoDS::Edge( exp.Current() );
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( make_pair( step_edge.first,
( make_pair( edge1, step_edge.second ))));
if ( step_edge.first == 1 ) break; // most close found if ( step_edge.first == 1 ) break; // most close found
} }
} }
@ -1017,7 +1019,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the
} }
if ( !propag_edges.empty() ) // propagation found if ( !propag_edges.empty() ) // propagation found
{ {
edge2 = propag_edges.begin()->second; edge1 = propag_edges.begin()->second.first;
edge2 = propag_edges.begin()->second.second;
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( edge2, VV2[0], VV2[1], true ); TopExp::Vertices( edge2, VV2[0], VV2[1], true );