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

0022360: EDF SMESH: Body Fitting algorithm: incorporate edges

Browse Source
This commit is contained in:
eap 2014-02-14 19:31:40 +04:00
parent 5b8d7b95e3
commit 8585067de8
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/StdMeshers/StdMeshers_Cartesian_3D.cxx
View File

@ -1907,7 +1907,7 @@ namespace
if ( !findChain( n2, nFirst, quad, chainNodes )) if ( !findChain( n2, nFirst, quad, chainNodes ))
{ {
if ( !closePolygon( polygon, chainNodes )) if ( !closePolygon( polygon, chainNodes ))
;//chainNodes.push_back( nFirst ); chainNodes.push_back( nFirst );
} }
for ( size_t i = 1; i < chainNodes.size(); ++i ) for ( size_t i = 1; i < chainNodes.size(); ++i )
{ {
@ -1954,7 +1954,7 @@ namespace
freeLinks.push_back( & polygon._links[ iL ]); freeLinks.push_back( & polygon._links[ iL ]);
} }
int nbFreeLinks = freeLinks.size(); int nbFreeLinks = freeLinks.size();
if ( nbFreeLinks < 3 ) return; if ( nbFreeLinks > 0 && nbFreeLinks < 3 ) return;
set<TGeomID> usedFaceIDs; set<TGeomID> usedFaceIDs;
@ -1968,7 +1968,8 @@ namespace
_OrientedLink* curLink = 0; _OrientedLink* curLink = 0;
_Node* curNode; _Node* curNode;
if ( !hasEdgeIntersections ) if (( !hasEdgeIntersections ) ||
( nbFreeLinks < 4 && _vertexNodes.empty() ))
{ {
// get a remaining link to start from // get a remaining link to start from
for ( size_t iL = 0; iL < freeLinks.size() && !curLink; ++iL ) for ( size_t iL = 0; iL < freeLinks.size() && !curLink; ++iL )
@ -2102,12 +2103,15 @@ namespace
// TODO: to reorder _vertexNodes within polygon, if there are several ones // TODO: to reorder _vertexNodes within polygon, if there are several ones
} }
} }
polyLink._nodes[0] = polygon._links[0].LastNode(); // if ( polygon._links.size() > 1 )
polyLink._nodes[1] = curNode; {
polygon._polyLinks.push_back( polyLink ); polyLink._nodes[0] = polygon._links[0].LastNode();
polygon._links.push_back( _OrientedLink( &polygon._polyLinks.back() )); polyLink._nodes[1] = curNode;
freeLinks.push_back( &polygon._links.back() ); polygon._polyLinks.push_back( polyLink );
++nbFreeLinks; polygon._links.push_back( _OrientedLink( &polygon._polyLinks.back() ));
freeLinks.push_back( &polygon._links.back() );
++nbFreeLinks;
}
} }
} // if there are intersections with EDGEs } // if there are intersections with EDGEs