Merge Python 3 porting.

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

diff --git a/src/KERNEL_PY/PyInterp.py b/src/KERNEL_PY/PyInterp.py
index 79cec890e1de3a81d4b841c83304e891ce7b9877..e33625b6a73c0a365927ca724a8bc65880d91ffa 100755 (executable)
--- a/src/KERNEL_PY/PyInterp.py
+++ b/src/KERNEL_PY/PyInterp.py
@@ -35,9 +35,10 @@ from SALOME_NamingServicePy import *
 
     #--------------------------------------------------------------------------
 
-def DumpComponent(Study, SO, offset):
-    it = Study.NewChildIterator(SO)
-    Builder = Study.NewBuilder()
+def DumpComponent(SO, offset):
+    global myStudy
+    it = myStudy.NewChildIterator(SO)
+    Builder = myStudy.NewBuilder()
     while it.More():
         CSO = it.Value()
         it.Next()
@@ -60,18 +61,19 @@ def DumpComponent(Study, SO, offset):
                 a = a + "  "
                 ofs = ofs +1
             print(a + ">" + RefSO.GetID())
-        DumpComponent(Study, CSO, offset+2)
+        DumpComponent(CSO, offset+2)
 
     #--------------------------------------------------------------------------
 
-def DumpStudy(Study):
-    itcomp = Study.NewComponentIterator()
+def DumpStudy():
+    global myStudy
+    itcomp = myStudy.NewComponentIterator()
     while itcomp.More():
         SC = itcomp.Value()
         itcomp.Next()
         name = SC.ComponentDataType()
         print("-> ComponentDataType is " + name)
-        DumpComponent(Study, SC, 1)
+        DumpComponent(SC, 1)
         
 
     #--------------------------------------------------------------------------
@@ -88,16 +90,10 @@ sg = SALOMEGUI_Swig()
 #create an naming service instance
 naming_service = SALOME_NamingServicePy_i(orb)
 
-# get active study name and id
-myStudyName = sg.getActiveStudyName()
+# get active study name
+myStudyName = sg.getStudyName()
 print(myStudyName)
 
-myStudyId = sg.getActiveStudyId()
-print(myStudyId)
-
-# get Study Manager reference
-obj = naming_service.Resolve('myStudyManager')
-myStudyManager = obj._narrow(SALOMEDS.StudyManager)
-
-# get active study
-myStudy = myStudyManager.GetStudyByName(myStudyName)
+# get Study reference
+obj = naming_service.Resolve('/Study')
+myStudy = obj._narrow(SALOMEDS.Study)