From: Yoann Audouin Date: Mon, 19 Dec 2022 14:20:19 +0000 (+0100) Subject: Corrections of examples path after install with scbi X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;p=modules%2Fhydro.git 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 7783a698..4b12f11f 100644 --- a/doc/salome/examples/h001_importImage.py +++ b/doc/salome/examples/h001_importImage.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h002_importImage.py b/doc/salome/examples/h002_importImage.py index 24ba410f..8cba3169 100644 --- a/doc/salome/examples/h002_importImage.py +++ b/doc/salome/examples/h002_importImage.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h003_changeLCS.py b/doc/salome/examples/h003_changeLCS.py index 29d83e39..cfb64958 100644 --- a/doc/salome/examples/h003_changeLCS.py +++ b/doc/salome/examples/h003_changeLCS.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h004_importBathyXYZ.py b/doc/salome/examples/h004_importBathyXYZ.py index 895693ec..e140ab19 100644 --- a/doc/salome/examples/h004_importBathyXYZ.py +++ b/doc/salome/examples/h004_importBathyXYZ.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h005_importImageBad.py b/doc/salome/examples/h005_importImageBad.py index 5e42fc64..3162d10e 100644 --- a/doc/salome/examples/h005_importImageBad.py +++ b/doc/salome/examples/h005_importImageBad.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h006_importBathyXYZBad.py b/doc/salome/examples/h006_importBathyXYZBad.py index e1c09f4f..c7d66377 100644 --- a/doc/salome/examples/h006_importBathyXYZBad.py +++ b/doc/salome/examples/h006_importBathyXYZBad.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py index 4b3cfb7e..4f779cd2 100644 --- a/doc/salome/examples/h008_simpleCase.py +++ b/doc/salome/examples/h008_simpleCase.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h009_normalCaseManual.py b/doc/salome/examples/h009_normalCaseManual.py index 76e66cb4..5dc9a5bc 100644 --- a/doc/salome/examples/h009_normalCaseManual.py +++ b/doc/salome/examples/h009_normalCaseManual.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -print("edges_litMineurIds", edges_litMineurIds) +print("edges_litMineurIds", edges_litMineurIds) 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 12220ffa..a438d8c6 100644 --- a/doc/salome/examples/h010_normalCaseManualMesh.py +++ b/doc/salome/examples/h010_normalCaseManualMesh.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -print("edges_litMineurIds", edges_litMineurIds) +print("edges_litMineurIds", edges_litMineurIds) 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 f0be65e0..ad06710b 100644 --- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py +++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py index 86f93127..de1b8fe7 100644 --- a/doc/salome/examples/h012_caseDigueManual.py +++ b/doc/salome/examples/h012_caseDigueManual.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -print("edges_litMineurIds", edges_litMineurIds) +print("edges_litMineurIds", edges_litMineurIds) 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 88833c34..ca8dfac0 100644 --- a/doc/salome/examples/h013_caseDigueManualMesh.py +++ b/doc/salome/examples/h013_caseDigueManualMesh.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -print("edges_litMineurIds", edges_litMineurIds) +print("edges_litMineurIds", edges_litMineurIds) 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 77091f91..6433ad25 100644 --- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py +++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -print("edges_litMineurIds", edges_litMineurIds) +print("edges_litMineurIds", edges_litMineurIds) 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 8e757f7f..87a9461d 100644 --- a/doc/salome/examples/h015_normalCaseManualTelemac.py +++ b/doc/salome/examples/h015_normalCaseManualTelemac.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py index f6df09ea..8cbb1c5a 100644 --- a/doc/salome/examples/h016_pilesPontManualMesh.py +++ b/doc/salome/examples/h016_pilesPontManualMesh.py @@ -1,7 +1,7 @@ # -*- 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) @@ -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)) ] -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) diff --git a/doc/salome/examples/h017_interpolationLineaire.py b/doc/salome/examples/h017_interpolationLineaire.py index e1a9da58..0abb9b4f 100644 --- a/doc/salome/examples/h017_interpolationLineaire.py +++ b/doc/salome/examples/h017_interpolationLineaire.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h018_streamInterpolation.py b/doc/salome/examples/h018_streamInterpolation.py index 74c20b5d..9bfa13bc 100644 --- a/doc/salome/examples/h018_streamInterpolation.py +++ b/doc/salome/examples/h018_streamInterpolation.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py index 4df822ec..cb1612d6 100644 --- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py +++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py @@ -1,7 +1,7 @@ # -*- 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): diff --git a/doc/salome/examples/h020_normalCaseChangeBathy.py b/doc/salome/examples/h020_normalCaseChangeBathy.py index e875ec2a..77175245 100644 --- a/doc/salome/examples/h020_normalCaseChangeBathy.py +++ b/doc/salome/examples/h020_normalCaseChangeBathy.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h021_meshChangeBathy.py b/doc/salome/examples/h021_meshChangeBathy.py index 888f20a8..13d0745b 100644 --- a/doc/salome/examples/h021_meshChangeBathy.py +++ b/doc/salome/examples/h021_meshChangeBathy.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h022_extensionSimpleComplete.py b/doc/salome/examples/h022_extensionSimpleComplete.py index 7ee411fa..e0d8f263 100644 --- a/doc/salome/examples/h022_extensionSimpleComplete.py +++ b/doc/salome/examples/h022_extensionSimpleComplete.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h023_extensionSimpleAmont.py b/doc/salome/examples/h023_extensionSimpleAmont.py index b70039c0..2703f6b9 100644 --- a/doc/salome/examples/h023_extensionSimpleAmont.py +++ b/doc/salome/examples/h023_extensionSimpleAmont.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h024_extensionSimpleAval.py b/doc/salome/examples/h024_extensionSimpleAval.py index 2cc4dd03..bd7dcb4b 100644 --- a/doc/salome/examples/h024_extensionSimpleAval.py +++ b/doc/salome/examples/h024_extensionSimpleAval.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h025_extensionSimpleRiveDroite.py b/doc/salome/examples/h025_extensionSimpleRiveDroite.py index 9e9cf989..8ae25426 100644 --- a/doc/salome/examples/h025_extensionSimpleRiveDroite.py +++ b/doc/salome/examples/h025_extensionSimpleRiveDroite.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h026_extensionSimpleRiveGauche.py b/doc/salome/examples/h026_extensionSimpleRiveGauche.py index 455c15a7..686bad52 100644 --- a/doc/salome/examples/h026_extensionSimpleRiveGauche.py +++ b/doc/salome/examples/h026_extensionSimpleRiveGauche.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h027_regroupMeshes.py b/doc/salome/examples/h027_regroupMeshes.py index 3f8212e8..ca89ae48 100644 --- a/doc/salome/examples/h027_regroupMeshes.py +++ b/doc/salome/examples/h027_regroupMeshes.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h028_regroupOverlappingMeshes.py b/doc/salome/examples/h028_regroupOverlappingMeshes.py index 56fa834a..d2ee6226 100644 --- a/doc/salome/examples/h028_regroupOverlappingMeshes.py +++ b/doc/salome/examples/h028_regroupOverlappingMeshes.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py index 83f13eb5..827b2d8f 100644 --- a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py +++ b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h030_editNonHydroMesh.py b/doc/salome/examples/h030_editNonHydroMesh.py index fabcf1c2..329d7263 100644 --- a/doc/salome/examples/h030_editNonHydroMesh.py +++ b/doc/salome/examples/h030_editNonHydroMesh.py @@ -1,7 +1,7 @@ # -*- 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 diff --git a/doc/salome/examples/h031_interpolationLineaireStream.py b/doc/salome/examples/h031_interpolationLineaireStream.py index ffaf9bad..08605d50 100644 --- a/doc/salome/examples/h031_interpolationLineaireStream.py +++ b/doc/salome/examples/h031_interpolationLineaireStream.py @@ -1,7 +1,7 @@ # -*- 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 @@ -12,7 +12,7 @@ from PyQt5.QtCore import * from PyQt5.QtGui import * from salome.hydrotools.controls import controlValues - + 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 017d7870..c5b088df 100644 --- a/doc/salome/examples/h032_completeCaseNoRegions.py +++ b/doc/salome/examples/h032_completeCaseNoRegions.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h033_completeCaseModifiedRegions.py b/doc/salome/examples/h033_completeCaseModifiedRegions.py index 20f92466..3c3b179b 100644 --- a/doc/salome/examples/h033_completeCaseModifiedRegions.py +++ b/doc/salome/examples/h033_completeCaseModifiedRegions.py @@ -1,7 +1,7 @@ # -*- 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) diff --git a/doc/salome/examples/h034_splitShapes.py b/doc/salome/examples/h034_splitShapes.py index a6f863da..4f5eddc5 100644 --- a/doc/salome/examples/h034_splitShapes.py +++ b/doc/salome/examples/h034_splitShapes.py @@ -1,7 +1,7 @@ # -*- 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 @@ -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) - + seq = contours + lmajeurs shapeList = splitShapesAll(hydro_doc, seq) if len(shapeList) != 8: