Corrections of examples path after install with scbi

diff --git a/doc/salome/examples/h001_importImage.py b/doc/salome/examples/h001_importImage.py
index 7783a6980b68539c40b9f78fccf0d49c0bcb4dcb..4b12f11f7a0bb171fb7b5421bdfb1f27af983d63 100644 (file)
--- a/doc/salome/examples/h001_importImage.py
+++ b/doc/salome/examples/h001_importImage.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h002_importImage.py b/doc/salome/examples/h002_importImage.py
index 24ba410fff9b5e6175289433bb2a3c3f24085985..8cba316966e7955ee16a24d34dd7b4f392ed4a10 100644 (file)
--- a/doc/salome/examples/h002_importImage.py
+++ b/doc/salome/examples/h002_importImage.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h003_changeLCS.py b/doc/salome/examples/h003_changeLCS.py
index 29d83e398375013bd69f5e5551512fcae93b2423..cfb64958d3c16caa8a9a70b428f03bfc3f342637 100644 (file)
--- a/doc/salome/examples/h003_changeLCS.py
+++ b/doc/salome/examples/h003_changeLCS.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h004_importBathyXYZ.py b/doc/salome/examples/h004_importBathyXYZ.py
index 895693ec5a6885d3aa948f400e1d057f06cdaab4..e140ab19c86656f8a9568d28294f1b6fdfba6697 100644 (file)
--- a/doc/salome/examples/h004_importBathyXYZ.py
+++ b/doc/salome/examples/h004_importBathyXYZ.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h005_importImageBad.py b/doc/salome/examples/h005_importImageBad.py
index 5e42fc647c850e289c5ccf7ed32996f0c76e383a..3162d10ed4fa8a0aea8b9ee5ad3f01c502dbb854 100644 (file)
--- a/doc/salome/examples/h005_importImageBad.py
+++ b/doc/salome/examples/h005_importImageBad.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h006_importBathyXYZBad.py b/doc/salome/examples/h006_importBathyXYZBad.py
index e1c09f4f2391c64b391d7567b63f246d938dfc9f..c7d663775fc92f4e33f8888152942d6cfdbd61b6 100644 (file)
--- a/doc/salome/examples/h006_importBathyXYZBad.py
+++ b/doc/salome/examples/h006_importBathyXYZBad.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index 4b3cfb7ef56b49f1d576b3e20e03dd904983af63..4f779cd2ca7016964d428d6db2adff98f1117a2a 100644 (file)
--- a/doc/salome/examples/h008_simpleCase.py
+++ b/doc/salome/examples/h008_simpleCase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h009_normalCaseManual.py b/doc/salome/examples/h009_normalCaseManual.py
index 76e66cb444c0398ba5a1b5ef4f833deeb30f9203..5dc9a5bc934d4a19ce41f047ebab7a6f52f12958 100644 (file)
--- a/doc/salome/examples/h009_normalCaseManual.py
+++ b/doc/salome/examples/h009_normalCaseManual.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -165,7 +165,7 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_litMineurIds", edges_litMineurIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py
index 12220ffa8bba0bb34595f9afde268e51033ad792..a438d8c697de256200237380246f9d1621f87f44 100644 (file)
--- a/doc/salome/examples/h010_normalCaseManualMesh.py
+++ b/doc/salome/examples/h010_normalCaseManualMesh.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -165,7 +165,7 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_litMineurIds", edges_litMineurIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
index f0be65e00175bd6d0e4a41f26400a327261262ee..ad06710bac37c584c03c451a6943b2467a79b60b 100644 (file)
--- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py
+++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py
index 86f93127463aed278b117f25f1b05f123cd8049b..de1b8fe78b2cd723666b2ad92f5df6312ef1b3aa 100644 (file)
--- a/doc/salome/examples/h012_caseDigueManual.py
+++ b/doc/salome/examples/h012_caseDigueManual.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -191,7 +191,7 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_litMineurIds", edges_litMineurIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h013_caseDigueManualMesh.py b/doc/salome/examples/h013_caseDigueManualMesh.py
index 88833c34f3cbd1c703cf6ee0b27815e630152d89..ca8dfac03bd8160371bb945a51c75e3ea169e395 100644 (file)
--- a/doc/salome/examples/h013_caseDigueManualMesh.py
+++ b/doc/salome/examples/h013_caseDigueManualMesh.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -191,7 +191,7 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_litMineurIds", edges_litMineurIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
index 77091f91691e1bf8ea43d02abd6e8b84247c678a..6433ad257a908f6c77e69632d8ff7a666c9c3491 100644 (file)
--- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py
+++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -192,7 +192,7 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_litMineurIds", edges_litMineurIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py
index 8e757f7f2025d68ba773978d4b2d511037dc9b3b..87a9461d32058e50349296070e428da50300c8a0 100644 (file)
--- a/doc/salome/examples/h015_normalCaseManualTelemac.py
+++ b/doc/salome/examples/h015_normalCaseManualTelemac.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py
index f6df09ea1e6f9d883c6437661e95dbc845e04c15..8cbb1c5a321f4e2749363377660ea4f2162e750c 100644 (file)
--- a/doc/salome/examples/h016_pilesPontManualMesh.py
+++ b/doc/salome/examples/h016_pilesPontManualMesh.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)


@@ -276,9 +276,9 @@ edges_garonne_pontIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_garonne_po
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 

-print("edges_garonne_amontIds", edges_garonne_amontIds) 
-print("edges_garonne_avalIds", edges_garonne_avalIds) 
-print("edges_garonne_pontIds", edges_garonne_pontIds) 
+print("edges_garonne_amontIds", edges_garonne_amontIds)
+print("edges_garonne_avalIds", edges_garonne_avalIds)
+print("edges_garonne_pontIds", edges_garonne_pontIds)

 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 print("edges_riveGaucheIds", edges_riveGaucheIds)
 print("edges_riveDroiteIds", edges_riveDroiteIds)
 

diff --git a/doc/salome/examples/h017_interpolationLineaire.py b/doc/salome/examples/h017_interpolationLineaire.py
index e1a9da5887a8749e8064e073175b91e47dbf7a4b..0abb9b4f4d2e6e8b048551434f6bac8656f0848d 100644 (file)
--- a/doc/salome/examples/h017_interpolationLineaire.py
+++ b/doc/salome/examples/h017_interpolationLineaire.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome

diff --git a/doc/salome/examples/h018_streamInterpolation.py b/doc/salome/examples/h018_streamInterpolation.py
index 74c20b5d6f1ebfb620218456fd6aa2a907eb7e9d..9bfa13bcdb725c225b2c8ca67c32b6291c575c06 100644 (file)
--- a/doc/salome/examples/h018_streamInterpolation.py
+++ b/doc/salome/examples/h018_streamInterpolation.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_RESOURCES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "share/salome/resources/hydro")
 
 import sys
 HYDRO_RESOURCES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "share/salome/resources/hydro")
 
 import sys

diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
index 4df822ecf39cdb3024ba0c8ab284ca1b8ab13d67..cb1612d6cce0ef1cd3cf00700f93eb8a75936d04 100644 (file)
--- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
+++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_RESOURCES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "share/salome/resources/hydro")
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
 HYDRO_RESOURCES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "share/salome/resources/hydro")
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):

diff --git a/doc/salome/examples/h020_normalCaseChangeBathy.py b/doc/salome/examples/h020_normalCaseChangeBathy.py
index e875ec2a63fb75f5d5570175263b8e0b0e34cc76..77175245ee6186482e1a958df980872437172773 100644 (file)
--- a/doc/salome/examples/h020_normalCaseChangeBathy.py
+++ b/doc/salome/examples/h020_normalCaseChangeBathy.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h021_meshChangeBathy.py b/doc/salome/examples/h021_meshChangeBathy.py
index 888f20a807fba0307feca91ffc9cda033b100437..13d0745b8292c5e934a45a804c45dbc9e3d77855 100644 (file)
--- a/doc/salome/examples/h021_meshChangeBathy.py
+++ b/doc/salome/examples/h021_meshChangeBathy.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h022_extensionSimpleComplete.py b/doc/salome/examples/h022_extensionSimpleComplete.py
index 7ee411fafa93587bc9ae5e7b19ecb399032a9f0d..e0d8f263277f57e1eaf828a7e2e78b84551d06f4 100644 (file)
--- a/doc/salome/examples/h022_extensionSimpleComplete.py
+++ b/doc/salome/examples/h022_extensionSimpleComplete.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h023_extensionSimpleAmont.py b/doc/salome/examples/h023_extensionSimpleAmont.py
index b70039c086d29275bd01d2a046c74173f6c2173a..2703f6b90fea95ca257364f7c97665275a175310 100644 (file)
--- a/doc/salome/examples/h023_extensionSimpleAmont.py
+++ b/doc/salome/examples/h023_extensionSimpleAmont.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h024_extensionSimpleAval.py b/doc/salome/examples/h024_extensionSimpleAval.py
index 2cc4dd03b71aef0e00ddb8198d9312faa7a5af96..bd7dcb4bf22eb080e703ac04c5e0a73ef36909c1 100644 (file)
--- a/doc/salome/examples/h024_extensionSimpleAval.py
+++ b/doc/salome/examples/h024_extensionSimpleAval.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h025_extensionSimpleRiveDroite.py b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
index 9e9cf989a4cda5090b2456214271aaeba714c56a..8ae254269ccca4899451677f517d828062a60025 100644 (file)
--- a/doc/salome/examples/h025_extensionSimpleRiveDroite.py
+++ b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h026_extensionSimpleRiveGauche.py b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
index 455c15a709f188bf84d109d9c92c5b832fc1f689..686bad52e8929ea59181250dac63524d05fbd0bc 100644 (file)
--- a/doc/salome/examples/h026_extensionSimpleRiveGauche.py
+++ b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h027_regroupMeshes.py b/doc/salome/examples/h027_regroupMeshes.py
index 3f8212e822c13554ad6530a16b1a18eb2e11991f..ca89ae4812e746eb6c68c38ed96fb558dad733c0 100644 (file)
--- a/doc/salome/examples/h027_regroupMeshes.py
+++ b/doc/salome/examples/h027_regroupMeshes.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h028_regroupOverlappingMeshes.py b/doc/salome/examples/h028_regroupOverlappingMeshes.py
index 56fa834a071f10415558996090928c2e539d49d6..d2ee622657f406edad948c3920112edd964c4b17 100644 (file)
--- a/doc/salome/examples/h028_regroupOverlappingMeshes.py
+++ b/doc/salome/examples/h028_regroupOverlappingMeshes.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
index 83f13eb5de688c0a2dd80310dcb9cd0d353c7db0..827b2d8f0b8d4619770e6f969a37d0cedbc97a8d 100644 (file)
--- a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
+++ b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h030_editNonHydroMesh.py b/doc/salome/examples/h030_editNonHydroMesh.py
index fabcf1c2c0d7e6df2114a6b8fed3fe28c8797599..329d7263be60adb84b6b982b37ae746914d46c06 100644 (file)
--- a/doc/salome/examples/h030_editNonHydroMesh.py
+++ b/doc/salome/examples/h030_editNonHydroMesh.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile

diff --git a/doc/salome/examples/h031_interpolationLineaireStream.py b/doc/salome/examples/h031_interpolationLineaireStream.py
index ffaf9bad008bf11cd26168c3e6ebeea3964509e6..08605d50ab46c7977b63a383e79ed26877ab4d7e 100644 (file)
--- a/doc/salome/examples/h031_interpolationLineaireStream.py
+++ b/doc/salome/examples/h031_interpolationLineaireStream.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 
 import sys
 import salome
 
 import sys
 import salome


@@ -12,7 +12,7 @@ from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
 from salome.hydrotools.controls import controlValues
 from PyQt5.QtGui import *
 
 from salome.hydrotools.controls import controlValues

- 
+

 hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0.000, 0.000 )
 hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0.000, 0.000 )

diff --git a/doc/salome/examples/h032_completeCaseNoRegions.py b/doc/salome/examples/h032_completeCaseNoRegions.py
index 017d787035ecebf594a9ee85e419b292c9b2b76f..c5b088df25d90251ebc2bc95c6e852ebee5aca04 100644 (file)
--- a/doc/salome/examples/h032_completeCaseNoRegions.py
+++ b/doc/salome/examples/h032_completeCaseNoRegions.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h033_completeCaseModifiedRegions.py b/doc/salome/examples/h033_completeCaseModifiedRegions.py
index 20f924669a55996129112c05b1b2ffdcce422340..3c3b179b4032a2b896fa90d1d59b6e5df31bf7e5 100644 (file)
--- a/doc/salome/examples/h033_completeCaseModifiedRegions.py
+++ b/doc/salome/examples/h033_completeCaseModifiedRegions.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)

diff --git a/doc/salome/examples/h034_splitShapes.py b/doc/salome/examples/h034_splitShapes.py
index a6f863da2e199e79d1e8c4fca8841d75447fccd1..4f5eddc5767df7dcda5d9ddac7aa698ff5ac9ef7 100644 (file)
--- a/doc/salome/examples/h034_splitShapes.py
+++ b/doc/salome/examples/h034_splitShapes.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
 # -*- coding: utf-8 -*-
 
 import os

-HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test")

 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile


@@ -36,7 +36,7 @@ contours = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "contour.shp")
 lmajeurs = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lmajeur.shp"), True, 0)
 lm2s = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lm2.shp"), True, 0)
 openPolys = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "openPoly.shp"), False, 0)
 lmajeurs = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lmajeur.shp"), True, 0)
 lm2s = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lm2.shp"), True, 0)
 openPolys = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "openPoly.shp"), False, 0)

-                           
+

 seq = contours + lmajeurs
 shapeList = splitShapesAll(hydro_doc, seq)
 if len(shapeList) != 8:
 seq = contours + lmajeurs
 shapeList = splitShapesAll(hydro_doc, seq)
 if len(shapeList) != 8: