ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug IPAL20039 Crash when Edit Group in mesh with invalid reference (deleted object).

Browse Source
This commit is contained in:
dmv 2008-07-02 14:00:03 +00:00
parent 3d80192ae0
commit 271ebfda77
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -206,10 +206,12 @@ static bool inUse( _PTR(Study) study, const QString& component, const QMap<QStri
// collect all GEOM objects being deleted // collect all GEOM objects being deleted
QMap<QString, GEOM::GEOM_Object_var> gobjects; QMap<QString, GEOM::GEOM_Object_var> gobjects;
QMap<QString, QString>::ConstIterator oit; QMap<QString, QString>::ConstIterator oit;
list<_PTR(SObject)> aSelectedSO;
for ( oit = objects.begin(); oit != objects.end(); ++oit ) { for ( oit = objects.begin(); oit != objects.end(); ++oit ) {
_PTR(SObject) so = study->FindObjectID( oit.key().latin1() ); _PTR(SObject) so = study->FindObjectID( oit.key().latin1() );
if ( !so ) if ( !so )
continue; continue;
aSelectedSO.push_back(so);
CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so ); CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem ); GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
if( CORBA::is_nil( geomObj_rem ) ) if( CORBA::is_nil( geomObj_rem ) )
@ -217,6 +219,22 @@ static bool inUse( _PTR(Study) study, const QString& component, const QMap<QStri
gobjects.insert( oit.key(), geomObj_rem ); gobjects.insert( oit.key(), geomObj_rem );
} }
// Search References with other Modules
list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
for ( ; itSO != aSelectedSO.end(); ++itSO ) {
std::vector<_PTR(SObject)> aReferences = study->FindDependances( *itSO );
int aRefLength = aReferences.size();
if (aRefLength) {
for (int i = 0; i < aRefLength; i++) {
_PTR(SObject) firstSO( aReferences[i] );
_PTR(SComponent) aComponent = firstSO->GetFatherComponent();
QString type = aComponent->ComponentDataType();
if ( type == "SMESH" )
return true;
}
}
}
// browse through all GEOM data tree // browse through all GEOM data tree
_PTR(ChildIterator) it ( study->NewChildIterator( comp ) ); _PTR(ChildIterator) it ( study->NewChildIterator( comp ) );
for ( it->InitEx( true ); it->More(); it->Next() ) { for ( it->InitEx( true ); it->More(); it->Next() ) {