FIX: add missing commit from the V6_main

diff --git a/src/KERNEL_PY/kernel/services.py b/src/KERNEL_PY/kernel/services.py
index 90bd44f5e2326bfe5718b084313efd3627c83f4e..032242bf6a4f4c8857201f38432571e97b6739f7 100644 (file)
--- a/src/KERNEL_PY/kernel/services.py
+++ b/src/KERNEL_PY/kernel/services.py
@@ -135,11 +135,6 @@ def __getStudyManager_demo():
 # ==============================================================================
 #
 
-# TO BE COMPLETED:
-# With functions to manipulate object, sobject, etc (See
-# GUI_SRC/src/SALOME_SWIG/salome.py). The functions to manipulate the
-# study are implemented in the Study Editor (see studyedit.py)
-
 # - the SObject is an item in a study (Study Object).
 # - the entry is the identifier of an item.
 # - the ID is the entry
@@ -147,6 +142,13 @@ def __getStudyManager_demo():
 #   embedded in the SALOME component container and with a reference in
 #   the SALOME study, so that it can be retrieved.
 
+# __GBO__ WARN: theses functions are already defined in
+# salome_study.py, but without the possibility to specify the
+# underlying study (in salome_study.py, the study is the default study
+# binded to the salome.myStudy attribute). TODO: see if it can be
+# extends to the prototype (with the study as an argument) below and
+# resorb the functions below.
+
 def IDToObject(id, study=None):
     myObj = None
     if study is None:

diff --git a/src/KERNEL_PY/kernel/studyedit.py b/src/KERNEL_PY/kernel/studyedit.py
index 62d4162617e12ecfc59e59a0024bba788ebbeee4..f31c6ede641532afea89b8d6735b5ec208ffd260 100644 (file)
--- a/src/KERNEL_PY/kernel/studyedit.py
+++ b/src/KERNEL_PY/kernel/studyedit.py
@@ -40,10 +40,12 @@ def getActiveStudyId():
     ``salome.myStudyId`` variable.
     """
     salome.salome_init()
-    if salome.hasDesktop():
-        return salome.sg.getActiveStudyId()
-    else:
-        return salome.myStudyId
+    # _GBO_WARN: note that salome.getActiveStudy() returns an id. It
+    # should return the study or be renammed in getActiveStudyId.
+    return salome.getActiveStudy()
+
+def getActiveStudy():
+    return salome.myStudyManager.GetStudyByID(getActiveStudyId())
 
 def getStudyEditor(studyId = None):
     """