ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 01:10:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

#18835 Automatically create groups on Geometry in SMESH when the SHAPER result is modified

Browse Source
This commit is contained in:
eap 2020-03-11 19:57:24 +03:00
parent 61652a5871
commit 4a3d652a69
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -2422,7 +2422,8 @@ void SMESH_Mesh_i::CheckGeomModif( bool isBreakLink )
if ( ii2i != ii2iMap.end() ) if ( ii2i != ii2iMap.end() )
oldID = ii2i->second; oldID = ii2i->second;
TopoDS_Shape newShape = newGroupShape( *data, isBreakLink ? IS_BREAK_LINK : MAIN_TRANSFORMED ); int how = ( isBreakLink || !sameTopology ) ? IS_BREAK_LINK : MAIN_TRANSFORMED;
TopoDS_Shape newShape = newGroupShape( *data, how );
if ( !newShape.IsNull() ) if ( !newShape.IsNull() )
{ {
if ( meshDS->ShapeToIndex( newShape ) > 0 ) // a group reduced to one sub-shape if ( meshDS->ShapeToIndex( newShape ) > 0 ) // a group reduced to one sub-shape
@ -2441,12 +2442,12 @@ void SMESH_Mesh_i::CheckGeomModif( bool isBreakLink )
// re-assign hypotheses // re-assign hypotheses
for ( size_t i = 0; i < ids2Hyps.size(); ++i ) for ( size_t i = 0; i < ids2Hyps.size(); ++i )
{ {
if ( !sameTopology && ids2Hyps[i].first != 1 )
continue; // assign only global hypos
int sID = ids2Hyps[i].first; int sID = ids2Hyps[i].first;
std::map< int, int >::iterator o2n = old2newIDs.find( sID ); std::map< int, int >::iterator o2n = old2newIDs.find( sID );
if ( o2n != old2newIDs.end() ) if ( o2n != old2newIDs.end() )
sID = o2n->second; sID = o2n->second;
else if ( sID != 1 )
continue;
const TopoDS_Shape& s = meshDS->IndexToShape( sID ); const TopoDS_Shape& s = meshDS->IndexToShape( sID );
const THypList& hyps = ids2Hyps[i].second; const THypList& hyps = ids2Hyps[i].second;
THypList::const_iterator h = hyps.begin(); THypList::const_iterator h = hyps.begin();
@ -2454,12 +2455,6 @@ void SMESH_Mesh_i::CheckGeomModif( bool isBreakLink )
_impl->AddHypothesis( s, (*h)->GetID() ); _impl->AddHypothesis( s, (*h)->GetID() );
} }
if ( !sameTopology )
{
// remove invalid study sub-objects
CheckGeomGroupModif();
}
else
{ {
// restore groups on geometry // restore groups on geometry
for ( size_t i = 0; i < groupsData.size(); ++i ) for ( size_t i = 0; i < groupsData.size(); ++i )
@ -2506,6 +2501,12 @@ void SMESH_Mesh_i::CheckGeomModif( bool isBreakLink )
i_sm->second = _impl->GetSubMesh( meshDS->IndexToShape( i_sm->first )); i_sm->second = _impl->GetSubMesh( meshDS->IndexToShape( i_sm->first ));
} }
if ( !sameTopology )
{
// remove invalid study sub-objects
CheckGeomGroupModif();
}
_gen_i->UpdateIcons( me ); _gen_i->UpdateIcons( me );
if ( !isBreakLink && isShaper ) if ( !isBreakLink && isShaper )