Move Python Study ref creation to KERNEL

diff --git a/src/SMESH_SWIG/SMeshHelper.cxx b/src/SMESH_SWIG/SMeshHelper.cxx
index 4b7b2b275e68fbe4a0dbf43e0b5591da693ee4b6..78f24d2d1ea36edf691506da52c39746697024d7 100644 (file)
--- a/src/SMESH_SWIG/SMeshHelper.cxx
+++ b/src/SMESH_SWIG/SMeshHelper.cxx
@@ -22,11 +22,9 @@
 #include "SMESH_Gen_i.hxx"
 #include "SALOME_Container_i.hxx"
 #include "SALOME_KernelServices.hxx"
-#include "SALOMEDS_Study_i.hxx"
 
 #include <cstring>
 
-
 std::string BuildSMESHInstanceInternal(bool checkNS)
 {
     CORBA::ORB_var orb;
@@ -50,11 +48,3 @@ std::string BuildSMESHInstanceInternal(bool checkNS)
     CORBA::String_var ior = orb->object_to_string(zeRef);
     return std::string(ior.in());
 }
-
-std::string GetSessionInstanceInternal()
-{
-    SALOMEDS::Study_var study = KERNEL::getStudyServantSA();
-    CORBA::ORB_ptr orb = KERNEL::getORB();
-    CORBA::String_var ior = orb->object_to_string(study);
-    return std::string(ior.in());
-}

diff --git a/src/SMESH_SWIG/SMeshHelper.h b/src/SMESH_SWIG/SMeshHelper.h
index dd3d5dabe4f463c8f1c16a5d3de0f518882e73f1..bef5532ca3682633db1713fe908e25c2524937e9 100644 (file)
--- a/src/SMESH_SWIG/SMeshHelper.h
+++ b/src/SMESH_SWIG/SMeshHelper.h
@@ -22,4 +22,3 @@
 #include <string>
 
 std::string BuildSMESHInstanceInternal(bool checkNS);
-std::string GetSessionInstanceInternal();

diff --git a/src/SMESH_SWIG/SMeshHelper.i b/src/SMESH_SWIG/SMeshHelper.i
index 63b7c7e772e59ababb516159b83b44a8a2f7a6b2..8745d96e0e949670205eacdb35b39a1235da7ebc 100644 (file)
--- a/src/SMESH_SWIG/SMeshHelper.i
+++ b/src/SMESH_SWIG/SMeshHelper.i
@@ -31,19 +31,4 @@
   {
     return BuildSMESHInstanceInternal(checkNS);
   }
-  
-  std::string GetSessionInstance()
-  {
-    return GetSessionInstanceInternal();
-  }
 }
-
-%pythoncode %{
-
-def myStudy():
-  import SALOMEDS
-  import CORBA
-  orb=CORBA.ORB_init([''])
-  return orb.string_to_object(GetSessionInstance())
-
-%}
\ No newline at end of file