0020623: EDF 1209 SMESH: Load script/execfile add the objects in the wrong study

diff --git a/src/VISU_SWIG/VISU_Example_03.py b/src/VISU_SWIG/VISU_Example_03.py
index 0b9c878c0a11cbe93a38b9c70dbae9687fc45343..dd9c9bf78d917498c7394cfe3b9418f2776eaeaf 100644 (file)
--- a/src/VISU_SWIG/VISU_Example_03.py
+++ b/src/VISU_SWIG/VISU_Example_03.py
@@ -34,6 +34,7 @@ medFile = os.getenv("DATA_DIR") + "/MedFiles/TimeStamps.med"
 
 print 'Importing "TimeStamps.med"................',
 myVisu = visu_gui.myVisu
+myVisu.SetCurrentStudy(salome.myStudy)
 myResult = myVisu.ImportFile(medFile)
 if myResult is None : print "Error"
 else : print "OK"

diff --git a/src/VISU_SWIG/VISU_Example_04.py b/src/VISU_SWIG/VISU_Example_04.py
index 9daefdb207669bc68377015b9e9c96922d991f9f..66fa11f5d02dd459a83c185e5fb51abd5edf5a20 100644 (file)
--- a/src/VISU_SWIG/VISU_Example_04.py
+++ b/src/VISU_SWIG/VISU_Example_04.py
@@ -35,6 +35,8 @@ from visu_gui import *
 
 aDelay = 1
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/batchmode_visu.py b/src/VISU_SWIG/batchmode_visu.py
index c4df128174a62c0ea0df3cd1582d3ce9dd382207..dc7e8e3d8b9aa06c4688444e346b0e8b809413c6 100644 (file)
--- a/src/VISU_SWIG/batchmode_visu.py
+++ b/src/VISU_SWIG/batchmode_visu.py
@@ -25,12 +25,15 @@
 #  Module : VISU
 #
 from batchmode_salome import *
+import salome
 import visu
 
 myVisu = visu.Initialize(orb,naming_service,lcc,myStudyManager,myStudy,10)
 if myVisu is None:
     raise RuntimeError, "myVisu is none, VISU component is not loaded  or found"
-
+    
+myVisu.SetCurrentStudy(salome.myStudy)
+    
 def try_mesh_parameters(theMeshPattern):
     aResult = []
     if theMeshPattern is None : return aResult ;

diff --git a/src/VISU_SWIG/batchmode_visu_view.py b/src/VISU_SWIG/batchmode_visu_view.py
index 1f675398e0a3366bd7d8cdabf0f48f0a61fb167c..2334bd749f15966cb803367147f1ad30b65ff472 100644 (file)
--- a/src/VISU_SWIG/batchmode_visu_view.py
+++ b/src/VISU_SWIG/batchmode_visu_view.py
@@ -28,6 +28,8 @@
 from VISU import *
 from batchmode_visu_table import *
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewMan = myVisu.GetViewManager()
 
 myTable = myViewMan.CreateTableView(myVisuTableReal)

diff --git a/src/VISU_SWIG/batchmode_visu_view3d.py b/src/VISU_SWIG/batchmode_visu_view3d.py
index e07c4acc5c44e9f422397619897f88e8269df5e9..28a713427ac857730404a233e994c1a63811b362 100644 (file)
--- a/src/VISU_SWIG/batchmode_visu_view3d.py
+++ b/src/VISU_SWIG/batchmode_visu_view3d.py
@@ -35,6 +35,8 @@ aDelay = 0
 
 #mySession = batchmode_visu.mySession
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/visu_apply_properties.py b/src/VISU_SWIG/visu_apply_properties.py
index cadd20061c37b49a97515b3570e5bda994ad7a50..17bd33f31ef66a185fe7e2e77c409110bef43315 100644 (file)
--- a/src/VISU_SWIG/visu_apply_properties.py
+++ b/src/VISU_SWIG/visu_apply_properties.py
@@ -33,6 +33,8 @@ from visu_gui import *
 
 aDelay = 0
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/visu_apply_properties_successive.py b/src/VISU_SWIG/visu_apply_properties_successive.py
index ee02ca61e3d00da81b65d12258c8cda51ae9863e..d01b63efc5a4b1728a4fdd935fbd880edc88c1b6 100644 (file)
--- a/src/VISU_SWIG/visu_apply_properties_successive.py
+++ b/src/VISU_SWIG/visu_apply_properties_successive.py
@@ -33,6 +33,8 @@ from visu_gui import *
 
 aDelay = 0
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/visu_delete.py b/src/VISU_SWIG/visu_delete.py
index ac996c3a372f138ac39aeb7be3d679928a2cd69c..bf1d9905079b64dacbb9ea9030147ef91d1a1dd6 100644 (file)
--- a/src/VISU_SWIG/visu_delete.py
+++ b/src/VISU_SWIG/visu_delete.py
@@ -24,6 +24,7 @@ import VISU
 import SALOMEDS
 from visu_gui import *
 
+myVisu.SetCurrentStudy(salome.myStudy)
 myViewManager = myVisu.GetViewManager();
 myView = myViewManager.Create3DView();
 

diff --git a/src/VISU_SWIG/visu_evolution.py b/src/VISU_SWIG/visu_evolution.py
index cf17eeef12b5d99a5e9b9596107176e2814f50f0..bd78885ba60b31f892d077a653df8826f760832e 100755 (executable)
--- a/src/VISU_SWIG/visu_evolution.py
+++ b/src/VISU_SWIG/visu_evolution.py
@@ -28,6 +28,7 @@ import os
 import VISU
 from visu_gui import *
 
+myVisu.SetCurrentStudy(salome.myStudy)
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.CreateXYPlot();

diff --git a/src/VISU_SWIG/visu_med.py b/src/VISU_SWIG/visu_med.py
index 77282a6df4c9162b559fcc33f62a055a657927f0..c3b26e3f4442c62cce0bb6c1e547f94dcf2caa8a 100644 (file)
--- a/src/VISU_SWIG/visu_med.py
+++ b/src/VISU_SWIG/visu_med.py
@@ -73,6 +73,7 @@ def importMed(medFile):
 
 #med_obj = getMedObjectFromStudy()
 myVisu = salome.lcc.FindOrLoadComponent("FactoryServer", "VISU")
+myVisu.SetCurrentStudy(salome.myStudy)
 print "Use importMed(medFile) or importMedFrom(medDir,medFile) functions !"
 
 #myField = getFieldObjectFromStudy(2,1)

diff --git a/src/VISU_SWIG/visu_pointmap3d.py b/src/VISU_SWIG/visu_pointmap3d.py
index 171b5ced6f2ecbae85f700f381bcd9cb2e5c8e0b..0c97e6ab3796499ca68f618e94c6f63429edbd13 100755 (executable)
--- a/src/VISU_SWIG/visu_pointmap3d.py
+++ b/src/VISU_SWIG/visu_pointmap3d.py
@@ -24,6 +24,8 @@ import os
 import VISU
 from visu_gui import *
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 aTableFile = os.getenv('DATA_DIR') + '/Tables/table_test.xls'
 
 aTableSObject = myVisu.ImportTables(aTableFile)

diff --git a/src/VISU_SWIG/visu_prs_example.py b/src/VISU_SWIG/visu_prs_example.py
index 7ec93a7647be2ab19fef38dfd30ddc07c7048cb4..bbcc2d32d15e1fb02c9bd5478c2d9b5a4bc0da4f 100644 (file)
--- a/src/VISU_SWIG/visu_prs_example.py
+++ b/src/VISU_SWIG/visu_prs_example.py
@@ -38,6 +38,8 @@ if salome.hasDesktop():
 import visu_gui
 myVisu = visu_gui.myVisu
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 medFile = "pointe.med"
 medFile = os.getenv('DATA_DIR') + '/MedFiles/' + medFile
 print medFile

diff --git a/src/VISU_SWIG/visu_split_views.py b/src/VISU_SWIG/visu_split_views.py
index 6101c99e429b43c154cc011741ef6891ec517673..b86a7c249f5dbc9e11b320efd870dae030915584 100644 (file)
--- a/src/VISU_SWIG/visu_split_views.py
+++ b/src/VISU_SWIG/visu_split_views.py
@@ -27,6 +27,8 @@ from time import sleep
 
 DELAY = 2
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager()
 
 ################################################

diff --git a/src/VISU_SWIG/visu_succcessive_animation.py b/src/VISU_SWIG/visu_succcessive_animation.py
index 950386bf3e2d9639d1a26a8fe61d1bc16df0d88e..b046b9d428bb8e15e0e1dea2a6c14a578a38fe45 100644 (file)
--- a/src/VISU_SWIG/visu_succcessive_animation.py
+++ b/src/VISU_SWIG/visu_succcessive_animation.py
@@ -33,6 +33,8 @@ from visu_gui import *
 
 aDelay = 0
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/visu_view.py b/src/VISU_SWIG/visu_view.py
index f191637de82bf593cce42d821d479acf845488ca..3287ed1333996eb48256c1dd4a33077e7cfe030a 100644 (file)
--- a/src/VISU_SWIG/visu_view.py
+++ b/src/VISU_SWIG/visu_view.py
@@ -34,6 +34,8 @@ from VISU import *
 
 from visu_table import *
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewMan = myVisu.GetViewManager()
 
 myTable = myViewMan.CreateTableView(myVisuTableReal)

diff --git a/src/VISU_SWIG/visu_view3d.py b/src/VISU_SWIG/visu_view3d.py
index f22d176c8d0cb41bbbe88231a8c3b752c7e3e933..26691712f6db9dd50039600d33f65207779e736e 100644 (file)
--- a/src/VISU_SWIG/visu_view3d.py
+++ b/src/VISU_SWIG/visu_view3d.py
@@ -35,6 +35,8 @@ aDelay = 0
 
 #mySession = batchmode_visu.mySession
 
+myVisu.SetCurrentStudy(salome.myStudy)
+
 myViewManager = myVisu.GetViewManager();
 
 myView = myViewManager.Create3DView();

diff --git a/src/VISU_SWIG/visu_view3d_parameters.py b/src/VISU_SWIG/visu_view3d_parameters.py
index 2399f3d2b181b9fbc83cfa2ce78a4822c0ec43ab..2d769b7e305ff3fa6449daddf790c353a7bbd2bb 100755 (executable)
--- a/src/VISU_SWIG/visu_view3d_parameters.py
+++ b/src/VISU_SWIG/visu_view3d_parameters.py
@@ -36,6 +36,7 @@ medFile = os.getenv("DATA_DIR") + "/MedFiles/fra.med"
 #%====================Stage1: Creating a study====================%
 
 print "Creating a new study... "
+myVisu.SetCurrentStudy(salome.myStudy)
 
 myVisu = visu_gui.myVisu
 myVisu.SetCurrentStudy(salome.myStudy)