ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-07 13:44:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0020422: EDF 1070 GEOM: Partition anomaly - REGRESSION from 4.1.x.

Browse Source
This commit is contained in:
jfa 2010-04-21 12:46:40 +00:00
parent 248783c7c7
commit 7bf5240139
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
View File

@ -81,7 +81,16 @@ namespace {
TopTools_MapOfShape edgeCounter; TopTools_MapOfShape edgeCounter;
edgeCounter.Add( edge ); edgeCounter.Add( edge );
TopoDS_Vertex v; TopoDS_Vertex v;
v = forward ? TopExp::LastVertex( edge,1 ) : TopExp::FirstVertex( edge,1 ); if (edge.Orientation() <= TopAbs_REVERSED) // FORWARD || REVERSED
v = forward ? TopExp::LastVertex(edge,true) : TopExp::FirstVertex(edge,true);
else {
TopoDS_Iterator vIt (edge);
if (forward)
for (; vIt.More(); vIt.Next())
v = TopoDS::Vertex(vIt.Value()); // last
else if (vIt.More())
v = TopoDS::Vertex(vIt.Value()); // first
}
TopTools_ListIteratorOfListOfShape ancestIt = aMesh.GetAncestors( v ); TopTools_ListIteratorOfListOfShape ancestIt = aMesh.GetAncestors( v );
for ( ; ancestIt.More(); ancestIt.Next() ) for ( ; ancestIt.More(); ancestIt.Next() )
{ {
@ -92,11 +101,19 @@ namespace {
if ( edgeCounter.Extent() < 3 && !eNext.IsNull() ) { if ( edgeCounter.Extent() < 3 && !eNext.IsNull() ) {
if ( SMESH_Algo::IsContinuous( edge, eNext )) { if ( SMESH_Algo::IsContinuous( edge, eNext )) {
// care of orientation // care of orientation
bool reverse; TopoDS_Vertex vn;
if ( forward ) if (eNext.Orientation() <= TopAbs_REVERSED) // FORWARD || REVERSED
reverse = ( !v.IsSame( TopExp::FirstVertex( eNext, true ))); vn = forward ? TopExp::FirstVertex(eNext,true) : TopExp::LastVertex(eNext,true);
else else {
reverse = ( !v.IsSame( TopExp::LastVertex( eNext, true ))); TopoDS_Iterator vIt (eNext);
if (forward)
vn = TopoDS::Vertex(vIt.Value()); // first
else if (vIt.More())
for (; vIt.More(); vIt.Next())
vn = TopoDS::Vertex(vIt.Value()); // last
}
bool reverse = (!v.IsSame(vn));
if ( reverse ) if ( reverse )
eNext.Reverse(); eNext.Reverse();
return eNext; return eNext;