Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From Community Forum: Save/Load incorrectly works if there are several Python modules...
[modules/gui.git]
/
src
/
SALOME_PYQT
/
SALOME_PYQT_GUI
/
SALOME_PYQT_Module.cxx
diff --git
a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 069e070f374c4e99a9aac7256edd82d0f6468359..4b44353888ab88c3b17cdc9f75d47a7099c192e3 100644
(file)
--- a/
src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/
src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-45,7
+45,7
@@
// and to get C API from sip : sipBuildResult for example
//
// and to get C API from sip : sipBuildResult for example
//
-#define INIT_FUNCTION
init
SalomePyQtGUILight
+#define INIT_FUNCTION
PyInit_
SalomePyQtGUILight
#if defined(SIP_STATIC_MODULE)
extern "C" void INIT_FUNCTION();
#else
#if defined(SIP_STATIC_MODULE)
extern "C" void INIT_FUNCTION();
#else
@@
-112,16
+112,12
@@
SALOME_PYQT_Module::~SALOME_PYQT_Module()
*/
QString SALOME_PYQT_Module::engineIOR() const
{
*/
QString SALOME_PYQT_Module::engineIOR() const
{
- // call helper to get IOR from Python module
-
static QString ior
;
+ //
first
call helper to get IOR from Python module
+
QString ior = myHelper->engineIOR()
;
+ // if IOR is still not specified, try default implementation
+ // which loads engine to the default FactoryServer container.
if ( ior.isEmpty() ) {
if ( ior.isEmpty() ) {
- // first call helper to get IOR from Python module
- ior = myHelper->engineIOR();
- }
- if ( ior.isEmpty() ) {
- // if IOR is still not specified, try default implementation
- // which loads engine to the default FactoryServer container.
Engines::EngineComponent_var comp;
// temporary solution
try {
Engines::EngineComponent_var comp;
// temporary solution
try {