Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyrights
[modules/med.git]
/
src
/
MEDCalc
/
gui
/
MEDModule.cxx
diff --git
a/src/MEDCalc/gui/MEDModule.cxx
b/src/MEDCalc/gui/MEDModule.cxx
index 8a613447850d24cbc4b91a7bac4d89c2b7e63694..81f42e91915665f1f6bf8ccfaecdfc1781759242 100644
(file)
--- a/
src/MEDCalc/gui/MEDModule.cxx
+++ b/
src/MEDCalc/gui/MEDModule.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
7
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-58,10
+58,11
@@
MED_ORB::MED_Gen_var MEDModule::_MED_engine;
MEDModule::MEDModule() :
MED_ORB::MED_Gen_var MEDModule::_MED_engine;
MEDModule::MEDModule() :
- SalomeApp_Module("
MED
"), _studyEditor(0),
+ SalomeApp_Module("
FIELDS
"), _studyEditor(0),
_datasourceController(0), _workspaceController(0), _presentationController(0),
_processingController(0), _pvGuiElements(0)
{
_datasourceController(0), _workspaceController(0), _presentationController(0),
_processingController(0), _pvGuiElements(0)
{
+ STDLOG("MEDModule::MEDModule()");
// Note also that we can't use the getApp() function here because
// the initialize(...) function has not been called yet.
// Note also that we can't use the getApp() function here because
// the initialize(...) function has not been called yet.
@@
-98,15
+99,15
@@
MEDModule::engine()
void
MEDModule::init()
{
void
MEDModule::init()
{
- // initialize
MED
module engine (load, if necessary)
+ // initialize
FIELDS
module engine (load, if necessary)
if ( CORBA::is_nil( _MED_engine ) ) {
Engines::EngineComponent_var comp =
if ( CORBA::is_nil( _MED_engine ) ) {
Engines::EngineComponent_var comp =
- SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "
MED
" );
+ SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "
FIELDS
" );
if (CORBA::is_nil( comp ))
if (CORBA::is_nil( comp ))
- STDLOG("Could not FindOrLoad_Component
MED
");
+ STDLOG("Could not FindOrLoad_Component
FIELDS
");
_MED_engine = MED_ORB::MED_Gen::_narrow( comp );
if (CORBA::is_nil( _MED_engine ))
_MED_engine = MED_ORB::MED_Gen::_narrow( comp );
if (CORBA::is_nil( _MED_engine ))
- STDLOG("Could not narrow
MED
engine");
+ STDLOG("Could not narrow
FIELDS
engine");
}
}
}
}
@@
-122,9
+123,13
@@
MEDModule::init()
void
MEDModule::initialize( CAM_Application* app )
{
void
MEDModule::initialize( CAM_Application* app )
{
+ STDLOG("MEDModule::initialize()");
// call the parent implementation
SalomeApp_Module::initialize( app );
// call the parent implementation
SalomeApp_Module::initialize( app );
+ if (! getApp()->objectBrowser())
+ getApp()->getWindow(SalomeApp_Application::WT_ObjectBrowser);
+
getApp()->objectBrowser()->setAutoOpenLevel(5);
if (app && app->desktop()) {
getApp()->objectBrowser()->setAutoOpenLevel(5);
if (app && app->desktop()) {
@@
-160,6
+165,7
@@
MEDModule::iconName() const
void
MEDModule::windows( QMap<int, int>& theMap ) const
{
void
MEDModule::windows( QMap<int, int>& theMap ) const
{
+ STDLOG("MEDModule::windows()");
// want Object browser, in the left area
theMap.insert( SalomeApp_Application::WT_ObjectBrowser,
Qt::LeftDockWidgetArea );
// want Object browser, in the left area
theMap.insert( SalomeApp_Application::WT_ObjectBrowser,
Qt::LeftDockWidgetArea );
@@
-199,6
+205,7
@@
MEDModule::createPreferences()
bool
MEDModule::activateModule( SUIT_Study* theStudy )
{
bool
MEDModule::activateModule( SUIT_Study* theStudy )
{
+ STDLOG("MEDModule::activateModule()");
if ( CORBA::is_nil( _MED_engine ) )
return false;
if ( CORBA::is_nil( _MED_engine ) )
return false;
@@
-228,6
+235,7
@@
MEDModule::activateModule( SUIT_Study* theStudy )
bool
MEDModule::deactivateModule( SUIT_Study* theStudy )
{
bool
MEDModule::deactivateModule( SUIT_Study* theStudy )
{
+ STDLOG("MEDModule::deactivateModule()");
_workspaceController->showDockWidgets(false);
_presentationController->showDockWidgets(false);
//this->unsetDockLayout();
_workspaceController->showDockWidgets(false);
_presentationController->showDockWidgets(false);
//this->unsetDockLayout();
@@
-337,7
+345,7
@@
MEDModule::createStandardAction(const QString& label,
if (iconName.isEmpty())
ico = QIcon();
else
if (iconName.isEmpty())
ico = QIcon();
else
- ico = QIcon(resMgr->loadPixmap("
MED
", iconName));
+ ico = QIcon(resMgr->loadPixmap("
FIELDS
", iconName));
QAction* action = createAction(-1,
label,
QAction* action = createAction(-1,
label,
@@
-405,7
+413,7
@@
MEDModule::itemClickGeneric(std::string & name, std::string & type, int & presId
if (!model)
return false;
if (!model)
return false;
- if (item->componentDataType().toStdString() != "
MED
")
+ if (item->componentDataType().toStdString() != "
FIELDS
")
return false;
_PTR(SObject) obj = item->object();
_PTR(GenericAttribute) anAttribute;
return false;
_PTR(SObject) obj = item->object();
_PTR(GenericAttribute) anAttribute;