#include <STD_TabDesktop.h>
+#include "STD_LoadStudiesDlg.h"
+
#include <SUIT_Tools.h>
#include <SUIT_Session.h>
+#include <SUIT_Accel.h>
#include <QtxToolBar.h>
#include <QtxMRUAction.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include <qapplication.h>
+#include <qlistbox.h>
+#include <qregexp.h>
#include "SALOMEDS_StudyManager.hxx"
#include "SALOME_ListIteratorOfListIO.hxx"
#include "SALOME_ListIO.hxx"
+#include "ToolsGUI_CatalogGeneratorDlg.h"
+#include "ToolsGUI_RegWidget.h"
+
#define OBJECT_BROWSER_WIDTH 300
+/*!Image for empty icon.*/
static const char* imageEmptyIcon[] = {
"20 20 1 1",
". c None",
"....................",
"...................."};
+/*!Create new instance of SalomeApp_Application.*/
extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication()
{
return new SalomeApp_Application();
Description : Application containing SalomeApp module
*/
+/*!Constructor.*/
SalomeApp_Application::SalomeApp_Application()
: CAM_Application( false ),
myPrefs( 0 )
mySelMgr = new SalomeApp_SelectionMgr( this );
+ myAccel = new SUIT_Accel( desktop() );
+ myAccel->setActionKey( SUIT_Accel::PanLeft, CTRL+Key_Left, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanRight, CTRL+Key_Right, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanUp, CTRL+Key_Up, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanDown, CTRL+Key_Down, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomIn, CTRL+Key_Plus, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomOut, CTRL+Key_Minus, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomFit, CTRL+Key_Asterisk, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateLeft, ALT+Key_Left, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateRight, ALT+Key_Right, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateUp, ALT+Key_Up, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateDown, ALT+Key_Down, OCCViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanLeft, CTRL+Key_Left, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanRight, CTRL+Key_Right, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanUp, CTRL+Key_Up, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::PanDown, CTRL+Key_Down, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomIn, CTRL+Key_Plus, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomOut, CTRL+Key_Minus, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::ZoomFit, CTRL+Key_Asterisk, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateLeft, ALT+Key_Left, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateRight, ALT+Key_Right, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateUp, ALT+Key_Up, VTKViewer_Viewer::Type() );
+ myAccel->setActionKey( SUIT_Accel::RotateDown, ALT+Key_Down, VTKViewer_Viewer::Type() );
+
connect( desk, SIGNAL( closing( SUIT_Desktop*, QCloseEvent* ) ),
this, SLOT( onDesktopClosing( SUIT_Desktop*, QCloseEvent* ) ) );
connect( mySelMgr, SIGNAL( selectionChanged() ), this, SLOT( onSelection() ) );
}
+/*!Destructor.
+ *\li Save window geometry.
+ *\li Save desktop geometry.
+ *\li Save resource maneger.
+ *\li Delete selection manager.
+ *\li Destroy event filter.
+ */
SalomeApp_Application::~SalomeApp_Application()
{
saveWindowsGeometry();
SalomeApp_EventFilter::Destroy();
}
+/*!Start application.*/
void SalomeApp_Application::start()
{
if ( desktop() )
putInfo( "" );
}
+/*!Gets application name.*/
QString SalomeApp_Application::applicationName() const
{
return tr( "APP_NAME" );
}
+/*!Gets application version.*/
QString SalomeApp_Application::applicationVersion() const
{
static QString _app_version;
return _app_version;
}
+/*!Load module by \a name.*/
CAM_Module* SalomeApp_Application::loadModule( const QString& name )
{
CAM_Module* mod = CAM_Application::loadModule( name );
return mod;
}
+/*!Activate module by \a modName*/
bool SalomeApp_Application::activateModule( const QString& modName )
{
QString actName;
if ( actName == modName )
return true;
+ putInfo( tr( "ACTIVATING_MODULE" ).arg( modName ) );
+
saveWindowsGeometry();
bool status = CAM_Application::activateModule( modName );
updateModuleActions();
+ putInfo( "" );
+
if ( !status )
return false;
return true;
}
+/*!Gets selection manager.*/
SalomeApp_SelectionMgr* SalomeApp_Application::selectionMgr() const
{
return mySelMgr;
}
+/*!Create actions:*/
void SalomeApp_Application::createActions()
{
STD_Application::createActions();
SUIT_Desktop* desk = desktop();
SUIT_ResourceMgr* resMgr = resourceMgr();
-
- // Dump study
+
+ //! Dump study
createAction( DumpStudyId, tr( "TOT_DESK_FILE_DUMP_STUDY" ), QIconSet(),
tr( "MEN_DESK_FILE_DUMP_STUDY" ), tr( "PRP_DESK_FILE_DUMP_STUDY" ),
0, desk, false, this, SLOT( onDumpStudy() ) );
-
- // Load script
+
+ //! 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() ) );
- // Properties
+ //! Properties
createAction( PropertiesId, tr( "TOT_DESK_PROPERTIES" ), QIconSet(),
tr( "MEN_DESK_PROPERTIES" ), tr( "PRP_DESK_PROPERTIES" ),
0, desk, false, this, SLOT( onProperties() ) );
- // Preferences
+ //! Preferences
createAction( PreferencesId, tr( "TOT_DESK_PREFERENCES" ), QIconSet(),
tr( "MEN_DESK_PREFERENCES" ), tr( "PRP_DESK_PREFERENCES" ),
CTRL+Key_P, desk, false, this, SLOT( onPreferences() ) );
- // MRU
+ //! Catalog Generator
+ createAction( CatalogGenId, tr( "TOT_DESK_CATALOG_GENERATOR" ), QIconSet(),
+ tr( "MEN_DESK_CATALOG_GENERATOR" ), tr( "PRP_DESK_CATALOG_GENERATOR" ),
+ 0, desk, false, this, SLOT( onCatalogGen() ) );
+
+ //! Registry Display
+ createAction( RegDisplayId, tr( "TOT_DESK_REGISTRY_DISPLAY" ), QIconSet(),
+ tr( "MEN_DESK_REGISTRY_DISPLAY" ), tr( "PRP_DESK_REGISTRY_DISPLAY" ),
+ 0, desk, false, this, SLOT( onRegDisplay() ) );
+
+ //! MRU
QtxMRUAction* mru = new QtxMRUAction( tr( "TOT_DESK_MRU" ), tr( "MEN_DESK_MRU" ), desk );
connect( mru, SIGNAL( activated( QString ) ), this, SLOT( onMRUActivated( QString ) ) );
registerAction( MRUId, mru );
- // default icon for neutral point ('SALOME' module)
+ //! default icon for neutral point ('SALOME' module)
QPixmap defIcon = resMgr->loadPixmap( "SalomeApp", tr( "APP_DEFAULT_ICO" ), false );
if ( defIcon.isNull() )
defIcon = QPixmap( imageEmptyIcon );
- // default icon for any module
+ //! default icon for any module
QPixmap modIcon = resMgr->loadPixmap( "SalomeApp", tr( "APP_MODULE_ICO" ), false );
if ( modIcon.isNull() )
modIcon = QPixmap( imageEmptyIcon );
SUIT_Tools::simplifySeparators( modTBar );
- // New window
+ //! New window
int windowMenu = createMenu( tr( "MEN_DESK_WINDOW" ), -1, 100 );
int newWinMenu = createMenu( tr( "MEN_DESK_NEWWINDOW" ), windowMenu, -1, 0 );
createMenu( PreferencesId, fileMenu, 15, -1 );
createMenu( separator(), fileMenu, -1, 15, -1 );
+ int toolsMenu = createMenu( tr( "MEN_DESK_TOOLS" ), -1, -1, 50 );
+ createMenu( CatalogGenId, toolsMenu, 10, -1 );
+ createMenu( RegDisplayId, toolsMenu, 10, -1 );
+ createMenu( separator(), toolsMenu, -1, 15, -1 );
+
/*
createMenu( separator(), fileMenu, -1, 100, -1 );
createMenu( MRUId, fileMenu, 100, -1 );
*/
}
+/*!On module activation action.*/
void SalomeApp_Application::onModuleActivation( QAction* a )
{
if ( !a )
activateModule( modName );
}
+/*!Default module activation.*/
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
+ //! 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() : "" );
}
+/*!On new window slot.*/
void SalomeApp_Application::onNewWindow()
{
const QObject* obj = sender();
}
//=======================================================================
-// name : onNewDoc
-// Purpose : SLOT. Create new document
+// name : onNewDoc
+/*! Purpose : SLOT. Create new document*/
//=======================================================================
void SalomeApp_Application::onNewDoc()
{
//=======================================================================
// name : onOpenDoc
-// Purpose : SLOT. Open new document
+/*! Purpose : SLOT. Open new document*/
//=======================================================================
void SalomeApp_Application::onOpenDoc()
{
}
}
+/*! Purpose : SLOT. Open new document with \a aName.*/
bool SalomeApp_Application::onOpenDoc( const QString& aName )
{
bool res = CAM_Application::onOpenDoc( aName );
return res;
}
+/*!SLOT. Load document.*/
+void SalomeApp_Application::onLoadDoc()
+{
+ QString name, studyname, ext;
+
+ STD_LoadStudiesDlg aDlg( desktop(), TRUE);
+
+ std::vector<std::string> List = studyMgr()->GetOpenStudies();
+
+ SUIT_Session* aSession = SUIT_Session::session();
+ QPtrList<SUIT_Application> aAppList = aSession->applications();
+ SUIT_Application* aApp = 0;
+
+ 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<SUIT_Application> it( aAppList ); it.current() && !isAlreadyOpen; ++it )
+ {
+ aApp = it.current();
+ if(!aApp || !aApp->activeStudy()) continue;
+ if ( aApp->activeStudy()->studyName() == studyname ) isAlreadyOpen = true;
+ }
+
+ if ( !isAlreadyOpen ) aDlg.ListComponent->insertItem( studyname );
+ }
+
+ int retVal = aDlg.exec();
+ studyname = aDlg.ListComponent->currentText();
+
+ if (retVal == QDialog::Rejected)
+ return;
+
+ if ( studyname.isNull() || studyname.isEmpty() )
+ return;
+
+ name = studyname;
+ name.replace( QRegExp(":"), "/" );
+
+ if(onLoadDoc(name)) {
+ updateWindows();
+ updateViewManagers();
+ updateObjectBrowser(true);
+ }
+}
+
+
+/*!SLOT. Load document with \a aName.*/
+bool SalomeApp_Application::onLoadDoc( const QString& aName )
+{
+ bool res = CAM_Application::onLoadDoc( aName );
+
+ /*jfa tmp:QAction* a = action( MRUId );
+ if ( a && a->inherits( "QtxMRUAction" ) )
+ {
+ QtxMRUAction* mru = (QtxMRUAction*)a;
+ if ( res )
+ mru->insert( aName );
+ else
+ mru->remove( aName );
+ }*/
+ return res;
+}
+
+/*!Private SLOT. Selection.*/
void SalomeApp_Application::onSelection()
{
onSelectionChanged();
((SalomeApp_Module*)activeModule())->selectionChanged();
}
-void SalomeApp_Application::onCopy()
+/*!SLOT. Copy objects to study maneger from selection maneger..*/
+void SalomeApp_Application::onCopy()
{
SALOME_ListIO list;
SalomeApp_SelectionMgr* mgr = selectionMgr();
mgr->selectedObjects(list);
-
+
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(activeStudy());
if(study == NULL) return;
-
+
_PTR(Study) stdDS = study->studyDS();
if(!stdDS) return;
- SALOME_ListIteratorOfListIO it( list );
+ SALOME_ListIteratorOfListIO it( list );
if(it.More())
{
_PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
}
}
-void SalomeApp_Application::onPaste()
+/*!SLOT. Paste objects to study maneger from selection manager.*/
+void SalomeApp_Application::onPaste()
{
SALOME_ListIO list;
SalomeApp_SelectionMgr* mgr = selectionMgr();
mgr->selectedObjects(list);
-
+
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(activeStudy());
if(study == NULL) return;
-
+
_PTR(Study) stdDS = study->studyDS();
if(!stdDS) return;
-
- SALOME_ListIteratorOfListIO it( list );
+
+ 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(...) {
}
}
}
+/*!Sets enable or disable some actions on selection changed.*/
void SalomeApp_Application::onSelectionChanged()
{
SALOME_ListIO list;
SalomeApp_SelectionMgr* mgr = selectionMgr();
mgr->selectedObjects(list);
-
+
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(activeStudy());
if(study == NULL) return;
-
+
_PTR(Study) stdDS = study->studyDS();
if(!stdDS) return;
-
- QAction* qaction;
- SALOME_ListIteratorOfListIO it( list );
+ QAction* qaction;
+
+ SALOME_ListIteratorOfListIO it( list );
if(it.More() && list.Extent() == 1)
{
_PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
- qaction = action(EditCopyId);
- if(studyMgr()->CanCopy(so) ) qaction->setEnabled(true);
- else qaction->setEnabled(false);
-
+ qaction = action(EditCopyId);
+ if(studyMgr()->CanCopy(so) ) qaction->setEnabled(true);
+ else qaction->setEnabled(false);
+
qaction = action(EditPasteId);
if( studyMgr()->CanPaste(so) ) qaction->setEnabled(true);
else qaction->setEnabled(false);
- }
+ }
else {
- qaction = action(EditCopyId);
- qaction->setEnabled(false);
+ qaction = action(EditCopyId);
+ qaction->setEnabled(false);
qaction = action(EditPasteId);
qaction->setEnabled(false);
}
-}
-
+}
+
+/*!Update object browser.*/
void SalomeApp_Application::onRefresh()
{
updateObjectBrowser( true );
}
-
+/*!Delete references.*/
+void SalomeApp_Application::onDeleteReferences()
+{
+ SALOME_ListIO aList;
+ SalomeApp_SelectionMgr* mgr = selectionMgr();
+ mgr->selectedObjects(aList);
+
+ if (aList.Extent() < 1) return;
+
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(activeStudy());
+ _PTR(Study) aStudyDS = aStudy->studyDS();
+ _PTR(StudyBuilder) aStudyBuilder = aStudyDS->NewBuilder();
+ _PTR(SObject) anObj;
+
+ for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() )
+ {
+ if ( it.Value()->hasEntry() )
+ {
+ _PTR(SObject) aSObject = aStudyDS->FindObjectID( it.Value()->getEntry() );
+ if ( aSObject->ReferencedObject(anObj) )
+ aStudyBuilder->RemoveReference(aSObject);
+ }
+ }
+
+ updateObjectBrowser();
+}
+
+/*!Private SLOT. */
void SalomeApp_Application::onOpenWith()
{
QApplication::setOverrideCursor( Qt::waitCursor );
QApplication::restoreOverrideCursor();
}
+bool SalomeApp_Application::useStudy(const QString& theName)
+{
+ createEmptyStudy();
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(activeStudy());
+ bool res = false;
+ if (aStudy)
+ res = aStudy->loadDocument( theName );
+ updateDesktopTitle();
+ updateCommandsStatus();
+ return res;
+}
+
+/*!Set active study.
+ *\param study - SUIT_Study.
+ */
void SalomeApp_Application::setActiveStudy( SUIT_Study* study )
{
CAM_Application::setActiveStudy( study );
//=======================================================================
// name : createNewStudy
-// Purpose : Create new study
+/*! Purpose : Create new study*/
//=======================================================================
SUIT_Study* SalomeApp_Application::createNewStudy()
{
//=======================================================================
// name : createNewStudy
-// Purpose : Enable/Disable menu items and toolbar buttons. Rebuild menu
+/*! Purpose : Enable/Disable menu items and toolbar buttons. Rebuild menu*/
//=======================================================================
void SalomeApp_Application::updateCommandsStatus()
{
a = action( LoadScriptId );
if ( a )
a->setEnabled( activeStudy() );
-
+
a = action( PropertiesId );
if( a )
a->setEnabled( activeStudy() );
-
+
a = action(EditCopyId);
- a->setEnabled(false);
+ a->setEnabled(false);
a = action(EditPasteId);
- a->setEnabled(false);
+ a->setEnabled(false);
}
//=======================================================================
// name : onHelpAbout
-// Purpose : SLOT. Display "About" message box
+/*! Purpose : SLOT. Display "About" message box*/
//=======================================================================
void SalomeApp_Application::onHelpAbout()
{
return wid;
}
+/*!Adds window to application.
+ *\param wid - QWidget
+ *\param flag - key wor window
+ *\param studyId - study id
+ * Flag used how identificator of window in windows list.
+ */
void SalomeApp_Application::addWindow( QWidget* wid, const int flag, const int studyId )
{
if ( !wid )
myWindows[flag]->setName( QString( "dock_window_%1" ).arg( flag ) );
}
+ QFont f;
+ if( wid->inherits( "PythonConsole" ) )
+ f = ( ( PythonConsole* )wid )->font();
+ else
+ f = wid->font();
+
myWindows[flag]->insert( sId, wid );
+ wid->setFont( f );
setWindowShown( flag, !myWindows[flag]->isEmpty() );
}
+/*!Remove window from application.
+ *\param flag - key wor window
+ *\param studyId - study id
+ * Flag used how identificator of window in windows list.
+ */
void SalomeApp_Application::removeWindow( const int flag, const int studyId )
{
if ( !myWindows.contains( flag ) )
setWindowShown( flag, !myWindows[flag]->isEmpty() );
}
+/*!Gets window.
+ *\param flag - key wor window
+ *\param studyId - study id
+ * Flag used how identificator of window in windows list.
+ */
QWidget* SalomeApp_Application::getWindow( const int flag, const int studyId )
{
QWidget* wid = window( flag, studyId );
return wid;
}
+/*!Check is window visible?(with identificator \a type)*/
bool SalomeApp_Application::isWindowVisible( const int type ) const
{
bool res = false;
return res;
}
+/*!Sets window show or hide.
+ *\param type - window identificator.
+ *\param on - true/false (window show/hide)
+ */
void SalomeApp_Application::setWindowShown( const int type, const bool on )
{
if ( !desktop() || !myWindows.contains( type ) )
return ob;
}
+/*!Gets "LogWindow".*/
LogWindow* SalomeApp_Application::logWindow()
{
LogWindow* lw = 0;
return lw;
}
+/*!Get "PythonConsole"*/
PythonConsole* SalomeApp_Application::pythonConsole()
{
PythonConsole* console = 0;
return console;
}
+/*!Gets preferences.*/
SalomeApp_Preferences* SalomeApp_Application::preferences() const
{
return preferences( false );
}
+/*!Gets view manager*/
SUIT_ViewManager* SalomeApp_Application::getViewManager( const QString& vmType, const bool create )
{
SUIT_ViewManager* aVM = viewManager( vmType );
return aVM;
}
+/*!Create view manager.*/
SUIT_ViewManager* SalomeApp_Application::createViewManager( const QString& vmType )
{
SUIT_ResourceMgr* resMgr = resourceMgr();
vm->isos( u, v );
u = resMgr->integerValue( "OCCViewer", "iso_number_u", u );
v = resMgr->integerValue( "OCCViewer", "iso_number_v", v );
- // vm->setIsos( u, v );
+ vm->setIsos( u, v );
viewMgr->setViewModel( vm );// custom view model, which extends SALOME_View interface
new SalomeApp_OCCSelector( (OCCViewer_Viewer*)viewMgr->getViewModel(), mySelMgr );
}
removeViewManager( theVM );
}
+/*!Private SLOT. On study created.*/
void SalomeApp_Application::onStudyCreated( SUIT_Study* theStudy )
{
SUIT_DataObject* aRoot = 0;
activateWindows();
}
+/*!Private SLOT. On study opened.*/
void SalomeApp_Application::onStudyOpened( SUIT_Study* theStudy )
{
SUIT_DataObject* aRoot = 0;
emit studySaved();
}
+/*!Private SLOT. On study closed.*/
void SalomeApp_Application::onStudyClosed( SUIT_Study* )
{
emit studyClosed();
saveWindowsGeometry();
}
+/*!Private SLOT. On dump study.*/
void SalomeApp_Application::onDumpStudy( )
{
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( activeStudy() );
SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( desktop(), false, tr("PUBLISH_IN_STUDY"), true, true);
fd->setCaption( tr( "TOT_DESK_FILE_DUMP_STUDY" ) );
- fd->setFilters( aFilters );
+ fd->setFilters( aFilters );
fd->SetChecked(true);
fd->exec();
QString aFileName = fd->selectedFile();
}
}
+/*!Private SLOT. On load script.*/
void SalomeApp_Application::onLoadScript( )
{
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( activeStudy() );
}
}
+/*!Private SLOT. On preferences.*/
void SalomeApp_Application::onPreferences()
{
QApplication::setOverrideCursor( Qt::waitCursor );
delete prefDlg;
}
+/*!Private SLOT. On open document with name \a aName.*/
void SalomeApp_Application::onMRUActivated( QString aName )
{
onOpenDoc( aName );
}
+/*!Private SLOT. On preferences changed.*/
void SalomeApp_Application::onPreferenceChanged( QString& modName, QString& section, QString& param )
{
SalomeApp_Module* sMod = 0;
preferencesChanged( section, param );
}
+/*!Gets file filter.
+ *\retval QString "(*.hdf)"
+ */
QString SalomeApp_Application::getFileFilter() const
{
return "(*.hdf)";
}
+/*!Remove all windows from study.*/
void SalomeApp_Application::beforeCloseDoc( SUIT_Study* s )
{
CAM_Application::beforeCloseDoc( s );
removeWindow( itr.key(), s->id() );
}
+/*!Update actions.*/
void SalomeApp_Application::updateActions()
{
updateCommandsStatus();
}
+/*!Create window.*/
QWidget* SalomeApp_Application::createWindow( const int flag )
{
QWidget* wid = 0;
ob->setNameTitle( tr( "OBJ_BROWSER_NAME" ) );
+ bool autoSize = resMgr->booleanValue( "ObjectBrowser", "auto_size", false );
for ( int i = SalomeApp_DataObject::CT_Value; i <= SalomeApp_DataObject::CT_RefEntry; i++ )
{
ob->addColumn( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), i );
ob->setColumnShown( i, resMgr->booleanValue( "ObjectBrowser",
QString().sprintf( "visibility_column_%d", i ), true ) );
}
+ ob->setWidthMode( autoSize ? QListView::Maximum : QListView::Manual );
// Create OBSelector
new SalomeApp_OBSelector( ob, mySelMgr );
{
PythonConsole* pyCons = new PythonConsole( desktop(), new SalomeApp_PyInterp() );
pyCons->setCaption( tr( "PYTHON_CONSOLE" ) );
+ pyCons->setFont( resMgr->fontValue( "PyConsole", "font" ) );
wid = pyCons;
// pyCons->connectPopupRequest( this, SLOT( onConnectPopupRequest( SUIT_PopupClient*, QContextMenuEvent* ) ) );
return wid;
}
+/*!Default windows(Object Browser, Python Console).
+ * Adds to map \a aMap.
+ */
void SalomeApp_Application::defaultWindows( QMap<int, int>& aMap ) const
{
aMap.insert( WT_ObjectBrowser, Qt::DockLeft );
// aMap.insert( WT_LogWindow, Qt::DockBottom );
}
+/*!Default view manager.*/
void SalomeApp_Application::defaultViewManagers( QStringList& ) const
{
+ /*!Do nothing.*/
}
+/*!Gets preferences.
+ * Create preferences, if \a crt = true.
+ */
SalomeApp_Preferences* SalomeApp_Application::preferences( const bool crt ) const
{
if ( myPrefs )
for ( QStringList::const_iterator it = modNameList.begin(); it != modNameList.end(); ++it )
{
int id = _prefs_->addPreference( *it );
- _prefs_->setProperty( id, "info", tr( "PREFERENCES_NOT_LOADED" ).arg( *it ) );
+ _prefs_->setItemProperty( id, "info", tr( "PREFERENCES_NOT_LOADED" ).arg( *it ) );
}
ModuleList modList;
mod = (SalomeApp_Module*)itr.current();
if ( mod && !_prefs_->hasModule( mod->moduleName() ) )
+ {
+ int modCat = _prefs_->addPreference( mod->moduleName() );
+ _prefs_->setItemProperty( modCat, "info", QString::null );
mod->createPreferences();
+ }
}
}
return myPrefs;
}
+/*!Add new module to application.*/
void SalomeApp_Application::moduleAdded( CAM_Module* mod )
{
CAM_Application::moduleAdded( mod );
if ( mod && mod->inherits( "SalomeApp_Module" ) )
salomeMod = (SalomeApp_Module*)mod;
- if ( myPrefs && salomeMod && !myPrefs->hasModule( salomeMod->moduleName() ))
+ if ( myPrefs && salomeMod && !myPrefs->hasModule( salomeMod->moduleName() ) )
+ {
+ int modCat = myPrefs->addPreference( mod->moduleName() );
+ myPrefs->setItemProperty( modCat, "info", QString::null );
salomeMod->createPreferences();
+ }
}
+/*!Create preferences.*/
void SalomeApp_Application::createPreferences( SalomeApp_Preferences* pref )
{
if ( !pref )
int salomeCat = pref->addPreference( tr( "PREF_CATEGORY_SALOME" ) );
int genTab = pref->addPreference( tr( "PREF_TAB_GENERAL" ), salomeCat );
+ int studyGroup = pref->addPreference( tr( "PREF_GROUP_STUDY" ), genTab );
+ pref->setItemProperty( studyGroup, "columns", 1 );
+
+ pref->addPreference( tr( "PREF_MULTI_FILE" ), studyGroup, SalomeApp_Preferences::Bool, "Study", "multi_file" );
+ pref->addPreference( tr( "PREF_ASCII_FILE" ), studyGroup, SalomeApp_Preferences::Bool, "Study", "ascii_file" );
+ int undoPref = pref->addPreference( tr( "PREF_UNDO_LEVEL" ), studyGroup, SalomeApp_Preferences::IntSpin, "Study", "undo_level" );
+ pref->setItemProperty( undoPref, "min", 1 );
+ pref->setItemProperty( undoPref, "max", 100 );
+
+ int extgroup = pref->addPreference( tr( "PREF_GROUP_EXT_BROWSER" ), genTab );
+ pref->setItemProperty( extgroup, "columns", 1 );
+ int apppref = pref->addPreference( tr( "PREF_APP" ), extgroup, SalomeApp_Preferences::File, "ExternalBrowser", "application" );
+ pref->setItemProperty( apppref, "existing", true );
+ pref->setItemProperty( apppref, "flags", QFileInfo::ExeUser );
+
+ pref->addPreference( tr( "PREF_PARAM" ), extgroup, SalomeApp_Preferences::String, "ExternalBrowser", "parameters" );
- int obGroup = pref->addPreference( tr( "PREF_GROUP_OBJBROWSER" ), genTab );
+ int pythonConsoleGroup = pref->addPreference( tr( "PREF_GROUP_PY_CONSOLE" ), genTab );
+ pref->setItemProperty( pythonConsoleGroup, "columns", 1 );
+ pref->addPreference( tr( "PREF_FONT" ), pythonConsoleGroup, SalomeApp_Preferences::Font, "PyConsole", "font" );
+
+
+
+ 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++ )
{
- pref->addPreference( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), obGroup,
+ pref->addPreference( tr( QString().sprintf( "OBJ_BROWSER_COLUMN_%d", i ) ), defCols,
SalomeApp_Preferences::Bool, "ObjectBrowser", QString().sprintf( "visibility_column_%d", i ) );
}
- pref->setProperty( obGroup, "columns", 1 );
+ pref->setItemProperty( defCols, "columns", 1 );
+
+ int objSetGroup = pref->addPreference( tr( "PREF_OBJ_BROWSER_SETTINGS" ), obTab );
+ pref->addPreference( tr( "PREF_AUTO_SIZE" ), objSetGroup, SalomeApp_Preferences::Bool, "ObjectBrowser", "auto_size" );
int viewTab = pref->addPreference( tr( "PREF_TAB_VIEWERS" ), salomeCat );
int occGroup = pref->addPreference( tr( "PREF_GROUP_OCCVIEWER" ), viewTab );
int vtkGroup = pref->addPreference( tr( "PREF_GROUP_VTKVIEWER" ), viewTab );
- pref->setProperty( occGroup, "columns", 1 );
- pref->setProperty( vtkGroup, "columns", 1 );
+
+ int plot2dGroup = pref->addPreference( tr( "PREF_GROUP_PLOT2DVIEWER" ), viewTab );
+
+ pref->setItemProperty( occGroup, "columns", 1 );
+ pref->setItemProperty( vtkGroup, "columns", 1 );
+ pref->setItemProperty( plot2dGroup, "columns", 1 );
int occTS = pref->addPreference( tr( "PREF_TRIHEDRON_SIZE" ), occGroup,
SalomeApp_Preferences::IntSpin, "OCCViewer", "trihedron_size" );
pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), occGroup,
SalomeApp_Preferences::Color, "OCCViewer", "background" );
- pref->setProperty( occTS, "min", 1 );
- pref->setProperty( occTS, "max", 150 );
+ pref->setItemProperty( occTS, "min", 1 );
+ pref->setItemProperty( occTS, "max", 150 );
int isoU = pref->addPreference( tr( "PREF_ISOS_U" ), occGroup,
SalomeApp_Preferences::IntSpin, "OCCViewer", "iso_number_u" );
int isoV = pref->addPreference( tr( "PREF_ISOS_V" ), occGroup,
SalomeApp_Preferences::IntSpin, "OCCViewer", "iso_number_v" );
- pref->setProperty( isoU, "min", 0 );
- pref->setProperty( isoU, "max", 100000 );
+ pref->setItemProperty( isoU, "min", 0 );
+ pref->setItemProperty( isoU, "max", 100000 );
- pref->setProperty( isoV, "min", 0 );
- pref->setProperty( isoV, "max", 100000 );
+ pref->setItemProperty( isoV, "min", 0 );
+ pref->setItemProperty( isoV, "max", 100000 );
int vtkTS = pref->addPreference( tr( "PREF_TRIHEDRON_SIZE" ), vtkGroup,
SalomeApp_Preferences::IntSpin, "VTKViewer", "trihedron_size" );
pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), vtkGroup,
SalomeApp_Preferences::Color, "VTKViewer", "background" );
- pref->setProperty( vtkTS, "min", 1 );
- pref->setProperty( vtkTS, "max", 150 );
+ pref->setItemProperty( vtkTS, "min", 1 );
+ pref->setItemProperty( vtkTS, "max", 150 );
+
+ pref->addPreference( tr( "PREF_SHOW_LEGEND" ), plot2dGroup,
+ SalomeApp_Preferences::Bool, "Plot2d", "ShowLegend" );
+
+ int legendPosition = pref->addPreference( tr( "PREF_LEGEND_POSITION" ), plot2dGroup,
+ SalomeApp_Preferences::Selector, "Plot2d", "LegendPos" );
+ QStringList aLegendPosList;
+ aLegendPosList.append( tr("PREF_LEFT") );
+ aLegendPosList.append( tr("PREF_RIGHT") );
+ aLegendPosList.append( tr("PREF_TOP") );
+ aLegendPosList.append( tr("PREF_BOTTOM") );
+
+ QValueList<QVariant> anIndexesList;
+ anIndexesList.append(0);
+ anIndexesList.append(1);
+ anIndexesList.append(2);
+ anIndexesList.append(3);
+
+ pref->setItemProperty( legendPosition, "strings", aLegendPosList );
+ pref->setItemProperty( legendPosition, "indexes", anIndexesList );
+
+ int curveType = pref->addPreference( tr( "PREF_CURVE_TYPE" ), plot2dGroup,
+ SalomeApp_Preferences::Selector, "Plot2d", "CurveType" );
+ QStringList aCurveTypesList;
+ aCurveTypesList.append( tr("PREF_POINTS") );
+ aCurveTypesList.append( tr("PREF_LINES") );
+ aCurveTypesList.append( tr("PREF_SPLINE") );
+
+ anIndexesList.clear();
+ anIndexesList.append(0);
+ anIndexesList.append(1);
+ anIndexesList.append(2);
+
+ pref->setItemProperty( curveType, "strings", aCurveTypesList );
+ pref->setItemProperty( curveType, "indexes", anIndexesList );
+
+ int markerSize = pref->addPreference( tr( "PREF_MARKER_SIZE" ), plot2dGroup,
+ SalomeApp_Preferences::IntSpin, "Plot2d", "MarkerSize" );
+
+ pref->setItemProperty( markerSize, "min", 0 );
+ pref->setItemProperty( markerSize, "max", 100 );
+
+ QStringList aScaleModesList;
+ aScaleModesList.append( tr("PREF_LINEAR") );
+ aScaleModesList.append( tr("PREF_LOGARITHMIC") );
+
+ anIndexesList.clear();
+ anIndexesList.append(0);
+ anIndexesList.append(1);
+
+ int horScale = pref->addPreference( tr( "PREF_HOR_AXIS_SCALE" ), plot2dGroup,
+ SalomeApp_Preferences::Selector, "Plot2d", "HorScaleMode" );
+
+ pref->setItemProperty( horScale, "strings", aScaleModesList );
+ pref->setItemProperty( horScale, "indexes", anIndexesList );
+
+ int verScale = pref->addPreference( tr( "PREF_VERT_AXIS_SCALE" ), plot2dGroup,
+ SalomeApp_Preferences::Selector, "Plot2d", "VerScaleMode" );
+
+ pref->setItemProperty( verScale, "strings", aScaleModesList );
+ pref->setItemProperty( verScale, "indexes", anIndexesList );
+
+ pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), plot2dGroup,
+ SalomeApp_Preferences::Color, "Plot2d", "Background" );
+
+ int dirTab = pref->addPreference( tr( "PREF_TAB_DIRECTORIES" ), salomeCat );
+ int dirGroup = pref->addPreference( tr( "PREF_GROUP_DIRECTORIES" ), dirTab );
+ pref->setItemProperty( dirGroup, "columns", 1 );
+ pref->addPreference( tr( "" ), dirGroup,
+ SalomeApp_Preferences::DirList, "FileDlg", "QuickDirList" );
}
void SalomeApp_Application::preferencesChanged( const QString& sec, const QString& param )
vtkVM->Repaint();
}
}
- /*
+
if ( sec == QString( "OCCViewer" ) && ( param == QString( "iso_number_u" ) || param == QString( "iso_number_v" ) ) )
{
QPtrList<SUIT_ViewManager> lst;
for ( QPtrListIterator<SUIT_ViewManager> it( lst ); it.current(); ++it )
((OCCViewer_Viewer*)it.current())->setIsos( u, v );
}
- */
+
+ if( sec=="ObjectBrowser" )
+ {
+ if( param=="auto_size" )
+ {
+ OB_Browser* ob = objectBrowser();
+ if( !ob )
+ return;
+
+ bool autoSize = resMgr->booleanValue( "ObjectBrowser", "auto_size", false );
+ ob->setWidthMode( autoSize ? QListView::Maximum : QListView::Manual );
+
+ updateObjectBrowser( false );
+ }
+ }
+
+ if( sec=="PyConsole" )
+ {
+ if( param=="font" )
+ if( pythonConsole() )
+ pythonConsole()->setFont( resMgr->fontValue( "PyConsole", "font" ) );
+ }
+}
+
+/*!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<SalomeApp_Study*>(activeStudy());
+ _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 );
+ }
+ }
+ }
+ }
+
+ desktop()->setCaption( aTitle );
}
+/*!Update windows after close document.*/
void SalomeApp_Application::afterCloseDoc()
{
updateWindows();
CAM_Application::afterCloseDoc();
}
+/*!Gets CORBA::ORB_var*/
CORBA::ORB_var SalomeApp_Application::orb()
{
ORB_INIT& init = *SINGLETON_<ORB_INIT>::Instance();
return _orb;
}
+/*!Create and return SALOMEDS_StudyManager.*/
SALOMEDSClient_StudyManager* SalomeApp_Application::studyMgr()
{
static SALOMEDSClient_StudyManager* _sm = new SALOMEDS_StudyManager();
return _sm;
}
+/*!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() );
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 ) )
return anIOR;
}
+/*!Adds icon names for modules.*/
void SalomeApp_Application::moduleIconNames( QMap<QString, QString>& iconMap ) const
{
iconMap.clear();
}
}
+/*!Update module action.*/
void SalomeApp_Application::updateModuleActions()
{
QString modName;
myActions[modName]->setOn( true );
}
+/*!Gets current windows.
+ *\param winMap - output current windows map.
+ */
void SalomeApp_Application::currentWindows( QMap<int, int>& winMap ) const
{
winMap.clear();
defaultWindows( winMap );
}
+/*!Gets current view managers.
+ *\param lst - output current view managers list.
+ */
void SalomeApp_Application::currentViewManagers( QStringList& lst ) const
{
lst.clear();
defaultViewManagers( lst );
}
+/*!Update windows.*/
void SalomeApp_Application::updateWindows()
{
QMap<int, int> winMap;
setWindowShown( itr.key(), !itr.data()->isEmpty() && winMap.contains( itr.key() ) );
}
+/*!Update view managers.*/
void SalomeApp_Application::updateViewManagers()
{
QStringList lst;
getViewManager( *it, true );
}
+/*!Load windows geometry.*/
void SalomeApp_Application::loadWindowsGeometry()
{
QtxDockAction* dockMgr = 0;
dockMgr->restoreGeometry();
}
+/*!Save windows geometry.*/
void SalomeApp_Application::saveWindowsGeometry()
{
QtxDockAction* dockMgr = 0;
dockMgr->saveGeometry( resourceMgr(), section, false );
}
+/*!Activate windows.*/
void SalomeApp_Application::activateWindows()
{
if ( activeStudy() )
}
}
+/*!Private SLOT. On preferences.*/
void SalomeApp_Application::onProperties()
{
SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( activeStudy() );
SB->AbortCommand();
//study->updateCaptions();
+ updateDesktopTitle();
}
-QString SalomeApp_Application::getFileName( bool open, const QString& initial, const QString& filters,
+/*!*/
+QString SalomeApp_Application::getFileName( bool open, const QString& initial, const QString& filters,
const QString& caption, QWidget* parent )
{
if ( !parent )
return SUIT_FileDlg::getFileName( parent, initial, fls, caption, open, true );
}
+/*!*/
QString SalomeApp_Application::getDirectory( const QString& initial, const QString& caption, QWidget* parent )
{
if ( !parent )
return SUIT_FileDlg::getExistingDirectory( parent, initial, caption, true );
}
-QStringList SalomeApp_Application::getOpenFileNames( const QString& initial, const QString& filters,
+/*!*/
+QStringList SalomeApp_Application::getOpenFileNames( const QString& initial, const QString& filters,
const QString& caption, QWidget* parent )
{
if ( !parent )
return SUIT_FileDlg::getOpenFileNames( parent, initial, fls, caption, true );
}
+/*!*/
void SalomeApp_Application::contextMenuPopup( const QString& type, QPopupMenu* thePopup, QString& title )
{
CAM_Application::contextMenuPopup( type, thePopup, title );
- thePopup->insertSeparator();
- thePopup->insertItem( tr( "MEN_REFRESH" ), this, SLOT( onRefresh() ) );
-
- // "Activate module" item should appear only if it's necessary
+
OB_Browser* ob = objectBrowser();
if ( !ob || type != ob->popupClientType() )
return;
+
+ thePopup->insertSeparator();
+ thePopup->insertItem( tr( "MEN_REFRESH" ), this, SLOT( onRefresh() ) );
+
+ // Get selected objects
SALOME_ListIO aList;
SalomeApp_SelectionMgr* mgr = selectionMgr();
mgr->selectedObjects(aList);
+
+ // "Delete reference" item should appear only for invalid references
+
+ // Check if selected objects is invalid references
+ bool isInvalidRefs = true;
+
+ if ( aList.Extent() < 1 )
+ isInvalidRefs = false;
+
+ if ( isInvalidRefs )
+ {
+ SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(activeStudy());
+ _PTR(Study) aStudyDS = aStudy->studyDS();
+ _PTR(SObject) anObj;
+
+ for ( SALOME_ListIteratorOfListIO it( aList ); it.More() && isInvalidRefs; it.Next() )
+ {
+ if ( it.Value()->hasEntry() )
+ {
+ _PTR(SObject) aSObject = aStudyDS->FindObjectID( it.Value()->getEntry() );
+ if ( aSObject->ReferencedObject(anObj) == false || !QString(anObj->GetName().c_str()).isEmpty() )
+ isInvalidRefs = false;
+ }
+ }
+ }
+
+ // Add "Delete refrence" item to popup
+ if ( isInvalidRefs )
+ {
+ thePopup->insertSeparator();
+ thePopup->insertItem( tr( "MEN_DELETE_REFERENCE" ), this, SLOT( onDeleteReferences() ) );
+ return;
+ }
+
+ // "Activate module" item should appear only if it's necessary
if (aList.Extent() != 1)
return;
Handle(SALOME_InteractiveObject) aIObj = aList.First();
if (currentModule && currentModule->moduleName() == aModuleTitle)
return;
thePopup->insertItem( tr( "MEN_OPENWITH" ), this, SLOT( onOpenWith() ) );
+
}
+/*!Update obect browser*/
void SalomeApp_Application::updateObjectBrowser( const bool updateModels )
{
- if ( updateModels )
+ // update existing data models (already loaded SComponents)
+ if ( updateModels )
{
for ( ModuleListIterator it = modules(); it.current(); ++it )
- {
+ {
CAM_DataModel* camDM = it.current()->dataModel();
if ( camDM && camDM->inherits( "SalomeApp_DataModel" ) )
((SalomeApp_DataModel*)camDM)->update();
}
}
+ // update "non-existing" (not loaded yet) data models
+ SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>(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
+
+ SalomeApp_DataModel::BuildTree( aComponent, study->root(), study, /*skipExisitng=*/true );
+ }
+ }
+ }
+
+ if ( objectBrowser() )
+ {
+ objectBrowser()->updateGeometry();
+ objectBrowser()->updateTree();
+ }
+}
+
+/*!Protected SLOT.On desktop activated.*/
+void SalomeApp_Application::onDesktopActivated()
+{
+ CAM_Application::onDesktopActivated();
+ SalomeApp_Module* aModule = dynamic_cast<SalomeApp_Module*>(activeModule());
+ if(aModule)
+ aModule->studyActivated();
+}
+
+/*!Create empty study.*/
+void SalomeApp_Application::createEmptyStudy()
+{
+ CAM_Application::createEmptyStudy();
+ if ( objectBrowser() )
+ objectBrowser()->updateTree();
+}
+
+/*!Activate module \a mod.*/
+bool SalomeApp_Application::activateModule( CAM_Module* mod )
+{
+ bool res = CAM_Application::activateModule( mod );
if ( objectBrowser() )
objectBrowser()->updateTree();
+ return res;
+}
+
+/*!Display Catalog Genenerator dialog */
+void SalomeApp_Application::onCatalogGen()
+{
+ ToolsGUI_CatalogGeneratorDlg aDlg( desktop() );
+ aDlg.exec();
+}
+
+/*!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();
+}
+
+/*!return keyborad accelerators manager object */
+SUIT_Accel* SalomeApp_Application::accel() const
+{
+ return myAccel;
}
