X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSalomeApp%2FSalomeApp_Application.cxx;h=802d7d7b0fd5ea10fc7d4ff3161750f9ff73592f;hb=f830c97c748d8f8a6a7eccc8e3a58e19066a1181;hp=ffd325319d94928327607c654d29b20ef5045d08;hpb=e0d6fb42260448f334e3ed98f4c3b4a39ece9196;p=modules%2Fgui.git diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index ffd325319..802d7d7b0 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -1,3 +1,21 @@ +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // File: SalomeApp_Application.cxx // Created: 10/22/2004 3:23:45 PM // Author: Sergey LITONIN @@ -8,46 +26,30 @@ #include "SalomeApp_Application.h" #include "SalomeApp_Study.h" -#include "SalomeApp_Module.h" -#include "SalomeApp_OBFilter.h" #include "SalomeApp_DataModel.h" #include "SalomeApp_DataObject.h" #include "SalomeApp_EventFilter.h" -#include "SalomeApp_WidgetContainer.h" +#include "SalomeApp_VisualState.h" +#include "SalomeApp_ExitDlg.h" -#include "SalomeApp_AboutDlg.h" -#include "SalomeApp_ModuleDlg.h" -#include "SalomeApp_PreferencesDlg.h" +#include "SalomeApp_StudyPropertiesDlg.h" -#include "SalomeApp_GLSelector.h" -#include "SalomeApp_OBSelector.h" -#include "SalomeApp_OCCSelector.h" -#include "SalomeApp_VTKSelector.h" -#include "SalomeApp_SelectionMgr.h" +#include "LightApp_Application.h" +#include "LightApp_Preferences.h" +#include "LightApp_WidgetContainer.h" +#include "LightApp_SelectionMgr.h" +#include "LightApp_NameDlg.h" -#include - -#include -#include - -#include -#include - -#include -#include - -#include -#include - -#include +#include "STD_LoadStudiesDlg.h" #include #include +#include -#include -#include +#include #include +#include #include @@ -61,864 +63,906 @@ #include #include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include #include -#include - -#include "SALOMEDS_StudyManager.hxx" - -#define OBJECT_BROWSER_WIDTH 300 - -static const char* imageEmptyIcon[] = { -"20 20 1 1", -". c None", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"....................", -"...................."}; -extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication() -{ - return new SalomeApp_Application(); -} +#include "SALOMEDSClient_ClientFactory.hxx" +#include "SALOMEDSClient_IParameters.hxx" -/* - Class : SalomeApp_Application - Description : Application containing SalomeApp module -*/ +#include "SALOME_ListIteratorOfListIO.hxx" +#include "SALOME_ListIO.hxx" -SalomeApp_Application::SalomeApp_Application() -: CAM_Application( false ), -myPrefDlg( 0 ) -{ - STD_TabDesktop* desk = new STD_TabDesktop(); +#include "ToolsGUI_CatalogGeneratorDlg.h" +#include "ToolsGUI_RegWidget.h" - setDesktop( desk ); +#include - SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); - QPixmap aLogo = aResMgr->loadPixmap( "SalomeApp", tr( "APP_DEFAULT_ICO" ) ); - - desktop()->setIcon( aLogo ); - desktop()->setDockableMenuBar( true ); - desktop()->setDockableStatusBar( false ); - - clearViewManagers(); - - mySelMgr = new SalomeApp_SelectionMgr( this ); - - connect( desk, SIGNAL( closing( SUIT_Desktop*, QCloseEvent* ) ), - this, SLOT( onDesktopClosing( SUIT_Desktop*, QCloseEvent* ) ) ); - - connect( mySelMgr, SIGNAL( selectionChanged() ), this, SLOT( onSelection() ) ); -} +#include +/*!Internal class that updates object browser item properties */ +class SalomeApp_Updater : public OB_Updater +{ +public: + SalomeApp_Updater() : OB_Updater(){}; + virtual ~SalomeApp_Updater(){}; + virtual void update( SUIT_DataObject* theObj, OB_ListItem* theItem ); +}; -SalomeApp_Application::~SalomeApp_Application() +void SalomeApp_Updater::update( SUIT_DataObject* theObj, OB_ListItem* theItem ) { - saveWindowsGeometry(); + if( !theObj || !theItem ) + return; + + SalomeApp_DataObject* SAObj = dynamic_cast( theObj ); + if( !SAObj ) + return; + + _PTR(SObject) SObj = SAObj->object(); + if( !SObj ) + return; + _PTR( GenericAttribute ) anAttr; - if ( resourceMgr() ) + // Selectable + if ( SObj->FindAttribute( anAttr, "AttributeSelectable" ) ) { - if ( desktop() ) - desktop()->saveGeometry( resourceMgr(), "desktop" ); - resourceMgr()->save(); + _PTR(AttributeSelectable) aAttrSel = anAttr; + theItem->setSelectable( aAttrSel->IsSelectable() ); } - - delete mySelMgr; - - SalomeApp_EventFilter::Destroy(); + // Expandable + if ( SObj->FindAttribute(anAttr, "AttributeExpandable") ) + { + _PTR(AttributeExpandable) aAttrExpand = anAttr; + theItem->setExpandable( aAttrExpand->IsExpandable() ); + } + // Opened + //this attribute is not supported in the version of SALOME 3.x + //if ( SObj->FindAttribute(anAttr, "AttributeOpened") ) + //{ + // _PTR(AttributeOpened) aAttrOpen = anAttr; + // theItem->setOpen( aAttrOpen->IsOpened() ); + //} } -void SalomeApp_Application::start() +/*!Create new instance of SalomeApp_Application.*/ +extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication() { - if ( desktop() ) - desktop()->loadGeometry( resourceMgr(), "desktop" ); - - CAM_Application::start(); - - QAction* a = action( ViewWindowsId ); - if ( a && a->inherits( "QtxDockAction" ) ) - ((QtxDockAction*)a)->setAutoPlace( true ); - - SalomeApp_EventFilter::Init(); - - updateWindows(); - updateViewManagers(); - - putInfo( "" ); -} - -QString SalomeApp_Application::applicationName() const -{ - return tr( "APP_NAME" ); + return new SalomeApp_Application(); } -QString SalomeApp_Application::applicationVersion() const +/*!Constructor.*/ +SalomeApp_Application::SalomeApp_Application() +: LightApp_Application() { - static QString _app_version; - - if ( _app_version.isEmpty() ) - { - QString path( ::getenv( "GUI_ROOT_DIR" ) ); - if ( !path.isEmpty() ) - path += QDir::separator(); - path += QString( "bin/salome/VERSION" ); - - QFile vf( path ); - if ( vf.open( IO_ReadOnly ) ) - { - QString line; - vf.readLine( line, 1024 ); - vf.close(); - - if ( !line.isEmpty() ) - { - while ( !line.isEmpty() && line.at( line.length() - 1 ) == QChar( '\n' ) ) - line.remove( line.length() - 1, 1 ); - - int idx = line.findRev( ":" ); - if ( idx != -1 ) - _app_version = line.mid( idx + 1 ).stripWhiteSpace(); - } - } - } - - return _app_version; + connect( desktop(), SIGNAL( message( const QString& ) ), + this, SLOT( onDesktopMessage( const QString& ) ) ); } -CAM_Module* SalomeApp_Application::loadModule( const QString& name ) +/*!Destructor. + *\li Destroy event filter. + */ +SalomeApp_Application::~SalomeApp_Application() { - CAM_Module* mod = CAM_Application::loadModule( name ); - if ( mod ) - { - connect( this, SIGNAL( studyOpened() ), mod, SLOT( onModelOpened() ) ); - connect( this, SIGNAL( studySaved() ), mod, SLOT( onModelSaved() ) ); - connect( this, SIGNAL( studyClosed() ), mod, SLOT( onModelClosed() ) ); - } - return mod; + // Do not destroy. It's a singleton ! + //SalomeApp_EventFilter::Destroy(); } -bool SalomeApp_Application::activateModule( const QString& modName ) +/*!Start application.*/ +void SalomeApp_Application::start() { - QString actName; - CAM_Module* prevMod = activeModule(); - - if ( prevMod ) - actName = prevMod->moduleName(); - - if ( actName == modName ) - return true; + LightApp_Application::start(); - saveWindowsGeometry(); - - bool status = CAM_Application::activateModule( modName ); - - updateModuleActions(); - - if ( !status ) - return false; + SalomeApp_EventFilter::Init(); - updateWindows(); - updateViewManagers(); + static bool isFirst = true; + if ( isFirst ) { + isFirst = false; + + QString hdffile; + QStringList pyfiles; + + for (int i = 1; i < qApp->argc(); i++) { + QRegExp rxs ("--study-hdf=(.+)"); + if ( rxs.search( QString(qApp->argv()[i]) ) >= 0 && rxs.capturedTexts().count() > 1 ) { + QString file = rxs.capturedTexts()[1]; + QFileInfo fi ( file ); + QString extension = fi.extension( false ).lower(); + if ( extension == "hdf" && fi.exists() ) + hdffile = fi.absFilePath(); + } + else { + QRegExp rxp ("--pyscript=(.+)"); + if ( rxp.search( QString(qApp->argv()[i]) ) >= 0 && rxp.capturedTexts().count() > 1 ) { + QStringList files = QStringList::split(",",rxp.capturedTexts()[1],false); + pyfiles += files; + } + } + } - return true; -} + if ( !hdffile.isEmpty() ) // open hdf file given as parameter + onOpenDoc( hdffile ); + else if ( pyfiles.count() > 0 ) // create new study + onNewDoc(); -SalomeApp_SelectionMgr* SalomeApp_Application::selectionMgr() const -{ - return mySelMgr; + // import/execute python scripts + if ( pyfiles.count() > 0 && activeStudy() ) { + SalomeApp_Study* appStudy = dynamic_cast( activeStudy() ); + if ( appStudy ) { + _PTR(Study) aStudy = appStudy->studyDS(); + if ( !aStudy->GetProperties()->IsLocked() ) { + for (uint j = 0; j < pyfiles.count(); j++ ) { + QFileInfo fi ( pyfiles[j] ); + PythonConsole* pyConsole = pythonConsole(); + if ( pyConsole ) { + QString extension = fi.extension( false ).lower(); + if ( fi.exists() ) { + // execute python script + QString command = QString( "execfile(\"%1\")" ).arg( fi.absFilePath() ); + pyConsole->exec( command ); + } + else { + // import python module + QString command = QString( "import %1" ).arg( pyfiles[j] ); + if ( extension == "py" ) + command = QString( "import %1" ).arg( fi.baseName( true ) ); + pyConsole->exec( command ); + } + } + } + } + } + } + } } +/*!Create actions:*/ void SalomeApp_Application::createActions() { - STD_Application::createActions(); + LightApp_Application::createActions(); SUIT_Desktop* desk = desktop(); - SUIT_ResourceMgr* resMgr = resourceMgr(); - // Load script + //! Save GUI state + // "Save GUI State" command is moved to VISU module + // createAction( SaveGUIStateId, tr( "TOT_DESK_FILE_SAVE_GUI_STATE" ), QIconSet(), + // tr( "MEN_DESK_FILE_SAVE_GUI_STATE" ), tr( "PRP_DESK_FILE_SAVE_GUI_STATE" ), + // 0, desk, false, this, SLOT( onSaveGUIState() ) ); + + //! Dump study + createAction( DumpStudyId, tr( "TOT_DESK_FILE_DUMP_STUDY" ), QIconSet(), + tr( "MEN_DESK_FILE_DUMP_STUDY" ), tr( "PRP_DESK_FILE_DUMP_STUDY" ), + CTRL+Key_D, desk, false, this, SLOT( onDumpStudy() ) ); + + //! Load script createAction( LoadScriptId, tr( "TOT_DESK_FILE_LOAD_SCRIPT" ), QIconSet(), tr( "MEN_DESK_FILE_LOAD_SCRIPT" ), tr( "PRP_DESK_FILE_LOAD_SCRIPT" ), - 0, desk, false, this, SLOT( onLoadScript() ) ); - int fileMenu = createMenu( tr( "MEN_DESK_FILE" ), -1 ); - createMenu( LoadScriptId, fileMenu, 10, -1 ); - - // default icon for neutral point ('SALOME' module) - QPixmap defIcon = resMgr->loadPixmap( "SalomeApp", tr( "APP_DEFAULT_ICO" ) ); - if ( defIcon.isNull() ) - defIcon = QPixmap( imageEmptyIcon ); + CTRL+Key_T, desk, false, this, SLOT( onLoadScript() ) ); - // default icon for any module - QPixmap modIcon = resMgr->loadPixmap( "SalomeApp", tr( "APP_MODULE_ICO" ) ); - if ( modIcon.isNull() ) - modIcon = QPixmap( imageEmptyIcon ); + //! Properties + createAction( PropertiesId, tr( "TOT_DESK_PROPERTIES" ), QIconSet(), + tr( "MEN_DESK_PROPERTIES" ), tr( "PRP_DESK_PROPERTIES" ), + CTRL+Key_P, desk, false, this, SLOT( onProperties() ) ); - QToolBar* modTBar = new QtxToolBar( true, desk ); - modTBar->setLabel( tr( "INF_TOOLBAR_MODULES" ) ); + //! Catalog Generator + createAction( CatalogGenId, tr( "TOT_DESK_CATALOG_GENERATOR" ), QIconSet(), + tr( "MEN_DESK_CATALOG_GENERATOR" ), tr( "PRP_DESK_CATALOG_GENERATOR" ), + SHIFT+Key_G, desk, false, this, SLOT( onCatalogGen() ) ); - QActionGroup* modGroup = new QActionGroup( this ); - modGroup->setExclusive( true ); - modGroup->setUsesDropDown( true ); + //! Registry Display + createAction( RegDisplayId, tr( "TOT_DESK_REGISTRY_DISPLAY" ), QIconSet(), + tr( "MEN_DESK_REGISTRY_DISPLAY" ), tr( "PRP_DESK_REGISTRY_DISPLAY" ), + /*SHIFT+Key_D*/0, desk, false, this, SLOT( onRegDisplay() ) ); - QAction* a = createAction( -1, tr( "APP_NAME" ), defIcon, tr( "APP_NAME" ), - tr( "PRP_APP_MODULE" ), 0, desk, true ); - modGroup->add( a ); - myActions.insert( QString(), a ); + //SRN: BugID IPAL9021, add an action "Load" + createAction( FileLoadId, tr( "TOT_DESK_FILE_LOAD" ), + resourceMgr()->loadPixmap( "STD", tr( "ICON_FILE_OPEN" ) ), + tr( "MEN_DESK_FILE_LOAD" ), tr( "PRP_DESK_FILE_LOAD" ), + CTRL+Key_L, desk, false, this, SLOT( onLoadDoc() ) ); + //SRN: BugID IPAL9021: End - QMap iconMap; - moduleIconNames( iconMap ); - const int iconSize = 20; - - modGroup->addTo( modTBar ); - modTBar->addSeparator(); - - QStringList modList; - modules( modList, false ); - - for ( QStringList::Iterator it = modList.begin(); it != modList.end(); ++it ) - { - if ( (*it).isEmpty() ) - continue; - - QString iconName; - if ( iconMap.contains( *it ) ) - iconName = iconMap[*it]; - - QString modName = moduleName( *it ); + int fileMenu = createMenu( tr( "MEN_DESK_FILE" ), -1 ); - QPixmap icon = resMgr->loadPixmap( modName, iconName ); - if ( icon.isNull() ) - icon = modIcon; + // "Save GUI State" command is renamed to "Save VISU State" and + // creation of menu item is moved to VISU + // createMenu( SaveGUIStateId, fileMenu, 10, -1 ); - icon.convertFromImage( icon.convertToImage().smoothScale( iconSize, iconSize, QImage::ScaleMin ) ); + createMenu( FileLoadId, fileMenu, 0 ); //SRN: BugID IPAL9021, add a menu item "Load" - QAction* a = createAction( -1, *it, icon, *it, tr( "PRP_MODULE" ).arg( *it ), 0, desk, true ); - a->addTo( modTBar ); - modGroup->add( a ); + createMenu( DumpStudyId, fileMenu, 10, -1 ); + createMenu( separator(), fileMenu, -1, 15, -1 ); + createMenu( LoadScriptId, fileMenu, 10, -1 ); + createMenu( separator(), fileMenu, -1, 15, -1 ); + createMenu( PropertiesId, fileMenu, 10, -1 ); + createMenu( separator(), fileMenu, -1, 15, -1 ); + + int toolsMenu = createMenu( tr( "MEN_DESK_TOOLS" ), -1, MenuToolsId, 50 ); + createMenu( CatalogGenId, toolsMenu, 10, -1 ); + createMenu( RegDisplayId, toolsMenu, 10, -1 ); + createMenu( separator(), toolsMenu, -1, 15, -1 ); +} - myActions.insert( *it, a ); +/*! Purpose : SLOT. Open new document with \a aName.*/ +bool SalomeApp_Application::onOpenDoc( const QString& aName ) +{ + bool res = false, toOpen = true, isAlreadyOpen = false; + + // Look among opened studies + if (activeStudy()) { // at least one study is opened + SUIT_Session* aSession = SUIT_Session::session(); + QPtrList aAppList = aSession->applications(); + QPtrListIterator it (aAppList); + SUIT_Application* aApp = 0; + // iterate on all applications + for (; (aApp = it.current()) && !isAlreadyOpen; ++it) { + if (aApp->activeStudy()->studyName() == aName) { + isAlreadyOpen = true; // Already opened, ask user what to do + + // The document ... is already open. + // Do you want to reload it? + int aAnswer = SUIT_MessageBox::warn2(desktop(), tr("WRN_WARNING"), + tr("QUE_DOC_ALREADYOPEN").arg(aName), + tr("BUT_YES"), tr("BUT_NO"), 1, 2, 2); + if (aAnswer == 1) { // reload + if (activeStudy()->studyName() == aName && aAppList.count() > 1) { + // Opened in THIS (active) application. + STD_Application* app1 = (STD_Application*)aAppList.at(0); + STD_Application* app2 = (STD_Application*)aAppList.at(1); + if (!app1 || !app2) { + // Error + return false; + } + if (app1->activeStudy()->studyName() == aName) { + // app1 is this application, we need another one + app1 = app2; + } + // Close document of this application. This application will be destroyed. + onCloseDoc(/*ask = */false); + // Open the file with another application, as this one will be destroyed. + return app1->onOpenDoc(aName); + } else { + // Opened in another application. + STD_Application* app = (STD_Application*)aApp; + if (app) + app->onCloseDoc(/*ask = */false); + } + } else { // do not reload + // OK, the study will not be reloaded, but we call + // CAM_Application::onOpenDoc( aName ) all the same. + // It will activate a desktop of the study . + } + } + } } - SUIT_Tools::simplifySeparators( modTBar ); - - // New window - - int windowMenu = createMenu( tr( "MEN_DESK_WINDOW" ), -1, 100 ); - int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 ); - createMenu( separator(), windowMenu, -1, 1 ); + // Look among unloaded studies + if (!isAlreadyOpen) { + std::vector List = studyMgr()->GetOpenStudies(); + + QString studyName; + for (unsigned int ind = 0; ind < List.size() && !isAlreadyOpen; ind++) { + studyName = List[ind].c_str(); + if (aName == studyName) { + // Already exists unloaded, ask user what to do + isAlreadyOpen = true; + + // The document ... already exists in the study manager. + // Do you want to reload it? + int aAnswer = SUIT_MessageBox::warn2(desktop(), tr("WRN_WARNING"), + tr("QUE_DOC_ALREADYEXIST").arg(aName), + tr("BUT_YES"), tr("BUT_NO"), 1, 2, 2); + if (aAnswer == 1) { + _PTR(Study) aStudy = studyMgr()->GetStudyByName(aName.latin1()); + if (aStudy) + studyMgr()->Close(aStudy); + } else { + toOpen = false; + } + } + } + } - QMap accelMap; - accelMap[NewGLViewId] = ALT+Key_G; - accelMap[NewPlot2dId] = ALT+Key_P; - accelMap[NewOCCViewId] = ALT+Key_O; - accelMap[NewVTKViewId] = ALT+Key_K; + if (toOpen) + res = CAM_Application::onOpenDoc( aName ); - for ( int id = NewGLViewId; id <= NewVTKViewId; id++ ) + QAction* a = action( MRUId ); + if ( a && a->inherits( "QtxMRUAction" ) ) { - QAction* a = createAction( id, tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ), QIconSet(), - tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ), - tr( QString( "NEW_WINDOW_%1" ).arg( id - NewGLViewId ) ), - accelMap.contains( id ) ? accelMap[id] : 0, desk, false, this, SLOT( onNewWindow() ) ); - createMenu( a, newWinMenu, -1 ); + QtxMRUAction* mru = (QtxMRUAction*)a; + if ( res ) + mru->insert( aName ); + else + mru->remove( aName ); } - - connect( modGroup, SIGNAL( selected( QAction* ) ), this, SLOT( onModuleActivation( QAction* ) ) ); + return res; } -void SalomeApp_Application::onModuleActivation( QAction* a ) +/*!SLOT. Load document.*/ +void SalomeApp_Application::onLoadDoc() { - if ( !a ) - return; + QString name, studyname, ext; - QString modName = a->menuText(); - if ( modName == tr( "APP_NAME" ) ) - modName = QString::null; + STD_LoadStudiesDlg aDlg( desktop(), TRUE); - // Force user to create/open a study before module activation - QMap iconMap; - moduleIconNames( iconMap ); - QPixmap icon = resourceMgr()->loadPixmap( moduleName( modName ), iconMap[ modName ] ); + std::vector List = studyMgr()->GetOpenStudies(); - bool cancelled = false; - while ( !modName.isEmpty() && !activeStudy() && !cancelled ){ - SalomeApp_ModuleDlg aDlg( desktop(), modName, icon ); - int res = aDlg.exec(); + SUIT_Session* aSession = SUIT_Session::session(); + QPtrList aAppList = aSession->applications(); + SUIT_Application* aApp = 0; - switch ( res ){ - case 1: - onNewDoc(); - break; - case 2: - onOpenDoc(); - break; - case 3: - //onLoadStudy(); - //break; - case 0: - default: - putInfo( tr("INF_CANCELLED") ); - myActions[QString()]->setOn( true ); - cancelled = true; - } - } + for (unsigned int ind = 0; ind < List.size(); ind++) { + studyname = List[ind].c_str(); + //Add to list only unloaded studies + bool isAlreadyOpen = false; + for ( QPtrListIterator it( aAppList ); it.current() && !isAlreadyOpen; ++it ) + { + aApp = it.current(); + if(!aApp || !aApp->activeStudy()) continue; + if ( aApp->activeStudy()->studyName() == studyname ) isAlreadyOpen = true; + } - if ( !cancelled ) - activateModule( modName ); -} + if ( !isAlreadyOpen ) aDlg.ListComponent->insertItem( studyname ); + } -QString SalomeApp_Application::defaultModule() const -{ - QStringList aModuleNames; - modules( aModuleNames, false ); // obtain a complete list of module names for the current configuration - // If there's the one and only module --> activate it automatically - // TODO: Possible improvement - default module can be taken from preferences - return aModuleNames.count() > 1 ? "" : ( aModuleNames.count() ? aModuleNames.first() : "" ); -} + int retVal = aDlg.exec(); + studyname = aDlg.ListComponent->currentText(); -void SalomeApp_Application::onNewWindow() -{ - const QObject* obj = sender(); - if ( !obj || !obj->inherits( "QAction" ) ) + if (retVal == QDialog::Rejected) return; - QString type; - int id = actionId( (QAction*)obj ); - switch ( id ) - { - case NewGLViewId: - type = GLViewer_Viewer::Type(); - break; - case NewPlot2dId: - type = Plot2d_Viewer::Type(); - break; - case NewOCCViewId: - type = OCCViewer_Viewer::Type(); - break; - case NewVTKViewId: - type = VTKViewer_Viewer::Type(); - break; - } - - if ( !type.isEmpty() ) - createViewManager( type ); -} - -//======================================================================= -// name : onNewDoc -// Purpose : SLOT. Create new document -//======================================================================= -void SalomeApp_Application::onNewDoc() -{ - SUIT_Study* study = activeStudy(); + if ( studyname.isNull() || studyname.isEmpty() ) + return; - saveWindowsGeometry(); + name = studyname; +#ifndef WNT + //this code replace marker of windows drive and path become invalid therefore + // defines placed there + name.replace( QRegExp(":"), "/" ); +#endif - CAM_Application::onNewDoc(); - - if ( !study ) // new study will be create in THIS application + if( LightApp_Application::onLoadDoc( name ) ) { - updateWindows(); - updateViewManagers(); + updateWindows(); + updateViewManagers(); + updateObjectBrowser(true); } } -//======================================================================= -// name : onOpenDoc -// Purpose : SLOT. Open new document -//======================================================================= -void SalomeApp_Application::onOpenDoc() +/*! + \brief Close application. +*/ +void SalomeApp_Application::onExit() { - SUIT_Study* study = activeStudy(); - saveWindowsGeometry(); + bool killServers = false; + bool result = true; - CAM_Application::onOpenDoc(); - - if ( !study ) // new study will be create in THIS application - { - updateWindows(); - updateViewManagers(); + if ( exitConfirmation() ) { + SalomeApp_ExitDlg dlg( desktop() ); + result = dlg.exec() == QDialog::Accepted; + killServers = dlg.isServersShutdown(); } + + if ( result ) + SUIT_Session::session()->closeSession( SUIT_Session::ASK, killServers ); } -void SalomeApp_Application::onSelection() -{ - onSelectionChanged(); - - if ( activeModule() && activeModule()->inherits( "SalomeApp_Module" ) ) - ((SalomeApp_Module*)activeModule())->selectionChanged(); -} - -void SalomeApp_Application::onSelectionChanged() -{ -} - -void SalomeApp_Application::onAboutRefresh() +/*!SLOT. Load document with \a aName.*/ +bool SalomeApp_Application::onLoadDoc( const QString& aName ) { - SalomeApp_DataModel* dm = 0; - if ( activeModule() ) - { - CAM_DataModel* camDM = activeModule()->dataModel(); - if ( camDM && camDM->inherits( "SalomeApp_DataModel" ) ) - dm = (SalomeApp_DataModel*)camDM; - } - - if ( dm ) - dm->update(); + return LightApp_Application::onLoadDoc( aName ); } -void SalomeApp_Application::setActiveStudy( SUIT_Study* study ) +/*!SLOT. Copy objects to study maneger from selection maneger..*/ +void SalomeApp_Application::onCopy() { - CAM_Application::setActiveStudy( study ); - - activateWindows(); -} - -//======================================================================= -// name : createNewStudy -// Purpose : Create new study -//======================================================================= -SUIT_Study* SalomeApp_Application::createNewStudy() -{ - SalomeApp_Study* aStudy = new SalomeApp_Study( this ); + SALOME_ListIO list; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects(list); - // Set up processing of major study-related events - connect( aStudy, SIGNAL( created( SUIT_Study* ) ), this, SLOT( onStudyCreated( SUIT_Study* ) ) ); - connect( aStudy, SIGNAL( opened ( SUIT_Study* ) ), this, SLOT( onStudyOpened ( SUIT_Study* ) ) ); - connect( aStudy, SIGNAL( saved ( SUIT_Study* ) ), this, SLOT( onStudySaved ( SUIT_Study* ) ) ); - connect( aStudy, SIGNAL( closed ( SUIT_Study* ) ), this, SLOT( onStudyClosed ( SUIT_Study* ) ) ); + SalomeApp_Study* study = dynamic_cast(activeStudy()); + if(study == NULL) return; + + _PTR(Study) stdDS = study->studyDS(); + if(!stdDS) return; - return aStudy; + SALOME_ListIteratorOfListIO it( list ); + if(it.More()) + { + _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry()); + try { + studyMgr()->Copy(so); + onSelectionChanged(); + } + catch(...) { + } + } } -//======================================================================= -// name : createNewStudy -// Purpose : Enable/Disable menu items and toolbar buttons. Rebuild menu -//======================================================================= -void SalomeApp_Application::updateCommandsStatus() +/*!SLOT. Paste objects to study maneger from selection manager.*/ +void SalomeApp_Application::onPaste() { - CAM_Application::updateCommandsStatus(); + SALOME_ListIO list; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects(list); - for ( int id = NewGLViewId; id <= NewVTKViewId; id++ ) - { - QAction* a = action( id ); - if ( a ) - a->setEnabled( activeStudy() ); - } + SalomeApp_Study* study = dynamic_cast(activeStudy()); + if(study == NULL) return; - // Load script menu - QAction* a = action( LoadScriptId ); - if ( a ) - a->setEnabled( activeStudy() ); -} + _PTR(Study) stdDS = study->studyDS(); + if(!stdDS) return; -//======================================================================= -// name : onHelpAbout -// Purpose : SLOT. Display "About" message box -//======================================================================= -void SalomeApp_Application::onHelpAbout() -{ - SalomeApp_AboutDlg* dlg = new SalomeApp_AboutDlg( applicationName(), applicationVersion(), desktop() ); - dlg->exec(); - delete dlg; -} - -QWidget* SalomeApp_Application::window( const int flag, const int studyId ) const -{ - QWidget* wid = 0; - - int sId = studyId; - if ( sId < 0 ) - { - if ( !activeStudy() ) - return 0; - else - sId = activeStudy()->id(); + if ( stdDS->GetProperties()->IsLocked() ) { + SUIT_MessageBox::warn1 ( desktop(), + QObject::tr("WRN_WARNING"), + QObject::tr("WRN_STUDY_LOCKED"), + QObject::tr("BUT_OK") ); + return; } - if ( myWindows.contains( flag ) ) - wid = myWindows[flag]->widget( sId ); - - return wid; + SALOME_ListIteratorOfListIO it( list ); + if(it.More()) + { + _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry()); + try { + studyMgr()->Paste(so); + updateObjectBrowser( true ); + updateActions(); //SRN: BugID IPAL9377, case 3 + } + catch(...) { + } + } } -void SalomeApp_Application::addWindow( QWidget* wid, const int flag, const int studyId ) +/*! Check if the study is locked */ +void SalomeApp_Application::onCloseDoc( bool ask ) { - if ( !wid ) - return; - - int sId = studyId; - if ( sId < 0 ) - { - if ( !activeStudy() ) - return; - else - sId = activeStudy()->id(); - } - - if ( !myWindows.contains( flag ) ) - { - QMap winMap; - currentWindows( winMap ); - - myWindows.insert( flag, new SalomeApp_WidgetContainer( flag, desktop() ) ); - if ( winMap.contains( flag ) ) - desktop()->moveDockWindow( myWindows[flag], (Dock)winMap[flag] ); - - myWindows[flag]->setResizeEnabled( true ); - myWindows[flag]->setCloseMode( QDockWindow::Always ); - myWindows[flag]->setName( QString( "dock_window_%1" ).arg( flag ) ); + SalomeApp_Study* study = dynamic_cast(activeStudy()); + + if (study != NULL) { + _PTR(Study) stdDS = study->studyDS(); + if(stdDS && stdDS->IsStudyLocked()) { + if ( SUIT_MessageBox::warn2( desktop(), + QObject::tr( "WRN_WARNING" ), + QObject::tr( "CLOSE_LOCKED_STUDY" ), + QObject::tr( "BUT_YES" ), + QObject::tr( "BUT_NO" ), + SUIT_YES, + SUIT_NO, + SUIT_NO ) == SUIT_NO ) return; + + } } - myWindows[flag]->insert( sId, wid ); - - setWindowShown( flag, !myWindows[flag]->isEmpty() ); + LightApp_Application::onCloseDoc( ask ); } -void SalomeApp_Application::removeWindow( const int flag, const int studyId ) +/*!Sets enable or disable some actions on selection changed.*/ +void SalomeApp_Application::onSelectionChanged() { - if ( !myWindows.contains( flag ) ) - return; + SALOME_ListIO list; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects(list); - int sId = studyId; - if ( sId < 0 ) - { - if ( !activeStudy() ) - return; - else - sId = activeStudy()->id(); - } + bool canCopy = false; + bool canPaste = false; - QWidget* wid = myWindows[flag]->widget( sId ); - myWindows[flag]->remove( sId ); - delete wid; + SalomeApp_Study* study = dynamic_cast(activeStudy()); + if (study != NULL) { + _PTR(Study) stdDS = study->studyDS(); - setWindowShown( flag, !myWindows[flag]->isEmpty() ); -} + if (stdDS) { + SALOME_ListIteratorOfListIO it ( list ); -QWidget* SalomeApp_Application::getWindow( const int flag, const int studyId ) -{ - QWidget* wid = window( flag, studyId ); - if ( !wid ) - addWindow( wid = createWindow( flag ), flag, studyId ); + if (it.More() && list.Extent() == 1) { + _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry()); - return wid; -} + if ( so ) { + canCopy = studyMgr()->CanCopy(so); + canPaste = studyMgr()->CanPaste(so); + } + } + } + } -bool SalomeApp_Application::isWindowVisible( const int type ) const -{ - bool res = false; - if ( myWindows.contains( type ) ) - { - SUIT_Desktop* desk = ((SalomeApp_Application*)this)->desktop(); - res = desk && desk->appropriate( myWindows[type] ); - } - return res; + action(EditCopyId)->setEnabled(canCopy); + action(EditPasteId)->setEnabled(canPaste); } -void SalomeApp_Application::setWindowShown( const int type, const bool on ) +/*!Delete references.*/ +void SalomeApp_Application::onDeleteInvalidReferences() { - if ( !desktop() || !myWindows.contains( type ) ) + SALOME_ListIO aList; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects( aList, QString::null, false ); + + if( aList.IsEmpty() ) return; - QDockWindow* dw = myWindows[type]; - desktop()->setAppropriate( dw, on ); - on ? dw->show() : dw->hide(); -} + SalomeApp_Study* aStudy = dynamic_cast(activeStudy()); + _PTR(Study) aStudyDS = aStudy->studyDS(); + _PTR(StudyBuilder) aStudyBuilder = aStudyDS->NewBuilder(); + _PTR(SObject) anObj; -OB_Browser* SalomeApp_Application::objectBrowser() -{ - OB_Browser* ob = 0; - QWidget* wid = getWindow( WT_ObjectBrowser ); - if ( wid->inherits( "OB_Browser" ) ) - ob = (OB_Browser*)wid; - return ob; -} - -LogWindow* SalomeApp_Application::logWindow() -{ - LogWindow* lw = 0; - QWidget* wid = getWindow( WT_LogWindow ); - if ( wid->inherits( "LogWindow" ) ) - lw = (LogWindow*)wid; - return lw; -} + for( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() ) + if ( it.Value()->hasEntry() ) + { + _PTR(SObject) aSObject = aStudyDS->FindObjectID( it.Value()->getEntry() ), aRefObj = aSObject; + while( aRefObj && aRefObj->ReferencedObject( anObj ) ) + aRefObj = anObj; -PythonConsole* SalomeApp_Application::pythonConsole() -{ - PythonConsole* console = 0; - QWidget* wid = getWindow( WT_PyConsole ); - if ( wid->inherits( "PythonConsole" ) ) - console = (PythonConsole*)wid; - return console; + if( aRefObj && aRefObj!=aSObject && QString( aRefObj->GetName().c_str() ).isEmpty() ) + aStudyBuilder->RemoveReference( aSObject ); + } + updateObjectBrowser(); } -QtxResourceEdit* SalomeApp_Application::resourceEdit() const +/*!Private SLOT. */ +void SalomeApp_Application::onOpenWith() { - return 0; - /* - QtxResourceEdit* edit = 0; - if ( !myPrefDlg ) - { - SalomeApp_Application* that = (SalomeApp_Application*)this; - that->myPrefDlg = new SalomeApp_PreferencesDlg( that->desktop() ); - - edit = myPrefDlg->resourceEdit(); - - QStringList modList; - modules( modList, false ); - for ( QStringList::const_iterator it = modList.begin(); it != modList.end(); ++it ) + QApplication::setOverrideCursor( Qt::waitCursor ); + SALOME_ListIO aList; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects(aList); + if (aList.Extent() != 1) { - int id = edit->addItem( *it ); - edit->setProperty( id, "info", tr( "PREFERENCES_NOT_LOADED" ).arg( *it ) ); + QApplication::restoreOverrideCursor(); + return; } - } - else - edit = myPrefDlg->resourceEdit(); - */ + Handle(SALOME_InteractiveObject) aIObj = aList.First(); + QString aModuleName(aIObj->getComponentDataType()); + QString aModuleTitle = moduleTitle(aModuleName); + activateModule(aModuleTitle); + QApplication::restoreOverrideCursor(); } -SUIT_ViewManager* SalomeApp_Application::getViewManager( const QString& vmType, const bool create ) +/*! + Creates new study +*/ +SUIT_Study* SalomeApp_Application::createNewStudy() { - SUIT_ViewManager* aVM = viewManager( vmType ); - SUIT_ViewManager* anActiveVM = CAM_Application::activeViewManager(); - if ( anActiveVM && anActiveVM->getType() == vmType ) - aVM = anActiveVM; - else if ( aVM ) - { - if ( !aVM->getActiveView() ) - aVM->createView(); - } - else if ( create ) - aVM = createViewManager( vmType ); - return aVM; + SalomeApp_Study* aStudy = new SalomeApp_Study( this ); + + // Set up processing of major study-related events + connect( aStudy, SIGNAL( created( SUIT_Study* ) ), this, SLOT( onStudyCreated( SUIT_Study* ) ) ); + connect( aStudy, SIGNAL( opened ( SUIT_Study* ) ), this, SLOT( onStudyOpened ( SUIT_Study* ) ) ); + connect( aStudy, SIGNAL( saved ( SUIT_Study* ) ), this, SLOT( onStudySaved ( SUIT_Study* ) ) ); + connect( aStudy, SIGNAL( closed ( SUIT_Study* ) ), this, SLOT( onStudyClosed ( SUIT_Study* ) ) ); + + return aStudy; } -SUIT_ViewManager* SalomeApp_Application::createViewManager( const QString& vmType ) +/*! + Enable/Disable menu items and toolbar buttons. Rebuild menu +*/ +void SalomeApp_Application::updateCommandsStatus() { - SUIT_ViewManager* viewMgr = 0; - if ( vmType == GLViewer_Viewer::Type() ) - { - viewMgr = new GLViewer_ViewManager( activeStudy(), desktop() ); - new SalomeApp_GLSelector( (GLViewer_Viewer2d*)viewMgr->getViewModel(), mySelMgr ); - } - else if ( vmType == Plot2d_Viewer::Type() ) - { - viewMgr = new Plot2d_ViewManager( activeStudy(), desktop() ); - viewMgr->setViewModel( new SPlot2d_Viewer() );// custom view model, which extends SALOME_View interface - } - else if ( vmType == OCCViewer_Viewer::Type() ) - { - viewMgr = new OCCViewer_ViewManager( activeStudy(), desktop() ); - viewMgr->setViewModel( new SOCC_Viewer() );// custom view model, which extends SALOME_View interface - new SalomeApp_OCCSelector( (OCCViewer_Viewer*)viewMgr->getViewModel(), mySelMgr ); - } - else if ( vmType == SVTK_Viewer::Type() ) - { - viewMgr = new SVTK_ViewManager( activeStudy(), desktop() ); - new SalomeApp_VTKSelector((SVTK_Viewer*)viewMgr->getViewModel(),mySelMgr); - } - - if ( !viewMgr ) - return 0; + LightApp_Application::updateCommandsStatus(); - addViewManager( viewMgr ); - SUIT_ViewWindow* viewWin = viewMgr->createViewWindow(); + // Dump study menu + QAction* a = action( DumpStudyId ); + if ( a ) + a->setEnabled( activeStudy() ); - if ( viewWin && desktop() ) - viewWin->resize( (int)( desktop()->width() * 0.6 ), (int)( desktop()->height() * 0.6 ) ); + // Load script menu + a = action( LoadScriptId ); + if ( a ) + a->setEnabled( activeStudy() ); - connect( viewMgr, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), - this, SLOT( onCloseView( SUIT_ViewManager* ) ) ); + // Properties menu + a = action( PropertiesId ); + if( a ) + a->setEnabled( activeStudy() ); - return viewMgr; -} + // Save GUI state menu + a = action( SaveGUIStateId ); + if( a ) + a->setEnabled( activeStudy() ); -void SalomeApp_Application::onCloseView( SUIT_ViewManager* theVM ) -{ - removeViewManager( theVM ); + // update state of Copy/Paste menu items + onSelectionChanged(); } -void SalomeApp_Application::onStudyCreated( SUIT_Study* theStudy ) +/*! + \class DumpStudyFileDlg + Private class used in Dump Study operation. Consists 2 check boxes: + "Publish in study" and "Save GUI parameters" +*/ +class DumpStudyFileDlg : public SUIT_FileDlg { - SUIT_DataObject* aRoot = 0; - if ( theStudy && theStudy->root() ) +public: + DumpStudyFileDlg( QWidget* parent ) : SUIT_FileDlg( parent, false, true, true ) { - aRoot = theStudy->root(); - //aRoot->setName( tr( "DATA_MODELS" ) ); + QHBox* hB = new QHBox( this ); + myPublishChk = new QCheckBox( tr("PUBLISH_IN_STUDY"), hB ); + mySaveGUIChk = new QCheckBox( tr("SAVE_GUI_STATE"), hB ); + QPushButton* pb = new QPushButton(this); + addWidgets( new QLabel("", this), hB, pb ); + pb->hide(); } - if ( objectBrowser() != 0 ) - objectBrowser()->setRootObject( aRoot ); - - activateModule( defaultModule() ); - - activateWindows(); -} + QCheckBox* myPublishChk; + QCheckBox* mySaveGUIChk; +}; -void SalomeApp_Application::onStudyOpened( SUIT_Study* theStudy ) +/*!Private SLOT. On dump study.*/ +void SalomeApp_Application::onDumpStudy( ) { - SUIT_DataObject* aRoot = 0; - if ( theStudy && theStudy->root() ) - { - aRoot = theStudy->root(); - //aRoot->dump(); + SalomeApp_Study* appStudy = dynamic_cast( activeStudy() ); + if ( !appStudy ) return; + _PTR(Study) aStudy = appStudy->studyDS(); + + QStringList aFilters; + aFilters.append( tr( "PYTHON_FILES_FILTER" ) ); + + DumpStudyFileDlg* fd = new DumpStudyFileDlg( desktop() ); + fd->setCaption( tr( "TOT_DESK_FILE_DUMP_STUDY" ) ); + fd->setFilters( aFilters ); + fd->myPublishChk->setChecked( true ); + fd->mySaveGUIChk->setChecked( true ); + QString aFileName; + while (1) { + fd->exec(); + fd->raise(); + aFileName = fd->selectedFile(); + if (!aFileName.isEmpty()) { + if ( (aFileName.find('-', 0) == -1) && (aFileName.find('!', 0) == -1) && (aFileName.find('?', 0) == -1) && + (aFileName.find('#', 0) == -1) && (aFileName.find('*', 0) == -1) && (aFileName.find('&', 0) == -1)) { + break; + } + else { + SUIT_MessageBox::warn1 ( desktop(), + QObject::tr("WRN_WARNING"), + tr("WRN_FILE_NAME_BAD"), + QObject::tr("BUT_OK") ); + } + } + else { + break; + } } - if ( objectBrowser() != 0 ) { - objectBrowser()->setRootObject( aRoot ); + bool toPublish = fd->myPublishChk->isChecked(); + bool toSaveGUI = fd->mySaveGUIChk->isChecked(); + delete fd; + + if ( !aFileName.isEmpty() ) { + QFileInfo aFileInfo(aFileName); + int savePoint; + _PTR(AttributeParameter) ap; + _PTR(IParameters) ip = ClientFactory::getIParameters(ap); + if(ip->isDumpPython(appStudy->studyDS())) ip->setDumpPython(appStudy->studyDS()); //Unset DumpPython flag. + if ( toSaveGUI ) { //SRN: Store a visual state of the study at the save point for DumpStudy method + ip->setDumpPython(appStudy->studyDS()); + savePoint = SalomeApp_VisualState( this ).storeState(); //SRN: create a temporary save point + } + bool res = aStudy->DumpStudy( aFileInfo.dirPath( true ).latin1(), aFileInfo.baseName().latin1(), toPublish); + if ( toSaveGUI ) + appStudy->removeSavePoint(savePoint); //SRN: remove the created temporary save point. + if ( !res ) + SUIT_MessageBox::warn1 ( desktop(), + QObject::tr("WRN_WARNING"), + tr("WRN_DUMP_STUDY_FAILED"), + QObject::tr("BUT_OK") ); } - - activateModule( defaultModule() ); - - activateWindows(); - - emit studyOpened(); -} - -void SalomeApp_Application::onStudySaved( SUIT_Study* ) -{ - emit studySaved(); -} - -void SalomeApp_Application::onStudyClosed( SUIT_Study* ) -{ - emit studyClosed(); - - activateModule( "" ); - - saveWindowsGeometry(); } +/*!Private SLOT. On load script.*/ void SalomeApp_Application::onLoadScript( ) { SalomeApp_Study* appStudy = dynamic_cast( activeStudy() ); if ( !appStudy ) return; _PTR(Study) aStudy = appStudy->studyDS(); - + if ( aStudy->GetProperties()->IsLocked() ) { SUIT_MessageBox::warn1 ( desktop(), - QObject::tr("WRN_WARNING"), + QObject::tr("WRN_WARNING"), QObject::tr("WRN_STUDY_LOCKED"), QObject::tr("BUT_OK") ); return; } - + QStringList filtersList; filtersList.append(tr("PYTHON_FILES_FILTER")); filtersList.append(tr("ALL_FILES_FILTER")); - - QString aFile = SUIT_FileDlg::getFileName(desktop(), "", filtersList, tr("TOT_DESK_FILE_LOAD_SCRIPT"), true, false); - if(!aFile.isEmpty()) { + + QString aFile = SUIT_FileDlg::getFileName( desktop(), "", filtersList, tr( "TOT_DESK_FILE_LOAD_SCRIPT" ), true, true ); + + if ( !aFile.isEmpty() ) + { QString command = QString("execfile(\"%1\")").arg(aFile); - + PythonConsole* pyConsole = pythonConsole(); - - if(pyConsole) - pyConsole->exec(command); - } -} -QString SalomeApp_Application::getFileFilter() const -{ - return "(*.hdf)"; + if ( pyConsole ) + pyConsole->exec( command ); + } } -void SalomeApp_Application::beforeCloseDoc( SUIT_Study* s ) +/*!Private SLOT. On save GUI state.*/ +void SalomeApp_Application::onSaveGUIState() { - CAM_Application::beforeCloseDoc( s ); - - for ( WindowMap::ConstIterator itr = myWindows.begin(); s && itr != myWindows.end(); ++itr ) - removeWindow( itr.key(), s->id() ); + SalomeApp_Study* study = dynamic_cast( activeStudy() ); + if ( study ) { + SalomeApp_VisualState( this ).storeState(); + updateSavePointDataObjects( study ); + objectBrowser()->updateTree( study->root() ); + } + updateActions(); } -void SalomeApp_Application::updateActions() +/*!Gets file filter. + *\retval QString "(*.hdf)" + */ +QString SalomeApp_Application::getFileFilter() const { - updateCommandsStatus(); + return "(*.hdf)"; } +/*!Create window.*/ QWidget* SalomeApp_Application::createWindow( const int flag ) { QWidget* wid = 0; + if ( flag != WT_PyConsole ) wid = LightApp_Application::createWindow(flag); + + SUIT_ResourceMgr* resMgr = resourceMgr(); if ( flag == WT_ObjectBrowser ) { - OB_Browser* ob = new OB_Browser( desktop() ); - ob->setAutoUpdate( true ); - ob->setAutoOpenLevel( 1 ); - ob->setCaption( tr( "OBJECT_BROWSER" ) ); - ob->resize( OBJECT_BROWSER_WIDTH, ob->height() ); - ob->setFilter( new SalomeApp_OBFilter( selectionMgr() ) ); - - ob->setNameTitle( tr( "OBJ_BROWSER_NAME" ) ); + OB_Browser* ob = (OB_Browser*)wid; + ob->setUpdater( new SalomeApp_Updater() ); + connect( ob->listView(), SIGNAL( doubleClicked( QListViewItem* ) ), this, SLOT( onDblClick( QListViewItem* ) ) ); + bool autoSize = resMgr->booleanValue( "ObjectBrowser", "auto_size", false ), + autoSizeFirst = resMgr->booleanValue( "ObjectBrowser", "auto_size_first", true ); for ( int i = SalomeApp_DataObject::CT_Value; i <= SalomeApp_DataObject::CT_RefEntry; i++ ) + { ob->addColumn( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), i ); - - // Create OBSelector - new SalomeApp_OBSelector( ob, mySelMgr ); - - wid = ob; - - connect( ob, SIGNAL( aboutRefresh() ), this, SLOT( onAboutRefresh() ) ); - ob->connectPopupRequest( this, SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) ); + ob->setColumnShown( i, resMgr->booleanValue( "ObjectBrowser", + QString().sprintf( "visibility_column_%d", i ), true ) ); + } + ob->setWidthMode( autoSize ? QListView::Maximum : QListView::Manual ); + ob->listView()->setColumnWidthMode( 0, autoSizeFirst ? QListView::Maximum : QListView::Manual ); + ob->resize( desktop()->width()/3, ob->height() ); } else if ( flag == WT_PyConsole ) { PythonConsole* pyCons = new PythonConsole( desktop(), new SalomeApp_PyInterp() ); pyCons->setCaption( tr( "PYTHON_CONSOLE" ) ); wid = pyCons; - - // pyCons->connectPopupRequest( this, SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) ); + pyCons->resize( pyCons->width(), desktop()->height()/4 ); + //pyCons->connectPopupRequest(this, SLOT(onConnectPopupRequest(SUIT_PopupClient*, QContextMenuEvent*))); } - else if ( flag == WT_LogWindow ) + return wid; +} + +/*!Create preferences.*/ +void SalomeApp_Application::createPreferences( LightApp_Preferences* pref ) +{ + LightApp_Application::createPreferences(pref); + + if ( !pref ) + return; + + int salomeCat = pref->addPreference( tr( "PREF_CATEGORY_SALOME" ) ); + int obTab = pref->addPreference( tr( "PREF_TAB_OBJBROWSER" ), salomeCat ); + int defCols = pref->addPreference( tr( "PREF_GROUP_DEF_COLUMNS" ), obTab ); + for ( int i = SalomeApp_DataObject::CT_Value; i <= SalomeApp_DataObject::CT_RefEntry; i++ ) { - LogWindow* logWin = new LogWindow( desktop() ); - logWin->setCaption( tr( "LOG_WINDOW" ) ); - wid = logWin; + pref->addPreference( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), defCols, + LightApp_Preferences::Bool, "ObjectBrowser", QString().sprintf( "visibility_column_%d", i ) ); + } + pref->setItemProperty( defCols, "columns", 1 ); - logWin->connectPopupRequest( this, SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) ); + // adding preference to LightApp_Application handled preferences.. a bit of hacking with resources.. + int genTab = pref->addPreference( LightApp_Application::tr( "PREF_TAB_GENERAL" ), salomeCat ); + int studyGroup = pref->addPreference( LightApp_Application::tr( "PREF_GROUP_STUDY" ), genTab ); + pref->addPreference( tr( "PREF_STORE_VISUAL_STATE" ), studyGroup, LightApp_Preferences::Bool, "Study", "store_visual_state" ); +} + +/*!Update desktop title.*/ +void SalomeApp_Application::updateDesktopTitle() { + QString aTitle = applicationName(); + QString aVer = applicationVersion(); + if ( !aVer.isEmpty() ) + aTitle += QString( " " ) + aVer; + + if ( activeStudy() ) + { + QString sName = SUIT_Tools::file( activeStudy()->studyName().stripWhiteSpace(), false ); + if ( !sName.isEmpty() ) { + SalomeApp_Study* study = dynamic_cast(activeStudy()); + if ( study ) { + _PTR(Study) stdDS = study->studyDS(); + if(stdDS) { + if ( stdDS->GetProperties()->IsLocked() ) { + aTitle += QString( " - [%1 (%2)]").arg( sName ).arg( tr( "STUDY_LOCKED" ) ); + } else { + aTitle += QString( " - [%1]" ).arg( sName ); + } + } + } + } } - return wid; + desktop()->setCaption( aTitle ); } -void SalomeApp_Application::defaultWindows( QMap& aMap ) const +/*! + \brief Show dialog box to propose possible user actions when study is closed. + \param docName study name + \return chosen action ID + \sa closeAction() +*/ +int SalomeApp_Application::closeChoice( const QString& docName ) { - aMap.insert( WT_ObjectBrowser, Qt::DockLeft ); - aMap.insert( WT_PyConsole, Qt::DockBottom ); - aMap.insert( WT_LogWindow, Qt::DockBottom ); + SUIT_MsgDlg dlg( desktop(), tr( "APPCLOSE_CAPTION" ), tr ( "APPCLOSE_DESCRIPTION" ), + QMessageBox::standardIcon( QMessageBox::Information ) ); + dlg.addButton( tr ( "APPCLOSE_SAVE" ), CloseSave ); + dlg.addButton( tr ( "APPCLOSE_CLOSE" ), CloseDiscard ); + dlg.addButton( tr ( "APPCLOSE_UNLOAD" ), CloseUnload ); + + return dlg.exec(); } -void SalomeApp_Application::defaultViewManagers( QStringList& ) const +/*! + \brief Process user actions selected from the dialog box when study is closed. + \param choice chosen action ID + \param closePermanently "forced study closing" flag + \return operation status + \sa closeChoice() +*/ +bool SalomeApp_Application::closeAction( const int choice, bool& closePermanently ) { + bool res = true; + switch( choice ) + { + case CloseSave: + if ( activeStudy()->isSaved() ) + onSaveDoc(); + else if ( !onSaveAsDoc() ) + res = false; + break; + case CloseDiscard: + break; + case CloseUnload: + closePermanently = false; + break; + case CloseCancel: + default: + res = false; + } + return res; } -void SalomeApp_Application::afterCloseDoc() +/*! + \brief Get module activation actions + \return map where + - action_id is unique non-zero action identifier + - action_name is action title + \sa moduleActionSelected() +*/ +QMap SalomeApp_Application::activateModuleActions() const { - updateWindows(); + QMap opmap = LightApp_Application::activateModuleActions(); + opmap.insert( LoadStudyId, tr( "ACTIVATE_MODULE_OP_LOAD" ) ); + return opmap; +} - CAM_Application::afterCloseDoc(); +/*! + \brief Process module activation action. + \param id action identifier + \sa activateModuleActions() +*/ +void SalomeApp_Application::moduleActionSelected( const int id ) +{ + if ( id == LoadStudyId ) + onLoadDoc(); + else + LightApp_Application::moduleActionSelected( id ); } +/*!Gets CORBA::ORB_var*/ CORBA::ORB_var SalomeApp_Application::orb() { ORB_INIT& init = *SINGLETON_::Instance(); @@ -926,169 +970,415 @@ CORBA::ORB_var SalomeApp_Application::orb() return _orb; } +/*!Create and return SALOMEDS_StudyManager.*/ SALOMEDSClient_StudyManager* SalomeApp_Application::studyMgr() { - static SALOMEDSClient_StudyManager* _sm = new SALOMEDS_StudyManager(); - return _sm; + static _PTR(StudyManager) _sm; + if(!_sm) _sm = ClientFactory::StudyManager(); + return _sm.get(); } +/*!Create and return SALOME_NamingService.*/ SALOME_NamingService* SalomeApp_Application::namingService() { static SALOME_NamingService* _ns = new SALOME_NamingService( orb() ); return _ns; } +/*!Create and return SALOME_LifeCycleCORBA.*/ SALOME_LifeCycleCORBA* SalomeApp_Application::lcc() { static SALOME_LifeCycleCORBA* _lcc = new SALOME_LifeCycleCORBA( namingService() ); return _lcc; } +/*!Return default engine IOR for light modules*/ QString SalomeApp_Application::defaultEngineIOR() { - // Look for a default module engine (needed for CORBAless modules to use SALOMEDS persistence) + /// Look for a default module engine (needed for CORBAless modules to use SALOMEDS persistence) QString anIOR( "" ); CORBA::Object_ptr anEngine = namingService()->Resolve( "/SalomeAppEngine" ); if ( !CORBA::is_nil( anEngine ) ) - anIOR = orb()->object_to_string( anEngine ); + { + CORBA::String_var objStr = orb()->object_to_string( anEngine ); + anIOR = QString( objStr.in() ); + } return anIOR; } -void SalomeApp_Application::moduleIconNames( QMap& iconMap ) const +/*!Private SLOT. On preferences.*/ +void SalomeApp_Application::onProperties() { - iconMap.clear(); + SalomeApp_Study* study = dynamic_cast( activeStudy() ); + if( !study ) + return; - SUIT_ResourceMgr* resMgr = resourceMgr(); - if ( !resMgr ) + _PTR(StudyBuilder) SB = study->studyDS()->NewBuilder(); + SB->NewCommand(); + + SalomeApp_StudyPropertiesDlg aDlg( desktop() ); + int res = aDlg.exec(); + if( res==QDialog::Accepted && aDlg.isChanged() ) + SB->CommitCommand(); + else + SB->AbortCommand(); + + //study->updateCaptions(); + updateDesktopTitle(); + updateActions(); +} + +/*!Insert items in popup, which necessary for current application*/ +void SalomeApp_Application::contextMenuPopup( const QString& type, QPopupMenu* thePopup, QString& title ) +{ + LightApp_Application::contextMenuPopup( type, thePopup, title ); + + OB_Browser* ob = objectBrowser(); + if ( !ob || type != ob->popupClientType() ) return; - QStringList modList; - modules( modList, false ); + // Get selected objects + SALOME_ListIO aList; + LightApp_SelectionMgr* mgr = selectionMgr(); + mgr->selectedObjects( aList, QString::null, false ); + + // add GUI state commands: restore, rename + if ( aList.Extent() == 1 && aList.First()->hasEntry() && + QString( aList.First()->getEntry() ).startsWith( tr( "SAVE_POINT_DEF_NAME" ) ) ) { + thePopup->insertSeparator(); + thePopup->insertItem( tr( "MEN_RESTORE_VS" ), this, SLOT( onRestoreGUIState() ) ); + thePopup->insertItem( tr( "MEN_RENAME_VS" ), this, SLOT( onRenameGUIState() ) ); + thePopup->insertItem( tr( "MEN_DELETE_VS" ), this, SLOT( onDeleteGUIState() ) ); + } - for ( QStringList::const_iterator it = modList.begin(); it != modList.end(); ++it ) - { - QString modName = *it; - QString modIntr = moduleName( modName ); - QString modIcon = resMgr->stringValue( modIntr, "icon", QString::null ); + // "Delete reference" item should appear only for invalid references + + // isInvalidRefs will be true, if at least one of selected objects is invalid reference + bool isInvalidRefs = false; + SalomeApp_Study* aStudy = dynamic_cast(activeStudy()); + _PTR(Study) aStudyDS = aStudy->studyDS(); + _PTR(SObject) anObj; - if ( modIcon.isEmpty() ) - continue; + for( SALOME_ListIteratorOfListIO it( aList ); it.More() && !isInvalidRefs; it.Next() ) + if( it.Value()->hasEntry() ) + { + _PTR(SObject) aSObject = aStudyDS->FindObjectID( it.Value()->getEntry() ), aRefObj = aSObject; + while( aRefObj && aRefObj->ReferencedObject( anObj ) ) + aRefObj = anObj; - if ( SUIT_Tools::extension( modIcon ).isEmpty() ) - modIcon += QString( ".png" ); + if( aRefObj && aRefObj!=aSObject && QString( aRefObj->GetName().c_str() ).isEmpty() ) + isInvalidRefs = true; + } - iconMap.insert( modName, modIcon ); + // Add "Delete reference" item to popup + if ( isInvalidRefs ) + { + thePopup->insertSeparator(); + thePopup->insertItem( tr( "MEN_DELETE_INVALID_REFERENCE" ), this, SLOT( onDeleteInvalidReferences() ) ); + return; } + + aList.Clear(); + mgr->selectedObjects( aList ); + + // "Activate module" item should appear only if it's necessary + if (aList.Extent() != 1) + return; + Handle(SALOME_InteractiveObject) aIObj = aList.First(); + // check if item is a "GUI state" item (also a first level object) + QString entry( aIObj->getEntry() ); + if ( entry.startsWith( tr( "SAVE_POINT_DEF_NAME" ) ) ) + return; + QString aModuleName(aIObj->getComponentDataType()); + QString aModuleTitle = moduleTitle(aModuleName); + CAM_Module* currentModule = activeModule(); + if (currentModule && currentModule->moduleName() == aModuleTitle) + return; + if ( !aModuleTitle.isEmpty() ) + thePopup->insertItem( tr( "MEN_OPENWITH" ).arg( aModuleTitle ), this, SLOT( onOpenWith() ) ); } -void SalomeApp_Application::updateModuleActions() +/*!Update obect browser: + 1.if 'updateModels' true, update existing data models; + 2. update "non-existing" (not loaded yet) data models; + 3. update object browser if it exists */ +void SalomeApp_Application::updateObjectBrowser( const bool updateModels ) { - QString modName; - if ( activeModule() ) - modName = activeModule()->moduleName(); + // update "non-existing" (not loaded yet) data models + SalomeApp_Study* study = dynamic_cast(activeStudy()); + if ( study ) + { + _PTR(Study) stdDS = study->studyDS(); + if( stdDS ) + { + for ( _PTR(SComponentIterator) it ( stdDS->NewComponentIterator() ); it->More(); it->Next() ) + { + _PTR(SComponent) aComponent ( it->Value() ); + + if ( aComponent->ComponentDataType() == "Interface Applicative" ) + continue; // skip the magic "Interface Applicative" component + + OB_Browser* ob = static_cast( getWindow( WT_ObjectBrowser )); + const bool isAutoUpdate = ob->isAutoUpdate(); + ob->setAutoUpdate( false ); + SalomeApp_DataModel::synchronize( aComponent, study ); + ob->setAutoUpdate( isAutoUpdate ); + //SalomeApp_DataModel::BuildTree( aComponent, study->root(), study, /*skipExisitng=*/true ); + } + } + } + + // create data objects that correspond to GUI state save points + if ( study ) updateSavePointDataObjects( study ); - if ( myActions.contains( modName ) ) - myActions[modName]->setOn( true ); + // update existing data models (already loaded SComponents) + LightApp_Application::updateObjectBrowser( updateModels ); } -void SalomeApp_Application::currentWindows( QMap& winMap ) const +/*!Display Catalog Genenerator dialog */ +void SalomeApp_Application::onCatalogGen() { - winMap.clear(); - if ( !activeStudy() ) - return; + ToolsGUI_CatalogGeneratorDlg aDlg( desktop() ); + aDlg.exec(); +} - if ( activeModule() && activeModule()->inherits( "SalomeApp_Module" ) ) - ((SalomeApp_Module*)activeModule())->windows( winMap ); - else - defaultWindows( winMap ); +/*!Display Registry Display dialog */ +void SalomeApp_Application::onRegDisplay() +{ + CORBA::ORB_var anOrb = orb(); + ToolsGUI_RegWidget* regWnd = ToolsGUI_RegWidget::GetRegWidget( anOrb, desktop(), "Registry" ); + regWnd->show(); + regWnd->raise(); + regWnd->setActiveWindow(); } -void SalomeApp_Application::currentViewManagers( QStringList& lst ) const +/*!find original object by double click on item */ +void SalomeApp_Application::onDblClick( QListViewItem* it ) { - lst.clear(); - if ( !activeStudy() ) - return; + OB_ListItem* item = dynamic_cast( it ); + SalomeApp_Study* study = dynamic_cast( activeStudy() ); - if ( activeModule() && activeModule()->inherits( "SalomeApp_Module" ) ) - ((SalomeApp_Module*)activeModule())->viewManagers( lst ); - else - defaultViewManagers( lst ); + if( study && item ) + { + SalomeApp_DataObject* obj = dynamic_cast( item->dataObject() ); + if( !obj ) + return; + + QString entry = obj->entry(); + _PTR(SObject) sobj = study->studyDS()->FindObjectID( entry.latin1() ), ref; + + if( sobj && sobj->ReferencedObject( ref ) ) + { + entry = ref->GetID().c_str(); + QListViewItemIterator anIt( item->listView() ); + for( ; anIt.current(); anIt++ ) + { + OB_ListItem* item = dynamic_cast( anIt.current() ); + if( !item ) + continue; + + SalomeApp_DataObject* original = dynamic_cast( item->dataObject() ); + if( original->entry()!=entry ) + continue; + + OB_Browser* br = objectBrowser(); + br->setSelected( original ); + SUIT_DataObject* p = original->parent(); + while( p ) + { + br->setOpen( p ); + p = p->parent(); + } + break; + } + } + } } -void SalomeApp_Application::updateWindows() +/*! + Creates new view manager + \param type - type of view manager +*/ +SUIT_ViewManager* SalomeApp_Application::newViewManager(const QString& type) { - QMap winMap; - currentWindows( winMap ); + return createViewManager(type); +} - for ( QMap::ConstIterator it = winMap.begin(); it != winMap.end(); ++it ) - getWindow( it.key() ); - loadWindowsGeometry(); +/*!Global utility funciton, returns selected GUI Save point object's ID */ +int getSelectedSavePoint( const LightApp_SelectionMgr* selMgr ) +{ + SALOME_ListIO aList; + selMgr->selectedObjects( aList ); + Handle(SALOME_InteractiveObject) aIObj = aList.First(); + QString entry( aIObj->getEntry() ); + QString startStr = QObject::tr( "SAVE_POINT_DEF_NAME" ); + if ( !entry.startsWith( startStr ) ) // it's a "GUI state" object + return -1; + bool ok; // conversion to integer is ok? + int savePoint = entry.right( entry.length() - startStr.length() ).toInt( &ok ); + return ok ? savePoint : -1; +} - for ( WindowMap::ConstIterator itr = myWindows.begin(); itr != myWindows.end(); ++itr ) - setWindowShown( itr.key(), !itr.data()->isEmpty() && winMap.contains( itr.key() ) ); +/*!Called on Restore GUI State popup command*/ +void SalomeApp_Application::onRestoreGUIState() +{ + int savePoint = ::getSelectedSavePoint( selectionMgr() ); + if ( savePoint == -1 ) + return; + SalomeApp_VisualState( this ).restoreState( savePoint ); } -void SalomeApp_Application::updateViewManagers() +/*!Called on Rename GUI State popup command*/ +void SalomeApp_Application::onRenameGUIState() { - QStringList lst; - currentViewManagers( lst ); + int savePoint = ::getSelectedSavePoint( selectionMgr() ); + if ( savePoint == -1 ) + return; + SalomeApp_Study* study = dynamic_cast( activeStudy() ); + if ( !study ) + return; - for ( QStringList::const_iterator it = lst.begin(); it != lst.end(); ++it ) - getViewManager( *it, true ); + QString newName = LightApp_NameDlg::getName( desktop(), study->getNameOfSavePoint( savePoint ) ); + if ( !newName.isNull() && !newName.isEmpty() ) { + study->setNameOfSavePoint( savePoint, newName ); + updateSavePointDataObjects( study ); + objectBrowser()->updateTree( study->root() ); + } } -void SalomeApp_Application::loadWindowsGeometry() + +/*!Called on Delete GUI State popup command*/ +void SalomeApp_Application::onDeleteGUIState() { - QtxDockAction* dockMgr = 0; + int savePoint = ::getSelectedSavePoint( selectionMgr() ); + if ( savePoint == -1 ) + return; + SalomeApp_Study* study = dynamic_cast( activeStudy() ); + if ( !study ) + return; + + study->removeSavePoint( savePoint ); + updateSavePointDataObjects( study ); +} - QAction* a = action( ViewWindowsId ); - if ( a && a->inherits( "QtxDockAction" ) ) - dockMgr = (QtxDockAction*)a; +/*!Called on Save study operation*/ +void SalomeApp_Application::onStudySaved( SUIT_Study* study ) +{ + LightApp_Application::onStudySaved( study ); - if ( !dockMgr ) - return; + if ( objectBrowser() ) { + updateSavePointDataObjects( dynamic_cast( study ) ); + objectBrowser()->updateTree( study->root() ); + } +} - QString modName; - if ( activeModule() ) - modName = moduleLibrary( activeModule()->moduleName(), false ); - - QString section = QString( "windows_geometry" ); - if ( !modName.isEmpty() ) - section += QString( "." ) + modName; +/*!Called on Open study operation*/ +void SalomeApp_Application::onStudyOpened( SUIT_Study* study ) +{ + LightApp_Application::onStudyOpened( study ); - dockMgr->loadGeometry( resourceMgr(), section, false ); - dockMgr->restoreGeometry(); + if ( objectBrowser() ) { + updateSavePointDataObjects( dynamic_cast( study ) ); + objectBrowser()->updateTree( study->root() ); + } } -void SalomeApp_Application::saveWindowsGeometry() +/*! utility function. returns true if list view item that correspond to given SUIT_DataObject is open. + only first level items are traversed */ +bool isListViewItemOpen( QListView* lv, const SUIT_DataObject* dobj ) { - QtxDockAction* dockMgr = 0; + if ( !lv || !dobj ) + return false; - QAction* a = action( ViewWindowsId ); - if ( a && a->inherits( "QtxDockAction" ) ) - dockMgr = (QtxDockAction*)a; + QListViewItem* item = lv->firstChild(); + while ( item ) { + OB_ListItem* ob_item = dynamic_cast( item ); + if ( ob_item && ob_item->dataObject() == dobj ) + return ob_item->isOpen(); + item = item->nextSibling(); + } + return false; +} - if ( !dockMgr ) +/*! updateSavePointDataObjects: syncronize data objects that correspond to save points (gui states)*/ +void SalomeApp_Application::updateSavePointDataObjects( SalomeApp_Study* study ) +{ + OB_Browser* ob = objectBrowser(); + + if ( !study || !ob ) return; - QString modName; - if ( activeModule() ) - modName = moduleLibrary( activeModule()->moduleName(), false ); - - QString section = QString( "windows_geometry" ); - if ( !modName.isEmpty() ) - section += QString( "." ) + modName; + // find GUI states root object + SUIT_DataObject* guiRootObj = 0; + DataObjectList ch; + study->root()->children( ch ); + DataObjectList::const_iterator it = ch.begin(), last = ch.end(); + for ( ; it != last ; ++it ) { + if ( dynamic_cast( *it ) ) { + guiRootObj = *it; + break; + } + } + std::vector savePoints = study->getSavePoints(); + // case 1: no more save points but they existed in study's tree + if ( savePoints.empty() && guiRootObj ) { + delete guiRootObj; + return; + } + // case 2: no more save points but root does not exist either + if ( savePoints.empty() && !guiRootObj ) + return; + // case 3: save points but no root for them - create it + if ( !savePoints.empty() && !guiRootObj ) + guiRootObj = new SalomeApp_SavePointRootObject( study->root() ); + // case 4: everything already exists.. here may be a problem: we want "GUI states" root object + // to be always the last one in the tree. Here we check - if it is not the last one - remove and + // re-create it. + if ( guiRootObj->nextBrother() ) { + study->root()->removeChild(guiRootObj); + study->root()->appendChild(guiRootObj); + //study->root()->dump(); + } - dockMgr->storeGeometry(); - dockMgr->saveGeometry( resourceMgr(), section, false ); + // store data objects in a map id-to-DataObject + QMap mapDO; + ch.clear(); + guiRootObj->children( ch ); + for( it = ch.begin(), last = ch.end(); it != last ; ++it ) { + SalomeApp_SavePointObject* dobj = dynamic_cast( *it ); + if ( dobj ) + mapDO[dobj->getId()] = dobj; + } + + // iterate new save points. if DataObject with such ID not found in map - create DataObject + // if in the map - remove it from map. + for ( int i = 0; i < savePoints.size(); i++ ) + if ( !mapDO.contains( savePoints[i] ) ) + new SalomeApp_SavePointObject( guiRootObj, savePoints[i], study ); + else + mapDO.remove( savePoints[i] ); + + // delete DataObjects that are still in the map -- their IDs were not found in data model + for ( QMap::Iterator it = mapDO.begin(); it != mapDO.end(); ++it ) + delete it.data(); } -void SalomeApp_Application::activateWindows() +/*! Check data object */ +bool SalomeApp_Application::checkDataObject(LightApp_DataObject* theObj) { - if ( activeStudy() ) - { - for ( WindowMap::Iterator itr = myWindows.begin(); itr != myWindows.end(); ++itr ) - itr.data()->activate( activeStudy()->id() ); - } + if (theObj) + return true; + + return false; +} + +/*! Process standard messages from desktop */ +void SalomeApp_Application::onDesktopMessage( const QString& message ) +{ + // update object browser + if ( message.lower() == "updateobjectbrowser" || + message.lower() == "updateobjbrowser" ) + updateObjectBrowser(); } +