-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//=====================================================================================
// function : inUse
-// purpose : check if the object(s) passed as the the second arguments are used
+// purpose : check if the object(s) passed as the second arguments are used
// by the other objects in the study
//=====================================================================================
-static bool inUse( _PTR(Study) study, const QString& component, const QMap<QString,QString>& objects )
+static bool inUse( const QString& component, const QMap<QString,QString>& objects )
{
+ _PTR(Study) study = SalomeApp_Application::getStudy();
_PTR(SObject) comp = study->FindObjectID( component.toLatin1().data() );
if ( !comp )
return false;
QMap<QString, GEOM::GEOM_BaseObject_var> gobjects;
QMap<QString, QString>::ConstIterator oit;
std::list<_PTR(SObject)> aSelectedSO;
- for ( oit = objects.begin(); oit != objects.end(); ++oit ) {
- _PTR(SObject) so = study->FindObjectID( oit.key().toLatin1().data() );
- if ( !so )
+ for ( oit = objects.begin(); oit != objects.end(); ++oit )
+ {
+ _PTR(SObject) so = study->FindObjectID( oit.key().toUtf8().data() );
+ if ( !GeometryGUI::IsInGeomComponent( so ))
continue;
aSelectedSO.push_back(so);
- CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
+ CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
GEOM::GEOM_BaseObject_var geomObj_rem = GEOM::GEOM_BaseObject::_narrow( corbaObj_rem );
- if( CORBA::is_nil( geomObj_rem ) )
- continue;
- gobjects.insert( oit.key(), geomObj_rem );
+ if ( ! CORBA::is_nil( geomObj_rem ))
+ gobjects.insert( oit.key(), geomObj_rem );
}
// Search References with other Modules
std::list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
- for ( ; itSO != aSelectedSO.end(); ++itSO ) {
+ 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().c_str();
- if ( type == "SMESH" )
- return true;
- }
+ for ( int i = 0; i < aRefLength; i++ )
+ {
+ _PTR(SObject) firstSO( aReferences[i] );
+ _PTR(SComponent) aComponent = firstSO->GetFatherComponent();
+ QString type = aComponent->ComponentDataType().c_str();
+ if ( type == "SMESH" )
+ return true;
}
}
- // browse through all GEOM data tree
+ // browse through all GEOM data tree to find an object with is not deleted and depends
+ // on a deleted object
_PTR(ChildIterator) it ( study->NewChildIterator( comp ) );
- for ( it->InitEx( true ); it->More(); it->Next() ) {
- _PTR(SObject) child( it->Value() );
- CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject( child );
+ for ( it->InitEx( true ); it->More(); it->Next() )
+ {
+ _PTR(SObject) child = it->Value();
+ QString childID = child->GetID().c_str();
+ bool deleted = objects.contains( childID );
+ if ( deleted )
+ continue; // deleted object
+
+ CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject( child );
GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
- if( CORBA::is_nil( geomObj ) )
+ if ( CORBA::is_nil( geomObj ) )
continue;
- GEOM::ListOfGBO_var list = geomObj->GetDependency();
- if( list->length() == 0 )
- continue;
+ GEOM::ListOfGBO_var dep = geomObj->GetDependency(); // child depends on dep
+ for( CORBA::ULong i = 0; i < dep->length(); i++ )
+ {
+ CORBA::String_var id = dep[i]->GetStudyEntry();
+ bool depends = objects.contains( id.in() ); // depends on deleted
- for( int i = 0; i < list->length(); i++ ) {
- bool depends = false;
- bool deleted = false;
QMap<QString, GEOM::GEOM_BaseObject_var>::Iterator git;
- for ( git = gobjects.begin(); git != gobjects.end() && ( !depends || !deleted ); ++git ) {
- depends = depends || list[i]->_is_equivalent( *git );
- deleted = deleted || git.key() == child->GetID().c_str() ;//geomObj->_is_equivalent( *git );
+ for ( git = gobjects.begin(); git != gobjects.end() && ( !depends || !deleted ); ++git )
+ {
+ depends = depends || dep[i]->_is_equivalent( *git );
+ deleted = deleted || git.key() == childID ;//geomObj->_is_equivalent( *git )
}
if ( depends && !deleted )
return true;
// 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,
+static void getGeomChildrenAndFolders( _PTR(SObject) theSO,
+ QMap<QString,QString>& geomObjList,
QMap<QString,QString>& folderList ) {
if ( !theSO ) return;
- _PTR(Study) aStudy = theSO->GetStudy();
+ _PTR(Study) aStudy = SalomeApp_Application::getStudy();
if ( !aStudy ) return;
_PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
// purpose : Constructor
//=======================================================================
GEOMToolsGUI::GEOMToolsGUI( GeometryGUI* parent )
-: GEOMGUI( parent )
+ : GEOMGUI( parent )
{
}
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/)
{
getGeometryGUI()->EmitSignalDeactivateDialog();
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent, const QVariant& theParam )
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/, const QVariant& theParam )
{
getGeometryGUI()->EmitSignalDeactivateDialog();
return;
LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
- SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
- if ( !aSelMgr || !appStudy )
+ if ( !aSelMgr )
return;
// get selection
if ( selected.IsEmpty() )
return;
- _PTR(Study) aStudy = appStudy->studyDS();
+ _PTR(Study) aStudy = SalomeApp_Application::getStudy();
_PTR(UseCaseBuilder) aUseCaseBuilder = aStudy->GetUseCaseBuilder();
// check if study is locked
continue; // invalid object
// ...
QString entry = anIObject->getEntry();
- _PTR(SObject) obj = aStudy->FindObjectID( entry.toLatin1().data() );
+ _PTR(SObject) obj = aStudy->FindObjectID( entry.toUtf8().data() );
// check parent component
QString parentComp = getParentComponent( obj );
if ( parentComp != geomComp ) {
if ( !dlg.exec() )
return; // operation is cancelled by user
+ SUIT_OverrideCursor wc;
+
// get currently opened views
QList<SALOME_View*> views;
SALOME_View* view;
}
_PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder());
- GEOM_Displayer* disp = new GEOM_Displayer( appStudy );
+ GEOM_Displayer disp;
+ bool toUpdateColorScale = disp.SetUpdateColorScale( false ); // IPAL54049
if ( isComponentSelected ) {
// GEOM component is selected: delete all objects recursively
- _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toLatin1().data() );
+ _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toUtf8().data() );
if ( !comp )
return;
_PTR(ChildIterator) it ( aStudy->NewChildIterator( comp ) );
for ( it->InitEx( false ); it->More(); it->Next() ) {
_PTR(SObject) child( it->Value() );
// remove object from GEOM engine
- removeObjectWithChildren( child, aStudy, views, disp );
+ removeObjectWithChildren( child, views, &disp );
// remove object from study
aStudyBuilder->RemoveObjectWithChildren( child );
// remove object from use case tree
}
else {
// GEOM component is not selected: check if selected objects are in use
- if ( inUse( aStudy, geomComp, allDeleted ) &&
+ if ( inUse( geomComp, allDeleted ) &&
SUIT_MessageBox::question( app->desktop(),
QObject::tr("WRN_WARNING"),
QObject::tr("DEP_OBJECT"),
// ... and then delete all objects
QMap<QString, QString>::Iterator it;
for ( it = toBeDeleted.begin(); it != toBeDeleted.end(); ++it ) {
- _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
+ _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
// remove object from GEOM engine
- removeObjectWithChildren( obj, aStudy, views, disp );
+ removeObjectWithChildren( obj, views, &disp );
// remove objects from study
aStudyBuilder->RemoveObjectWithChildren( obj );
// remove object from use case tree
}
// ... and then delete all folders
for ( it = toBeDelFolders.begin(); it != toBeDelFolders.end(); ++it ) {
- _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
+ _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
// remove object from GEOM engine
- removeObjectWithChildren( obj, aStudy, views, disp );
+ removeObjectWithChildren( obj, views, &disp );
// remove objects from study
aStudyBuilder->RemoveObjectWithChildren( obj );
// remove object from use case tree
}
}
+ disp.SetUpdateColorScale( toUpdateColorScale ); // IPAL54049
selected.Clear();
aSelMgr->setSelectedObjects( selected );
getGeometryGUI()->updateObjBrowser();
// purpose : used by OnEditDelete() method
//=====================================================================================
void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
- _PTR(Study) aStudy,
QList<SALOME_View*> views,
GEOM_Displayer* disp)
{
+ _PTR(Study) aStudy = SalomeApp_Application::getStudy();
// iterate through all children of obj
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());
- removeObjectWithChildren(child, aStudy, views, disp);
+ removeObjectWithChildren(child, views, disp);
}
// erase object and remove it from engine
{
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
if ( app ) {
- SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
- GEOM_Displayer aDisp (appStudy);
+ GEOM_Displayer aDisp;
aDisp.GlobalSelection();
getGeometryGUI()->setLocalSelectionMode(GEOM_ALLOBJECTS);
}
