NRI : Merge from V1_2.

diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in
index 39a1c4c11e2c0b8e114d65720d33f7a14aff3911..0454ae900833844b9d99e8788d24ced9b6e63910 100755 (executable)
--- 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 (file)
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 7efe680c6836d9c11776007d662f9fed2b9c8a88..09c7cf2aac3df1347342da723141dd9b14f7be97 100644 (file)
--- 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 397c9c3bc235f6e3654a6186363819ad4962c2bf..34f0d8ea381e5455fd1f6e9ae1c8d9db95141006 100644 (file)
--- 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")