Merge branch 'omu/Launcher9'

[modules/kernel.git] / src / KERNEL_PY / kernel / services.py

diff --git a/src/KERNEL_PY/kernel/services.py b/src/KERNEL_PY/kernel/services.py
index 5e6c8db0fbc273d15301f30f6f8db71b0d8bbc73..31038407cb42185ad0616797a62beb34c2c0537a 100644 (file)
--- a/src/KERNEL_PY/kernel/services.py
+++ b/src/KERNEL_PY/kernel/services.py
@@ -47,8 +47,8 @@ if not is_called_by_sphinx() and salome.lcc is None:
 
 # Note that the salome module provides you with standard SALOME
 # objects: CORBA broker (orb): salome.orb lyfe cycle (lcc) :
-# salome.lcc naming service : salome.naming_service study manager :
-# salome.myStudyManager The default study : salome.myStudy
+# salome.lcc naming service : salome.naming_service 
+# The default study : salome.myStudy
 #
 # Alternatively, you may obtain these objects directly with the
 # following instructions:
@@ -120,30 +120,24 @@ def getComponentList():
     obj = salome.naming_service.Resolve('Kernel/ModulCatalog')
     catalog = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog)
     if not catalog:
-        raise RuntimeError("Can't accesss module catalog")
+        raise RuntimeError("Can't access module catalog")
     return catalog.GetComponentList()
 
-## Get a study manager to create and manage %SALOME studies
-#  \ingroup service
-def getStudyManager():
-    """Get a study manager to create and manage SALOME studies"""
-    return salome.myStudyManager
-
 import SALOMEDS
-## Get a study manager to create and manage SALOME studies. 
-#  \warning you should use instead the variable salome.myStudyManager. 
+## Get a study to create SALOME study. 
+#  \warning you should use instead the variable salome.myStudy. 
 #  This function is given for illustration of usage of the naming service
 #  \ingroup service
-def __getStudyManager_demo():
+def __getStudy_demo():
     """
-    Get a study manager to create and manage SALOME studies. WARN: you
-    should use instead the variable salome.myStudyManager. This
+    Get a study to create SALOME study. WARN: you
+    should use instead the variable salome.myStudy. This
     function is given for illustration of usage of the naming service
     """
     naming_service = SALOME_NamingServicePy_i( orb )
-    obj = naming_service.Resolve( '/myStudyManager' )
-    studyManager = obj._narrow( SALOMEDS.StudyManager)
-    return studyManager
+    obj = naming_service.Resolve( '/Study' )
+    study = obj._narrow( SALOMEDS.Study)
+    return study
 
 
 #
@@ -242,7 +236,7 @@ def TEST_createObject():
     """
     import GEOM
     from salome.geom import geomBuilder
-    geompy = geomBuilder.New(salome.myStudy)
+    geompy = geomBuilder.New()
 
     box = geompy.MakeBoxDXDYDZ(200, 200, 200)
     id = geompy.addToStudy( box, 'box' )