ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-15 13:51:21 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL 19369 & IPAL 19078 Incorrect behaviour on delete objects

Browse Source
This commit is contained in:
dmv 2008-05-19 06:52:47 +00:00
parent 61c3b696a2
commit 17fb3c8639
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -414,14 +414,21 @@ void GEOMToolsGUI::OnEditDelete()
continue; continue;
//If the object has been used to create another one,then it can't be deleted //If the object has been used to create another one,then it can't be deleted
_PTR(ChildIterator) it (aStudy->NewChildIterator(aGeom)); // _PTR(ChildIterator) it (aStudy->NewChildIterator(aGeom));
for ( it->InitEx( true ); it->More(); it->Next() ) { // for ( it->InitEx( true ); it->More(); it->Next() ) {
for (_PTR(ChildIterator) it (aStudy->NewChildIterator(aGeom)); it->More(); it->Next()) {
_PTR(SObject) chobj (it->Value()); _PTR(SObject) chobj (it->Value());
if(CheckSubObjectInUse(chobj, obj, aStudy)) return; if(CheckSubObjectInUse(chobj, obj, aStudy)) return;
//check subobjects //check subobjects
for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) { for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) {
_PTR(SObject) child (it->Value()); _PTR(SObject) child (it->Value());
if(CheckSubObjectInUse( chobj, child, aStudy)) return; if(CheckSubObjectInUse( chobj, child, aStudy)) return;
//check subchildobject
for (_PTR(ChildIterator) it (aStudy->NewChildIterator(child)); it->More(); it->Next()) {
_PTR(SObject) subchildobj (it->Value());
if(CheckSubObjectInUse( chobj, subchildobj, aStudy)) return;
}
} }
} }
@ -793,14 +800,16 @@ bool GEOMToolsGUI::CheckSubObjectInUse(_PTR(SObject) checkobj,
{ {
CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(checkobj); CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(checkobj);
GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj ); GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
if( CORBA::is_nil(geomObj) )
CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject(remobj);
GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
if( CORBA::is_nil(geomObj) || CORBA::is_nil(geomObj_rem))
return false; return false;
GEOM::ListOfGO_var list = geomObj->GetDependency(); GEOM::ListOfGO_var list = geomObj->GetDependency();
if( list->length() > 1 ) if( list->length() > 0 )
for(int i = 0; i < list->length(); i++ ){ for(int i = 0; i < list->length(); i++ ){
CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject(remobj);
GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
if( list[i]->_is_equivalent( geomObj_rem ) ){ if( list[i]->_is_equivalent( geomObj_rem ) ){
SalomeApp_Application* app = SalomeApp_Application* app =
dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );