From 85085c331fd37de1cf664b748fc239cff4e6db30 Mon Sep 17 00:00:00 2001 From: nri Date: Wed, 16 Jul 2003 18:13:35 +0000 Subject: [PATCH] NRI : Merge from V1_2. --- src/Supervision/Makefile.in | 2 +- src/Supervision/SUPERV_shared_modules.py | 19 +++++++++++++++++++ src/Supervision/SuperV.py | 5 +++-- src/Supervision/batchmode_SuperV.py | 7 +++++-- 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 src/Supervision/SUPERV_shared_modules.py diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in index 39a1c4c..0454ae9 100755 --- a/src/Supervision/Makefile.in +++ b/src/Supervision/Makefile.in @@ -34,7 +34,7 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl @COMMENCE@ -EXPORT_PYSCRIPTS = SuperV.py batchmode_SuperV.py +EXPORT_PYSCRIPTS = SuperV.py batchmode_SuperV.py SUPERV_shared_modules.py EXPORT_HEADERS = \ SuperV_Impl.hxx \ diff --git a/src/Supervision/SUPERV_shared_modules.py b/src/Supervision/SUPERV_shared_modules.py new file mode 100644 index 0000000..77df1cd --- /dev/null +++ b/src/Supervision/SUPERV_shared_modules.py @@ -0,0 +1,19 @@ +""" + +""" + +# force SUPERV importation at interpretor initialization +# see salome_shared_modules.py +# (avoids incomplete import at run time) + +print "============== import SUPERV =======================" + +import SUPERV + +# this function is required + +def init_shared_modules(): + """ + This function initializes shared modules that need to be + """ + pass diff --git a/src/Supervision/SuperV.py b/src/Supervision/SuperV.py index 7efe680..09c7cf2 100644 --- a/src/Supervision/SuperV.py +++ b/src/Supervision/SuperV.py @@ -14,6 +14,7 @@ try : from salome import lcc from salome import naming_service from salome import CORBA + from salome import sg import SALOME_ModuleCatalog except : import curses @@ -40,11 +41,11 @@ from types import * # SuperVision.Swig = 1 # print 'SuperV_Swig created' #except : -# SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","Supervision") +# SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","SUPERV") # SuperVision.Swig = 0 # print 'Supervision Component loaded' -SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","Supervision") +SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","SUPERV") SuperVision.Swig = 0 modulecatalog = naming_service.Resolve("/Kernel/ModulCatalog") diff --git a/src/Supervision/batchmode_SuperV.py b/src/Supervision/batchmode_SuperV.py index 397c9c3..34f0d8e 100644 --- a/src/Supervision/batchmode_SuperV.py +++ b/src/Supervision/batchmode_SuperV.py @@ -15,6 +15,8 @@ try : from batchmode_salome import naming_service from batchmode_salome import CORBA from batchmode_salome import myStudy + import SUPERV + import SUPERV_idl except : import curses from LifeCycleCORBA import * @@ -34,16 +36,17 @@ except : import re from types import * import SALOMEDS +import SALOMEDS_Attributes_idl #try : # SuperVision = SuperV_Swig( len(sys.argv) , sys.argv ) # SuperVision.Swig = 1 # print 'SuperV_Swig created' #except : -# SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","Supervision") +# SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","SUPERV") # SuperVision.Swig = 0 # print 'Supervision Component loaded' -SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","Supervision") +SuperVision = lcc.FindOrLoadComponent("SuperVisionContainer","SUPERV") SuperVision.Swig = 0 modulecatalog = naming_service.Resolve("/Kernel/ModulCatalog") -- 2.39.2