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

Fix for the bug IPAL22091: Crash by calling context menu on the SMESH presentation

Browse Source
This commit is contained in:
ana 2011-02-10 08:48:33 +00:00
parent 36ec1b3d2f
commit 95fb8be9ca
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/SMESHGUI/SMESHGUI.cxx
View File

@ -1421,13 +1421,6 @@
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() ); SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
ViewManagerList aViewMenegers = anApp->viewManagers();
ViewManagerList::const_iterator it = aViewMenegers.begin();
for( ; it != aViewMenegers.end(); it++) {
SUIT_ViewManager* vm = *it;
int nbSf = vm ? vm->getViewsCount() : 0;
SALOME_ListIteratorOfListIO It(selected); SALOME_ListIteratorOfListIO It(selected);
aStudyBuilder->NewCommand(); // There is a transaction aStudyBuilder->NewCommand(); // There is a transaction
@ -1468,16 +1461,23 @@
std::string anEntry = SO->GetID(); std::string anEntry = SO->GetID();
/** Erase graphical object **/ /** Erase graphical object **/
if(SO->FindAttribute(anAttr, "AttributeIOR") && vm ){ if(SO->FindAttribute(anAttr, "AttributeIOR")){
QVector<SUIT_ViewWindow*> aViews = vm->getViews(); ViewManagerList aViewMenegers = anApp->viewManagers();
for(int i = 0; i < nbSf; i++){ ViewManagerList::const_iterator it = aViewMenegers.begin();
SUIT_ViewWindow *sf = aViews[i]; for( ; it != aViewMenegers.end(); it++) {
if(SMESH_Actor* anActor = SMESH::FindActorByEntry(sf,anEntry.c_str())){ SUIT_ViewManager* vm = *it;
SMESH::RemoveActor(sf,anActor); int nbSf = vm ? vm->getViewsCount() : 0;
if(vm) {
QVector<SUIT_ViewWindow*> aViews = vm->getViews();
for(int i = 0; i < nbSf; i++){
SUIT_ViewWindow *sf = aViews[i];
if(SMESH_Actor* anActor = SMESH::FindActorByEntry(sf,anEntry.c_str())){
SMESH::RemoveActor(sf,anActor);
}
} }
} }
} }
}
/** Remove an object from data structures **/ /** Remove an object from data structures **/
SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( SO )); SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH::SObjectToObject( SO ));
SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( SO )); SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( SMESH::SObjectToObject( SO ));
@ -1512,7 +1512,6 @@
} /* listSO back loop */ } /* listSO back loop */
} /* IObject->hasEntry() */ } /* IObject->hasEntry() */
} /* more/next */ } /* more/next */
} /* aViewMenegers list loop */
aStudyBuilder->CommitCommand(); aStudyBuilder->CommitCommand();