Python test scripts, first pass

diff --git a/doc/salome/examples/h001_importImage.py b/doc/salome/examples/h001_importImage.py
index 4c33e30ef300c1bb700d92e2f98dd083ab7f1a33..9b6bb3518f0db989b78160e474264baa6e51b460 100644 (file)
--- a/doc/salome/examples/h001_importImage.py
+++ b/doc/salome/examples/h001_importImage.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
@@ -33,4 +33,4 @@ garonne_ign_01.SetGlobalPoints( 1,
 garonne_ign_01.Update()
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h002_importImage.py b/doc/salome/examples/h002_importImage.py
index d67dc5a7a0bf81a2b4f1bb1f43c334a37f7f3e33..52d94fa7eaa3e26fc0e72b259791cc60d9af0fac 100644 (file)
--- a/doc/salome/examples/h002_importImage.py
+++ b/doc/salome/examples/h002_importImage.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
@@ -55,4 +55,4 @@ garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 )
 garonne_ign_02.Update()
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h003_changeLCS.py b/doc/salome/examples/h003_changeLCS.py
index f7cf5285c3188f4e264819f2069bc0149822470e..3fff5a702b7e4bd07fe4c520b6fd7e5144e66da9 100644 (file)
--- a/doc/salome/examples/h003_changeLCS.py
+++ b/doc/salome/examples/h003_changeLCS.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -55,4 +55,4 @@ garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 )
 garonne_ign_02.Update()
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h004_importBathyXYZ.py b/doc/salome/examples/h004_importBathyXYZ.py
index c4041bc1fb5f4622417bc6515d60118e3329354a..79a96e4c790431f631e46f8de9a56bd3c64cd1e0 100644 (file)
--- a/doc/salome/examples/h004_importBathyXYZ.py
+++ b/doc/salome/examples/h004_importBathyXYZ.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -27,4 +27,4 @@ if not(Cloud_02.ImportFromFile( os.path.join(HYDRO_SAMPLES,  "Cloud_02.xyz" ))):
 Cloud_02.Update()
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h005_importImageBad.py b/doc/salome/examples/h005_importImageBad.py
index 86340d7c4283658fe99e7bcadf8a98a3c83fbda6..9a271c5e500246d3265bd8dad3db5c76d66f80c0 100644 (file)
--- a/doc/salome/examples/h005_importImageBad.py
+++ b/doc/salome/examples/h005_importImageBad.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
@@ -26,4 +26,4 @@ if ret:
   raise ValueError('loading problem not detected: return value should be null')
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h006_importBathyXYZBad.py b/doc/salome/examples/h006_importBathyXYZBad.py
index a5dae4f55ff9447f523347eff97e13b8ffd02532..88d3418d7b3c5f039723cd63d6838d98083fbc9d 100644 (file)
--- a/doc/salome/examples/h006_importBathyXYZBad.py
+++ b/doc/salome/examples/h006_importBathyXYZBad.py
@@ -13,7 +13,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -27,4 +27,4 @@ if ret:
   raise ValueError('loading problem not detected: return value should be null')
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h007_createPolySplineClosed.py b/doc/salome/examples/h007_createPolySplineClosed.py
index c3e8c9b9029404024718772823d71b029d29a491..c3896b68d16507a4e63f18ba2a280a29102e8095 100644 (file)
--- a/doc/salome/examples/h007_createPolySplineClosed.py
+++ b/doc/salome/examples/h007_createPolySplineClosed.py
@@ -10,7 +10,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
@@ -39,4 +39,4 @@ Polyline_1.Update()
 
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index 2516d228dd99747a7dfeef16372af90b3595dfff..fa21720e77bff30ed8bcb8e3ad7c9f5e2f1517e4 100644 (file)
--- a/doc/salome/examples/h008_simpleCase.py
+++ b/doc/salome/examples/h008_simpleCase.py
@@ -14,7 +14,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
@@ -63,7 +63,7 @@ Case_1.SetBoundaryPolyline( Polyline_1 )
 Case_1.Update()
 
 # Export of the calculation case
-Case_1_entry = Case_1.Export( theStudy._get_StudyId() )
+Case_1_entry = Case_1.Export()
 
 #----------------------
 # --- Geometry
@@ -76,7 +76,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", Case_1_entry)
 Case_1_geom = salome.IDToObject( str( Case_1_entry ) )
@@ -87,4 +87,4 @@ print("Geom shape name:", Case_1_geom.GetName())
 controlGeomProps(geompy, Case_1_geom, 1218.7373973, 49578.1516521)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h009_normalCaseManual.py b/doc/salome/examples/h009_normalCaseManual.py
index e87547a6463bffb9db26bfd9c7339907e6eb39b2..11c19003c6f0e9eb05f1cc0abd78197136e17471 100644 (file)
--- a/doc/salome/examples/h009_normalCaseManual.py
+++ b/doc/salome/examples/h009_normalCaseManual.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -307,7 +307,7 @@ garonne_1_riveDroite.SetName( "garonne_1_riveDroite" )
 garonne_1_riveGauche.SetName( "garonne_1_riveGauche" )
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -320,7 +320,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -387,4 +387,4 @@ geompy.addToStudyInFather(HYDRO_garonne_1, amont, "amont")
 geompy.addToStudyInFather(HYDRO_garonne_1, aval, "aval")
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py
index 0be82903ce790569b14532a2fa16fbcd68b9a5e7..cda2c4ea9418498bdc4cd4163324018d0d4d2045 100644 (file)
--- a/doc/salome/examples/h010_normalCaseManualMesh.py
+++ b/doc/salome/examples/h010_normalCaseManualMesh.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -306,7 +306,7 @@ garonne_1_riveDroite.SetName("garonne_1_riveDroite")
 garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -319,7 +319,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -396,7 +396,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -473,4 +473,4 @@ controlSubMeshStats(riveDroite_1, 2342)
 controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
index 74701e82384b564d621044f578011317e9ec2d66..8ac73adcca93348a2351b9519786f41add0d17b3 100644 (file)
--- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py
+++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -306,7 +306,7 @@ garonne_1_riveDroite.SetName("garonne_1_riveDroite")
 garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -319,7 +319,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -396,7 +396,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -473,7 +473,7 @@ controlSubMeshStats(riveDroite_1, 2342)
 controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()
 
 #----------------------
 # --- Z interpolation with HYDRO

diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py
index 873594afce139a4f0248d80732583585fe1dd2d4..b33e6c3eb4d5177c310cea8bc023c8a25de72371 100644 (file)
--- a/doc/salome/examples/h012_caseDigueManual.py
+++ b/doc/salome/examples/h012_caseDigueManual.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -387,7 +387,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_digue.SetName("garonne_1_digue")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -400,7 +400,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -477,4 +477,4 @@ geompy.UnionIDs(SectionsDigue, [geompy.GetSubShapeID(HYDRO_garonne_1, amontDigue
 geompy.addToStudyInFather( HYDRO_garonne_1, SectionsDigue, 'SectionsDigue' )
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h013_caseDigueManualMesh.py b/doc/salome/examples/h013_caseDigueManualMesh.py
index 48f1e6920c26413e177e76067d91f6ed657ade24..a21a2800d574d766f8787bb4e33ef3a9950c9d59 100644 (file)
--- a/doc/salome/examples/h013_caseDigueManualMesh.py
+++ b/doc/salome/examples/h013_caseDigueManualMesh.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -387,7 +387,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_digue.SetName("garonne_1_digue")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -400,7 +400,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -486,7 +486,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -585,4 +585,4 @@ controlSubMeshStats(riveGauche_1, 6585)
 controlSubMeshStats(digue_1, 832)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
index 09b302c2fadc3fb99e4d97419b5e5b173dba069d..8f24d1dca84cb2223a513649def09d33c68ce21c 100644 (file)
--- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py
+++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -387,7 +387,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_digue.SetName("garonne_1_digue")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -400,7 +400,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -486,7 +486,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -585,7 +585,7 @@ controlSubMeshStats(riveGauche_1, 6585)
 controlSubMeshStats(digue_1, 832)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()
 #----------------------
 # --- Z interpolation with HYDRO
 #----------------------

diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py
index b780ce913a1e06e899b78dde57c67cb68805074a..66c70caddbc3e6ece6c000749adde0f9f6d4ce10 100644 (file)
--- a/doc/salome/examples/h015_normalCaseManualTelemac.py
+++ b/doc/salome/examples/h015_normalCaseManualTelemac.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -306,7 +306,7 @@ garonne_1_riveDroite.SetName("garonne_1_riveDroite")
 garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -319,7 +319,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -396,7 +396,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -480,7 +480,7 @@ controlSubMeshStats(riveDroite_1, 2342)
 controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()
 
 #----------------------
 # --- Z interpolation with HYDRO

diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py
index ca9c5a59d651b0cb96377592a085d91e6191c47b..33b1e29e83ea8151c4cf356a42aaf297f7875cd6 100644 (file)
--- a/doc/salome/examples/h016_pilesPontManualMesh.py
+++ b/doc/salome/examples/h016_pilesPontManualMesh.py
@@ -21,7 +21,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000.000, 6350000.000 )
 
@@ -1032,7 +1032,7 @@ garonne_1_pile3.SetName( "garonne_1_pile3" )
 garonne_1_pile4.SetName( "garonne_1_pile4" )
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 # Get geometry shape and print debug information
 import GEOM
@@ -1052,7 +1052,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 [garonne_riveDroite,garonne_aval,garonne_riveGauche,garonne_pont,garonne_amont] = geompy.SubShapeAll(HYDRO_garonne_1, geompy.ShapeType["FACE"])
 
@@ -1160,7 +1160,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
 NETGEN_1D_2D = garonne_1.Triangle(algo=smeshBuilder.NETGEN_1D2D)
 NETGEN_2D_Parameters_1 = NETGEN_1D_2D.Parameters()
@@ -1281,4 +1281,4 @@ controlSubMeshStats(garonne_riveDroite_2, 3941)
 controlSubMeshStats(garonne_riveGauche_2, 4635)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h017_interpolationLineaire.py b/doc/salome/examples/h017_interpolationLineaire.py
index 4942e521664d0ef8315115179c3e2049af2eab55..647a3d28be22905475336eef81732a9a2b6b8d62 100644 (file)
--- a/doc/salome/examples/h017_interpolationLineaire.py
+++ b/doc/salome/examples/h017_interpolationLineaire.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000.000, 6350000.000 )
 
@@ -260,7 +260,7 @@ etude_Reg_1.AddZone( etude_Zone_1 )
 etude_Reg_1.SetName( "etude_Reg_1" )
 
 # Export of the calculation case
-etude_entry = etude.Export( theStudy._get_StudyId() )
+etude_entry = etude.Export()
 
 # Get geometry shape and print debug information
 import GEOM
@@ -280,7 +280,7 @@ import math
 import SALOMEDS
 
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 etude_domaine_Outer = geompy.CreateGroup(HYDRO_etude_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(etude_domaine_Outer, [3, 6, 8, 10])
@@ -296,7 +296,7 @@ geompy.addToStudyInFather( HYDRO_etude_1, domaine, 'domaine' )
 import  SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 relief = smesh.Mesh(HYDRO_etude_1)
 NETGEN_2D = relief.Triangle(algo=smeshBuilder.NETGEN_1D2D)
 NETGEN_2D_Parameters_1 = NETGEN_2D.Parameters()
@@ -336,7 +336,7 @@ smesh.SetName(NETGEN_2D_Parameters_1, 'NETGEN 2D Parameters_1')
 
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()
 
 #----------------------
 # --- Z interpolation with HYDRO

diff --git a/doc/salome/examples/h018_streamInterpolation.py b/doc/salome/examples/h018_streamInterpolation.py
index 0e90dccdbd6a7c70628bc50f3201373d6ae23be6..490f667d5ded7c8259dc6c5146731e29580b3177 100644 (file)
--- a/doc/salome/examples/h018_streamInterpolation.py
+++ b/doc/salome/examples/h018_streamInterpolation.py
@@ -21,7 +21,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0.000, 0.000 )
 
@@ -332,7 +332,7 @@ Reg_litMineur.SetName( "Reg_litMineur" )
 Reg_riveDroite.SetName( "Reg_riveDroite" )
 
 # Export of the calculation case
-Case_1_entry = Case_1.Export( theStudy._get_StudyId() )
+Case_1_entry = Case_1.Export()
 
 #----------------------
 # --- Geometry
@@ -350,7 +350,7 @@ HYDRO_Case_1 = salome.IDToObject( str( Case_1_entry ) )
 print("Geom shape:", HYDRO_Case_1)
 print("Geom shape name:", HYDRO_Case_1.GetName())
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 # --- manual definition: geometrical faces
 [riveGauche,litMineur,riveDroite] = geompy.SubShapeAll(HYDRO_Case_1, geompy.ShapeType["FACE"])
@@ -404,7 +404,7 @@ import  SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 plaine = smesh.Mesh(HYDRO_Case_1)
@@ -507,4 +507,4 @@ controlStatZ(statz, refstatz)
 
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
index 09b6897d6cade557e9ff8191cff82fa702bcbda7..bc63856b629273170fb7b746ccf9f5b1777fa12c 100644 (file)
--- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
+++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
@@ -17,7 +17,7 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
+hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 430000, 6.35e+06 )
 
@@ -596,7 +596,7 @@ garonne_1_riveDroite.SetName("garonne_1_riveDroite")
 garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 
 # Export of the calculation case
-garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
+garonne_1_entry = garonne_1.Export()
 
 #----------------------
 # --- Geometry
@@ -609,7 +609,7 @@ import math
 import SALOMEDS
 from salome.hydrotools.controls import controlGeomProps
 
-geompy = geomBuilder.New(theStudy)
+geompy = geomBuilder.New()
 
 print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
@@ -687,7 +687,7 @@ from salome.smesh import smeshBuilder
 from salome.hydrotools.controls import controlMeshStats, controlSubMeshStats
 import tempfile
 
-smesh = smeshBuilder.New(theStudy)
+smesh = smeshBuilder.New()
 
 # --- algorithms and hypothesis
 garonne_1 = smesh.Mesh(HYDRO_garonne_1)
@@ -764,7 +764,7 @@ controlSubMeshStats(riveDroite_1, 2342)
 controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(1)
+  salome.sg.updateObjBrowser()
 
 #----------------------
 # --- Z interpolation with HYDRO