Merge multi-study removal branch.

diff --git a/examples/command_line/dataset.py b/examples/command_line/dataset.py
index cff4c01da345ffe4ec06e2c951402ccbe442e9ec..300af014df870176bd6384ffc1403739c74b5f6c 100644 (file)
--- a/examples/command_line/dataset.py
+++ b/examples/command_line/dataset.py
@@ -2,7 +2,7 @@ def create_geometry(out_filename=None):
   import GEOM
   import salome
   from salome.geom import geomBuilder
-  geompy = geomBuilder.New(salome.myStudy)
+  geompy = geomBuilder.New()
 
   # create a cloud of points
   points = [
@@ -29,7 +29,7 @@ def create_meshes(geometry, out_filename=None):
   import salome
   from salome.smesh import smeshBuilder
 
-  smesh = smeshBuilder.New(salome.myStudy)
+  smesh = smeshBuilder.New()
   Mesh_tri = smesh.Mesh(geometry)
 
   Regular_1D = Mesh_tri.Segment()

diff --git a/resources/PARAVISCatalog.xml.in b/resources/PARAVISCatalog.xml.in
index e827c05800e3a59c75a1e0eb32c0fe8c46bb5a33..7db311a415887fbc9d9a435012b962e4df05a074 100644 (file)
--- a/resources/PARAVISCatalog.xml.in
+++ b/resources/PARAVISCatalog.xml.in
@@ -32,7 +32,6 @@
             <component-author>vsv</component-author>
             <component-version>@SALOMEPARAVIS_VERSION@</component-version>
             <component-comment>PVServer control service</component-comment>
-            <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
             <component-icone>pqAppIcon22.png</component-icone>
             <constraint></constraint>

diff --git a/src/Macro/ShowSalomeObject.py b/src/Macro/ShowSalomeObject.py
index e7c417dc43da6169bf4b4a699052b57c703a5d0d..464519d377f2c89db634ca4916432adf830db590 100644 (file)
--- a/src/Macro/ShowSalomeObject.py
+++ b/src/Macro/ShowSalomeObject.py
@@ -44,7 +44,7 @@ for entry in selection:
     try:
         import GEOM
         from salome.geom import geomBuilder
-        geompy = geomBuilder.New(salome.myStudy)
+        geompy = geomBuilder.New()
         go = sobj.GetObject()._narrow(GEOM.GEOM_Object)
         if go:
             tmpf = tempfile.NamedTemporaryFile(suffix='.vtk')
@@ -64,7 +64,7 @@ for entry in selection:
     try: 
         import SMESH
         from salome.smesh import smeshBuilder
-        mesh = smeshBuilder.New(salome.myStudy)
+        mesh = smeshBuilder.New()
         mo = sobj.GetObject()._narrow(SMESH.SMESH_Mesh)
         if mo:
             tmpf = tempfile.NamedTemporaryFile(suffix='.med')

diff --git a/src/PVGUI/PVGUI_DataModel.cxx b/src/PVGUI/PVGUI_DataModel.cxx
index 8f4805fc3b773c23353c6f96742dcd8c18e8e4b5..9e321776d4757c4202b4803dfad0a9e66944ebb6 100644 (file)
--- a/src/PVGUI/PVGUI_DataModel.cxx
+++ b/src/PVGUI/PVGUI_DataModel.cxx
@@ -208,7 +208,7 @@ bool PVGUI_DataModel::dumpPython( const QString& path, CAM_Study* std,
   if (isMultiFile)
     {
       QStringList abuffer;
-      abuffer.push_back(QString("def RebuildData( theStudy ):"));
+      abuffer.push_back(QString("def RebuildData():"));
       QStringList lst(trace.split("\n"));
       foreach(QString elem, lst)
         {

diff --git a/test/VisuPrs/bugs/A5.py b/test/VisuPrs/bugs/A5.py
index 357194dc985775b4b1b078b59369733bb8704fd8..8fd805eb160c7409820433e4c2ba73e563ae259e 100644 (file)
--- a/test/VisuPrs/bugs/A5.py
+++ b/test/VisuPrs/bugs/A5.py
@@ -28,7 +28,6 @@ import pvsimple
 
 salome.salome_init()
 myStudy = salome.myStudy
-myStudyManager = salome.myStudyManager
 
 data_file = datadir + "TimeStamps.med"
 
@@ -41,11 +40,9 @@ save_file = os.path.join(tmp_dir, "TimeStamps_save.hdf")
 print "Save to file ", save_file
 
 pvsimple.OpenDataFile(data_file)
-myStudyManager.SaveAs(save_file, myStudy, 0)
-myStudyManager.Close(myStudy)
+myStudy.SaveAs(save_file, 0, 0)
 
-openedStudy = myStudyManager.Open(data_file)
-myStudyManager.Close(openedStudy)
+myStudy.Open(data_file)
 
 os.remove(save_file)
 

diff --git a/test/VisuPrs/dump_study/B5.py b/test/VisuPrs/dump_study/B5.py
index cd54ea5574aa38c7f8e098294af84e47648fde0a..9a93f24c6637e23a093fba03047d70c4543e6420 100644 (file)
--- a/test/VisuPrs/dump_study/B5.py
+++ b/test/VisuPrs/dump_study/B5.py
@@ -42,11 +42,9 @@ import salome
 # run Salome
 #salome_session = SalomeSession()
 salome.salome_init()
-salome.myStudyManager.Close(salome.myStudy)
 
 file_name = os.path.join(os.path.dirname(sys.argv[0]), "test1.hdf")
-opened_study = salome.myStudyManager.Open(file_name)
-salome.myStudy = opened_study
+salome.myStudy.Open(file_name)
 
 # 3. Find IsoSurfaces
 from pvsimple import *