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

Correct deletion of folders with sub-objects in the Object Browser.

Browse Source
This commit is contained in:
akl 2013-07-10 12:14:17 +00:00
parent 3c094b0dc5
commit 7b119929a6
1 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -257,6 +257,37 @@ static bool inUse( _PTR(Study) study, const QString& component, const QMap<QStri
return false; return false;
} }
//=======================================================================
// function : getGeomChildrenAndFolders
// purpose : Get direct (1-level) GEOM objects under each folder, sub-folder, etc. and these folders itself
//=======================================================================
static void getGeomChildrenAndFolders( _PTR(SObject) theSO,
QMap<QString,QString>& geomObjList,
QMap<QString,QString>& folderList ) {
if ( !theSO ) return;
_PTR(Study) aStudy = theSO->GetStudy();
if ( !aStudy ) return;
_PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
bool isFolder = false;
_PTR(GenericAttribute) anAttr;
if ( theSO->FindAttribute(anAttr, "AttributeLocalID") ) {
_PTR(AttributeLocalID) aLocalID( anAttr );
isFolder = aLocalID->Value() == 999;
}
QString anEntry = theSO->GetID().c_str();
QString aName = theSO->GetName().c_str();
if ( isFolder ) {
folderList.insert( anEntry, aName );
_PTR(UseCaseIterator) ucit ( aUseCaseBuilder->GetUseCaseIterator( theSO ) );
for ( ucit->Init( false ); ucit->More(); ucit->Next() ) {
getGeomChildrenAndFolders( ucit->Value(), geomObjList, folderList );
}
} else {
geomObjList.insert( anEntry, aName );
}
}
//======================================================================= //=======================================================================
// function : GEOMToolsGUI() // function : GEOMToolsGUI()
// purpose : Constructor // purpose : Constructor
@ -441,6 +472,7 @@ void GEOMToolsGUI::OnEditDelete()
return; return;
_PTR(Study) aStudy = appStudy->studyDS(); _PTR(Study) aStudy = appStudy->studyDS();
_PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
// check if study is locked // check if study is locked
if ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() )->IsLocked() ) { if ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() )->IsLocked() ) {
@ -457,6 +489,7 @@ void GEOMToolsGUI::OnEditDelete()
// check each selected object: if belongs to GEOM, if not reference... // check each selected object: if belongs to GEOM, if not reference...
QMap<QString,QString> toBeDeleted; QMap<QString,QString> toBeDeleted;
QMap<QString,QString> allDeleted; QMap<QString,QString> allDeleted;
QMap<QString,QString> toBeDelFolders;
bool isComponentSelected = false; bool isComponentSelected = false;
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
@ -494,11 +527,12 @@ void GEOMToolsGUI::OnEditDelete()
isComponentSelected = true; isComponentSelected = true;
continue; continue;
} }
toBeDeleted.insert( entry, aName ); // all sub-objects of folder have to be deleted
getGeomChildrenAndFolders( obj, toBeDeleted, toBeDelFolders );
allDeleted.insert( entry, aName ); // skip GEOM component allDeleted.insert( entry, aName ); // skip GEOM component
// browse through all children recursively // browse through all children recursively
_PTR(ChildIterator) it ( aStudy->NewChildIterator( obj ) ); _PTR(UseCaseIterator) it ( aUseCaseBuilder->GetUseCaseIterator( obj ) );
for ( it->InitEx( true ); it->More(); it->Next() ) { for ( it->Init( true ); it->More(); it->Next() ) {
_PTR(SObject) child( it->Value() ); _PTR(SObject) child( it->Value() );
if ( child && child->ReferencedObject( refobj ) ) if ( child && child->ReferencedObject( refobj ) )
continue; // skip references continue; // skip references
@ -545,6 +579,8 @@ void GEOMToolsGUI::OnEditDelete()
removeObjectWithChildren( child, aStudy, views, disp ); removeObjectWithChildren( child, aStudy, views, disp );
// remove object from study // remove object from study
aStudyBuilder->RemoveObjectWithChildren( child ); aStudyBuilder->RemoveObjectWithChildren( child );
// remove object from use case tree
aUseCaseBuilder->Remove( child );
} }
} }
else { else {
@ -565,6 +601,18 @@ void GEOMToolsGUI::OnEditDelete()
removeObjectWithChildren( obj, aStudy, views, disp ); removeObjectWithChildren( obj, aStudy, views, disp );
// remove objects from study // remove objects from study
aStudyBuilder->RemoveObjectWithChildren( obj ); aStudyBuilder->RemoveObjectWithChildren( obj );
// remove object from use case tree
aUseCaseBuilder->Remove( obj );
}
// ... and then delete all folders
for ( it = toBeDelFolders.begin(); it != toBeDelFolders.end(); ++it ) {
_PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
// remove object from GEOM engine
removeObjectWithChildren( obj, aStudy, views, disp );
// remove objects from study
aStudyBuilder->RemoveObjectWithChildren( obj );
// remove object from use case tree
aUseCaseBuilder->Remove( obj );
} }
} }
@ -936,6 +984,7 @@ void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
{ {
// iterate through all children of obj // iterate through all children of obj
for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) { for (_PTR(ChildIterator) it (aStudy->NewChildIterator(obj)); it->More(); it->Next()) {
// for (_PTR(UseCaseIterator) it (aStudy->GetUseCaseBuilder()->GetUseCaseIterator(obj)); it->More(); it->Next()) {
_PTR(SObject) child (it->Value()); _PTR(SObject) child (it->Value());
removeObjectWithChildren(child, aStudy, views, disp); removeObjectWithChildren(child, aStudy, views, disp);
} }