improve test h003 h008 h016

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index f67ef7f09f60bca418d2f4b35cbd21356530f203..2465008462c01c06a9104b5b5e08cf51a45852ce 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -110,12 +110,18 @@ SET(HYDRO_SAMPLES
   nouvelleDigue.shx
   openPoly.shp
   openPoly.shx
+  pilesPont.shp
+  pilesPont.shx
   raccord_4_1.shp
   raccord_4_1.shx
   raccord_4_2.shp
   raccord_4_2.shx
+  simplePolyline.shp
+  simplePolyline.shx
   zoneNouvelleDigue.shp
   zoneNouvelleDigue.shx
+  zonePont.shp
+  zonePont.shx
   condlim.bcd
   init.cas
   init.lqd

diff --git a/doc/salome/examples/h003_changeLCS.py b/doc/salome/examples/h003_changeLCS.py
index 27413ddf8c790b4fe63e5dbb0969c25aebf641a3..29d83e398375013bd69f5e5551512fcae93b2423 100644 (file)
--- a/doc/salome/examples/h003_changeLCS.py
+++ b/doc/salome/examples/h003_changeLCS.py
@@ -12,46 +12,23 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document()
-
-hydro_doc.SetLocalCS( 430000, 6.35e+06 )
-
-garonne_ign_01 = hydro_doc.CreateObject( KIND_IMAGE )
-garonne_ign_01.SetName( "garonne_ign_01" )
-
-garonne_ign_01.SetZLevel( 0 )
-
-
-if not(garonne_ign_01.LoadImage(os.path.join(HYDRO_SAMPLES, "garonne_ign_01.png" ))):
-  raise ValueError('problem while loading image')
-
-garonne_ign_01.SetLocalPoints( QPoint( 40, 817 ),
-                               QPoint( 1325, 85 ) )
+from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference
 
-garonne_ign_01.SetGlobalPoints( 1,
-                                QPointF( 471562, 6.36775e+06 ),
-                                QPointF( 489400, 6.37702e+06 ) )
-
-garonne_ign_01.Update()
-
-garonne_ign_02 = hydro_doc.CreateObject( KIND_IMAGE )
-garonne_ign_02.SetName( "garonne_ign_02" )
-
-garonne_ign_02.SetZLevel( 1 )
-
-
-if not(garonne_ign_02.LoadImage( os.path.join(HYDRO_SAMPLES, "garonne_ign_02.png" ))):
-  raise ValueError('problem while loading image')
+hydro_doc = HYDROData_Document.Document()
 
-garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ),
-                               QPoint( 784, 481 ) )
+offsetX = 430000.
+offsetY = 6350000.
+hydro_doc.SetLocalCS( offsetX, offsetY )
 
-garonne_ign_02.SetGlobalPoints( 3,
-                                QPointF( 631, 95 ),
-                                QPointF( 26, 129 ) )
-garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 )
+garonne_ign_01 = loadImage(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne_ign_01.png"), "garonne_ign_01", 0)
+GeolocaliseImageCoords(garonne_ign_01,
+                       QPoint(40, 817), QPoint(1325, 85),
+                       QPointF(471562, 6.36775e+06), QPointF(489400, 6.37702e+06))
 
-garonne_ign_02.Update()
+garonne_ign_02 = loadImage(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne_ign_02.png"), "garonne_ign_02", 1)
+GeolocaliseImageReference(garonne_ign_02, garonne_ign_01,
+                          QPoint(1389, 447), QPoint(784, 481),
+                          QPoint(631, 95), QPoint(26, 129))
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index 93cc139be41a793e93db91f3a77c4090c15d4bba..122e5f81ffce39d6490b90819b5ca49b52bb5a29 100644 (file)
--- a/doc/salome/examples/h008_simpleCase.py
+++ b/doc/salome/examples/h008_simpleCase.py
@@ -1,5 +1,15 @@
 # -*- coding: utf-8 -*-
 
+import os
+HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+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)
+
+import tempfile
+tmpdir = tempfile.mkdtemp()
+print("tmpdir=",tmpdir)
+
 import sys
 import salome
 
@@ -13,50 +23,26 @@ from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
+from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference
+from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetry, createImmersibleZone, mergePolylines, getChildrenInStudy
+
 hydro_doc = HYDROData_Document.Document()
 
 hydro_doc.SetLocalCS( 0, 0 )
 
-Polyline_1 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-Polyline_1.SetName( "Polyline_1" )
-
-Polyline_1.SetZLevel( 0 )
-
-Polyline_1.AddSection( "Section_1", 1, 1 )
-Polyline_1.AddPoint( 0, gp_XY( -123.36, 57.13 ) )
-Polyline_1.AddPoint( 0, gp_XY( -74.82, 122.85 ) )
-Polyline_1.AddPoint( 0, gp_XY( -2.02, 179.47 ) )
-Polyline_1.AddPoint( 0, gp_XY( 79.88, 98.58 ) )
-Polyline_1.AddPoint( 0, gp_XY( 138.52, 23.76 ) )
-Polyline_1.AddPoint( 0, gp_XY( 30.33, -27.81 ) )
-Polyline_1.AddPoint( 0, gp_XY( -21.23, -101.62 ) )
-Polyline_1.AddPoint( 0, gp_XY( -48.53, 7.58 ) )
-Polyline_1.AddPoint( 0, gp_XY( -121.33, -13.65 ) )
-Polyline_1.AddPoint( 0, gp_XY( -288.17, 86.45 ) )
-
-Polyline_1.Update()
-
-
-Immersible_zone_1 = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-Immersible_zone_1.SetName( "Immersible zone_1" )
-
-Immersible_zone_1.SetZLevel( 1 )
-
-Immersible_zone_1.SetPolyline( Polyline_1 )
-
-Immersible_zone_1.Update()
-
+simplePolylines = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "simplePolyline.shp"), "simplePolyline_PolyXY", True, 1)
+imZone = createImmersibleZone(hydro_doc, "imZone", simplePolylines[0], None, True, 0)
 
 # Calculation case
 Case_1 = hydro_doc.CreateObject( KIND_CALCULATION )
 Case_1.SetName( "Case_1" )
 
 Case_1.SetAssignmentMode( HYDROData_CalculationCase.AUTOMATIC )
-Case_1.AddGeometryObject( Immersible_zone_1 )
+Case_1.AddGeometryObject( imZone )
 
-case_geom_group = Immersible_zone_1.GetGroup( 0 );
+case_geom_group = imZone.GetGroup( 0 );
 Case_1.AddGeometryGroup( case_geom_group );
-Case_1.SetBoundaryPolyline( Polyline_1 )
+Case_1.SetBoundaryPolyline( simplePolylines[0] )
 
 # Start the algorithm of the partition and assignment
 Case_1.Update()
@@ -82,7 +68,6 @@ Case_1_geom = salome.IDToObject( str( Case_1_entry ) )
 print("Geom shape:", Case_1_geom)
 print("Geom shape name:", Case_1_geom.GetName())
 
-#controlGeomProps(geompy, Case_1_geom, 1218.7373973, 49697.2117918)
 controlGeomProps(geompy, Case_1_geom, 1218.7373973, 49578.1516521)
 
 if salome.sg.hasDesktop():

diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py
index f3d83999bfd5fc616f1837d1c84064a842fbff9d..eaa07b7880c01392e30e7dc6831028bb740d04e0 100644 (file)
--- a/doc/salome/examples/h016_pilesPontManualMesh.py
+++ b/doc/salome/examples/h016_pilesPontManualMesh.py
@@ -2,924 +2,79 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
+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)
 
-###
-### This file is generated automatically by SALOME v7.8.0 with dump python functionality
-###
+import tempfile
+tmpdir = tempfile.mkdtemp()
+print("tmpdir=",tmpdir)
 
 import sys
 import salome
 
 salome.salome_init()
 
-###
-### HYDRO component
-###
+#----------------------
+# --- HYDRO
+#----------------------
 
 from HYDROPy import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 
-hydro_doc = HYDROData_Document.Document()
-
-hydro_doc.SetLocalCS( 430000.000, 6350000.000 )
-
-garonne_ign_01 = hydro_doc.CreateObject( KIND_IMAGE )
-garonne_ign_01.SetName( "garonne_ign_01" )
-
-garonne_ign_01.SetZLevel( 0 )
-
-
-
-if not(garonne_ign_01.LoadImage(os.path.join(HYDRO_SAMPLES, "garonne_ign_01.png" ))):
-  raise ValueError('problem while loading image')
-
-garonne_ign_01.SetLocalPoints( QPoint( 40, 817 ),
-                               QPoint( 1325, 85 ) )
-
-garonne_ign_01.SetGlobalPoints( 1,
-                                QPointF( 471562.000, 6367750.000 ),
-                                QPointF( 489400.000, 6377020.000 ) )
-
-garonne_ign_01.Update()
-
-garonne_ign_02 = hydro_doc.CreateObject( KIND_IMAGE )
-garonne_ign_02.SetName( "garonne_ign_02" )
-
-garonne_ign_02.SetZLevel( 1 )
-
-
-if not(garonne_ign_02.LoadImage(  os.path.join(HYDRO_SAMPLES, "garonne_ign_02.png" ))):
-  raise ValueError('problem while loading image')
-
-garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ),
-                               QPoint( 784, 481 ) )
-
-garonne_ign_02.SetGlobalPoints( 3,
-                                QPointF( 631.000, 95.000 ),
-                                QPointF( 26.000, 129.000 ) )
-garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 )
-
-garonne_ign_02.Update()
-
-Strickler_table_1 = hydro_doc.CreateObject( KIND_STRICKLER_TABLE )
-Strickler_table_1.SetName( "Strickler table_1" )
-
-Strickler_table_1.SetAttrName( "CODE_06" )
-
-Strickler_table_1.Set( "Pelouses et pâturages naturels", 1.0321 )
-Strickler_table_1.SetAttrValue( "Pelouses et pâturages naturels", "321" )
-Strickler_table_1.SetColor( "Pelouses et pâturages naturels", QColor( 204, 242, 77 ) )
-
-Strickler_table_1.Set( "Aéroports", 1.0124 )
-Strickler_table_1.SetAttrValue( "Aéroports", "124" )
-Strickler_table_1.SetColor( "Aéroports", QColor( 230, 204, 230 ) )
-
-Strickler_table_1.Set( "Systèmes culturaux et parcellaires complexes", 1.0242 )
-Strickler_table_1.SetAttrValue( "Systèmes culturaux et parcellaires complexes", "242" )
-Strickler_table_1.SetColor( "Systèmes culturaux et parcellaires complexes", QColor( 255, 230, 77 ) )
-
-Strickler_table_1.Set( "Cultures annuelles associées à des cultures permanentes", 1.0241 )
-Strickler_table_1.SetAttrValue( "Cultures annuelles associées à des cultures permanentes", "241" )
-Strickler_table_1.SetColor( "Cultures annuelles associées à des cultures permanentes", QColor( 255, 230, 166 ) )
-
-Strickler_table_1.Set( "Forêt et végétation arbustive en mutation", 1.0324 )
-Strickler_table_1.SetAttrValue( "Forêt et végétation arbustive en mutation", "324" )
-Strickler_table_1.SetColor( "Forêt et végétation arbustive en mutation", QColor( 166, 242, 0 ) )
-
-Strickler_table_1.Set( "Décharges", 1.0132 )
-Strickler_table_1.SetAttrValue( "Décharges", "132" )
-Strickler_table_1.SetColor( "Décharges", QColor( 166, 77, 0 ) )
-
-Strickler_table_1.Set( "Végétation clairsemée", 1.0333 )
-Strickler_table_1.SetAttrValue( "Végétation clairsemée", "333" )
-Strickler_table_1.SetColor( "Végétation clairsemée", QColor( 204, 255, 204 ) )
-
-Strickler_table_1.Set( "Prairies et autres surfaces toujours en herbe à usage agricole", 1.0231 )
-Strickler_table_1.SetAttrValue( "Prairies et autres surfaces toujours en herbe à usage agricole", "231" )
-Strickler_table_1.SetColor( "Prairies et autres surfaces toujours en herbe à usage agricole", QColor( 230, 230, 77 ) )
-
-Strickler_table_1.Set( "Périmètres irrigués en permanence", 1.0212 )
-Strickler_table_1.SetAttrValue( "Périmètres irrigués en permanence", "212" )
-Strickler_table_1.SetColor( "Périmètres irrigués en permanence", QColor( 255, 255, 0 ) )
-
-Strickler_table_1.Set( "Plans d'eau", 1.0512 )
-Strickler_table_1.SetAttrValue( "Plans d'eau", "512" )
-Strickler_table_1.SetColor( "Plans d'eau", QColor( 128, 242, 230 ) )
-
-Strickler_table_1.Set( "Territoires agroforestiers", 1.0244 )
-Strickler_table_1.SetAttrValue( "Territoires agroforestiers", "244" )
-Strickler_table_1.SetColor( "Territoires agroforestiers", QColor( 242, 204, 166 ) )
-
-Strickler_table_1.Set( "Forêts mélangées", 1.0313 )
-Strickler_table_1.SetAttrValue( "Forêts mélangées", "313" )
-Strickler_table_1.SetColor( "Forêts mélangées", QColor( 77, 255, 0 ) )
-
-Strickler_table_1.Set( "Glaciers et neiges éternelles", 1.0335 )
-Strickler_table_1.SetAttrValue( "Glaciers et neiges éternelles", "335" )
-Strickler_table_1.SetColor( "Glaciers et neiges éternelles", QColor( 166, 230, 204 ) )
-
-Strickler_table_1.Set( "Plages, dunes et sable", 1.0331 )
-Strickler_table_1.SetAttrValue( "Plages, dunes et sable", "331" )
-Strickler_table_1.SetColor( "Plages, dunes et sable", QColor( 230, 230, 230 ) )
-
-Strickler_table_1.Set( "Zones incendiées", 1.0334 )
-Strickler_table_1.SetAttrValue( "Zones incendiées", "334" )
-Strickler_table_1.SetColor( "Zones incendiées", QColor( 0, 0, 0 ) )
-
-Strickler_table_1.Set( "Tissu urbain continu", 1.0111 )
-Strickler_table_1.SetAttrValue( "Tissu urbain continu", "111" )
-Strickler_table_1.SetColor( "Tissu urbain continu", QColor( 230, 0, 77 ) )
-
-Strickler_table_1.Set( "Chantiers", 1.0133 )
-Strickler_table_1.SetAttrValue( "Chantiers", "133" )
-Strickler_table_1.SetColor( "Chantiers", QColor( 255, 77, 255 ) )
-
-Strickler_table_1.Set( "Estuaires", 1.0522 )
-Strickler_table_1.SetAttrValue( "Estuaires", "522" )
-Strickler_table_1.SetColor( "Estuaires", QColor( 166, 255, 230 ) )
-
-Strickler_table_1.Set( "Marais maritimes", 1.0421 )
-Strickler_table_1.SetAttrValue( "Marais maritimes", "421" )
-Strickler_table_1.SetColor( "Marais maritimes", QColor( 204, 204, 255 ) )
-
-Strickler_table_1.Set( "Forêts de conifères", 1.0312 )
-Strickler_table_1.SetAttrValue( "Forêts de conifères", "312" )
-Strickler_table_1.SetColor( "Forêts de conifères", QColor( 0, 166, 0 ) )
-
-Strickler_table_1.Set( "Surfaces essentiellement agricoles, interrompues par des espaces naturels importants", 1.0243 )
-Strickler_table_1.SetAttrValue( "Surfaces essentiellement agricoles, interrompues par des espaces naturels importants", "243" )
-Strickler_table_1.SetColor( "Surfaces essentiellement agricoles, interrompues par des espaces naturels importants", QColor( 230, 204, 77 ) )
-
-Strickler_table_1.Set( "Tourbières", 1.0412 )
-Strickler_table_1.SetAttrValue( "Tourbières", "412" )
-Strickler_table_1.SetColor( "Tourbières", QColor( 77, 77, 255 ) )
-
-Strickler_table_1.Set( "Extraction de matériaux", 1.0131 )
-Strickler_table_1.SetAttrValue( "Extraction de matériaux", "131" )
-Strickler_table_1.SetColor( "Extraction de matériaux", QColor( 166, 0, 204 ) )
-
-Strickler_table_1.Set( "Réseaux routier et ferroviaire et espaces associés", 1.0122 )
-Strickler_table_1.SetAttrValue( "Réseaux routier et ferroviaire et espaces associés", "122" )
-Strickler_table_1.SetColor( "Réseaux routier et ferroviaire et espaces associés", QColor( 204, 0, 0 ) )
-
-Strickler_table_1.Set( "Mers et océans", 1.0523 )
-Strickler_table_1.SetAttrValue( "Mers et océans", "523" )
-Strickler_table_1.SetColor( "Mers et océans", QColor( 230, 242, 255 ) )
-
-Strickler_table_1.Set( "Equipements sportifs et de loisirs", 1.0142 )
-Strickler_table_1.SetAttrValue( "Equipements sportifs et de loisirs", "142" )
-Strickler_table_1.SetColor( "Equipements sportifs et de loisirs", QColor( 255, 230, 255 ) )
-
-Strickler_table_1.Set( "Forêts de feuillus", 1.0311 )
-Strickler_table_1.SetAttrValue( "Forêts de feuillus", "311" )
-Strickler_table_1.SetColor( "Forêts de feuillus", QColor( 128, 255, 0 ) )
-
-Strickler_table_1.Set( "Vergers et petits fruits", 1.0222 )
-Strickler_table_1.SetAttrValue( "Vergers et petits fruits", "222" )
-Strickler_table_1.SetColor( "Vergers et petits fruits", QColor( 242, 166, 77 ) )
-
-Strickler_table_1.Set( "Végétation sclérophylle", 1.0323 )
-Strickler_table_1.SetAttrValue( "Végétation sclérophylle", "323" )
-Strickler_table_1.SetColor( "Végétation sclérophylle", QColor( 166, 230, 77 ) )
-
-Strickler_table_1.Set( "Landes et broussailles", 1.0322 )
-Strickler_table_1.SetAttrValue( "Landes et broussailles", "322" )
-Strickler_table_1.SetColor( "Landes et broussailles", QColor( 166, 255, 128 ) )
-
-Strickler_table_1.Set( "Tissu urbain discontinu", 1.0112 )
-Strickler_table_1.SetAttrValue( "Tissu urbain discontinu", "112" )
-Strickler_table_1.SetColor( "Tissu urbain discontinu", QColor( 255, 0, 0 ) )
-
-Strickler_table_1.Set( "Cours et voies d'eau", 1.0511 )
-Strickler_table_1.SetAttrValue( "Cours et voies d'eau", "511" )
-Strickler_table_1.SetColor( "Cours et voies d'eau", QColor( 0, 204, 242 ) )
-
-Strickler_table_1.Set( "Oliveraies", 1.0223 )
-Strickler_table_1.SetAttrValue( "Oliveraies", "223" )
-Strickler_table_1.SetColor( "Oliveraies", QColor( 230, 166, 0 ) )
-
-Strickler_table_1.Set( "Vignobles", 1.0221 )
-Strickler_table_1.SetAttrValue( "Vignobles", "221" )
-Strickler_table_1.SetColor( "Vignobles", QColor( 230, 128, 0 ) )
-
-Strickler_table_1.Set( "Rizières", 1.0213 )
-Strickler_table_1.SetAttrValue( "Rizières", "213" )
-Strickler_table_1.SetColor( "Rizières", QColor( 230, 230, 0 ) )
-
-Strickler_table_1.Set( "Zones portuaires", 1.0123 )
-Strickler_table_1.SetAttrValue( "Zones portuaires", "123" )
-Strickler_table_1.SetColor( "Zones portuaires", QColor( 230, 204, 204 ) )
-
-Strickler_table_1.Set( "Zones industrielles ou commerciales et installations publiques", 1.0121 )
-Strickler_table_1.SetAttrValue( "Zones industrielles ou commerciales et installations publiques", "121" )
-Strickler_table_1.SetColor( "Zones industrielles ou commerciales et installations publiques", QColor( 204, 77, 242 ) )
-
-Strickler_table_1.Set( "Marais salants", 1.0422 )
-Strickler_table_1.SetAttrValue( "Marais salants", "422" )
-Strickler_table_1.SetColor( "Marais salants", QColor( 230, 230, 255 ) )
-
-Strickler_table_1.Set( "Marais intérieurs", 1.0411 )
-Strickler_table_1.SetAttrValue( "Marais intérieurs", "411" )
-Strickler_table_1.SetColor( "Marais intérieurs", QColor( 166, 166, 255 ) )
-
-Strickler_table_1.Set( "Espaces verts urbains", 1.0141 )
-Strickler_table_1.SetAttrValue( "Espaces verts urbains", "141" )
-Strickler_table_1.SetColor( "Espaces verts urbains", QColor( 255, 166, 255 ) )
-
-Strickler_table_1.Set( "Lagunes littorales", 1.0521 )
-Strickler_table_1.SetAttrValue( "Lagunes littorales", "521" )
-Strickler_table_1.SetColor( "Lagunes littorales", QColor( 0, 255, 166 ) )
-
-Strickler_table_1.Set( "Roches nues", 1.0332 )
-Strickler_table_1.SetAttrValue( "Roches nues", "332" )
-Strickler_table_1.SetColor( "Roches nues", QColor( 204, 204, 204 ) )
-
-Strickler_table_1.Set( "Terres arables hors périmètres d'irrigation", 1.0211 )
-Strickler_table_1.SetAttrValue( "Terres arables hors périmètres d'irrigation", "211" )
-Strickler_table_1.SetColor( "Terres arables hors périmètres d'irrigation", QColor( 255, 255, 168 ) )
-
-Strickler_table_1.Set( "Zones intertidales", 1.0423 )
-Strickler_table_1.SetAttrValue( "Zones intertidales", "423" )
-Strickler_table_1.SetColor( "Zones intertidales", QColor( 166, 166, 230 ) )
-
-
-Strickler_table_1.Update()
-
-garonne = hydro_doc.CreateObject( KIND_POLYLINEXY )
-garonne.SetName( "garonne" )
-
-garonne.SetZLevel( 2 )
-
-garonne.AddSection( "Section_1", 1, 1 )
-garonne.AddPoint( 0, gp_XY( 38191.48, 33184.55 ) )
-garonne.AddPoint( 0, gp_XY( 38553.78, 33013.53 ) )
-garonne.AddPoint( 0, gp_XY( 38993.90, 32767.64 ) )
-garonne.AddPoint( 0, gp_XY( 39678.58, 32533.58 ) )
-garonne.AddPoint( 0, gp_XY( 40240.26, 32305.27 ) )
-garonne.AddPoint( 0, gp_XY( 40717.94, 32193.70 ) )
-garonne.AddPoint( 0, gp_XY( 41361.00, 32464.18 ) )
-garonne.AddPoint( 0, gp_XY( 41831.41, 32626.69 ) )
-garonne.AddPoint( 0, gp_XY( 41950.14, 32618.24 ) )
-garonne.AddPoint( 0, gp_XY( 42524.97, 32419.61 ) )
-garonne.AddPoint( 0, gp_XY( 42616.62, 32385.32 ) )
-garonne.AddPoint( 0, gp_XY( 42693.37, 32357.54 ) )
-garonne.AddPoint( 0, gp_XY( 42779.45, 32327.87 ) )
-garonne.AddPoint( 0, gp_XY( 42909.80, 32291.33 ) )
-garonne.AddPoint( 0, gp_XY( 43177.03, 32269.95 ) )
-garonne.AddPoint( 0, gp_XY( 43465.65, 32344.78 ) )
-garonne.AddPoint( 0, gp_XY( 43754.27, 32152.37 ) )
-garonne.AddPoint( 0, gp_XY( 44128.40, 31842.37 ) )
-garonne.AddPoint( 0, gp_XY( 44003.90, 31269.93 ) )
-garonne.AddPoint( 0, gp_XY( 44010.82, 30869.63 ) )
-garonne.AddPoint( 0, gp_XY( 44064.26, 30655.84 ) )
-garonne.AddPoint( 0, gp_XY( 44434.73, 30366.18 ) )
-garonne.AddPoint( 0, gp_XY( 45208.04, 30484.81 ) )
-garonne.AddPoint( 0, gp_XY( 45705.01, 30287.34 ) )
-garonne.AddPoint( 0, gp_XY( 45933.89, 30046.87 ) )
-garonne.AddPoint( 0, gp_XY( 46127.34, 29490.68 ) )
-garonne.AddPoint( 0, gp_XY( 46111.60, 29226.08 ) )
-garonne.AddPoint( 0, gp_XY( 46228.62, 28784.05 ) )
-garonne.AddPoint( 0, gp_XY( 46247.64, 28449.75 ) )
-garonne.AddPoint( 0, gp_XY( 46108.48, 28086.94 ) )
-garonne.AddPoint( 0, gp_XY( 45618.52, 27553.74 ) )
-garonne.AddPoint( 0, gp_XY( 45276.77, 27042.78 ) )
-garonne.AddPoint( 0, gp_XY( 45001.89, 26273.15 ) )
-garonne.AddPoint( 0, gp_XY( 45167.76, 25975.34 ) )
-garonne.AddPoint( 0, gp_XY( 46018.15, 25848.84 ) )
-garonne.AddPoint( 0, gp_XY( 46378.94, 25872.21 ) )
-garonne.AddPoint( 0, gp_XY( 46885.57, 25937.64 ) )
-garonne.AddPoint( 0, gp_XY( 47278.36, 25782.88 ) )
-garonne.AddPoint( 0, gp_XY( 47153.86, 25728.04 ) )
-garonne.AddPoint( 0, gp_XY( 46987.51, 25749.97 ) )
-garonne.AddPoint( 0, gp_XY( 46658.26, 25715.71 ) )
-garonne.AddPoint( 0, gp_XY( 45650.76, 25634.46 ) )
-garonne.AddPoint( 0, gp_XY( 45122.63, 25748.21 ) )
-garonne.AddPoint( 0, gp_XY( 44797.63, 26325.09 ) )
-garonne.AddPoint( 0, gp_XY( 45114.51, 27168.75 ) )
-garonne.AddPoint( 0, gp_XY( 45508.28, 27713.21 ) )
-garonne.AddPoint( 0, gp_XY( 45994.19, 28382.53 ) )
-garonne.AddPoint( 0, gp_XY( 45927.01, 29201.34 ) )
-garonne.AddPoint( 0, gp_XY( 45756.39, 29859.47 ) )
-garonne.AddPoint( 0, gp_XY( 45390.76, 30151.97 ) )
-garonne.AddPoint( 0, gp_XY( 45039.85, 30120.84 ) )
-garonne.AddPoint( 0, gp_XY( 44513.26, 30084.28 ) )
-garonne.AddPoint( 0, gp_XY( 43923.42, 30426.28 ) )
-garonne.AddPoint( 0, gp_XY( 43768.81, 30934.29 ) )
-garonne.AddPoint( 0, gp_XY( 43820.10, 31425.20 ) )
-garonne.AddPoint( 0, gp_XY( 43854.78, 31801.12 ) )
-garonne.AddPoint( 0, gp_XY( 43479.64, 32053.54 ) )
-garonne.AddPoint( 0, gp_XY( 42923.47, 32051.85 ) )
-garonne.AddPoint( 0, gp_XY( 42695.92, 32118.36 ) )
-garonne.AddPoint( 0, gp_XY( 42610.32, 32148.41 ) )
-garonne.AddPoint( 0, gp_XY( 42532.63, 32175.19 ) )
-garonne.AddPoint( 0, gp_XY( 42493.64, 32187.97 ) )
-garonne.AddPoint( 0, gp_XY( 42074.27, 32302.91 ) )
-garonne.AddPoint( 0, gp_XY( 41624.75, 32330.93 ) )
-garonne.AddPoint( 0, gp_XY( 41325.93, 32187.97 ) )
-garonne.AddPoint( 0, gp_XY( 40879.52, 31987.29 ) )
-garonne.AddPoint( 0, gp_XY( 40308.78, 32018.46 ) )
-garonne.AddPoint( 0, gp_XY( 39782.86, 32207.17 ) )
-garonne.AddPoint( 0, gp_XY( 38814.10, 32560.43 ) )
-garonne.AddPoint( 0, gp_XY( 38302.17, 32903.70 ) )
-
-garonne.Update()
-
-
-domaine = hydro_doc.CreateObject( KIND_POLYLINEXY )
-domaine.SetName( "domaine" )
-
-domaine.SetZLevel( 3 )
-
-domaine.AddSection( "Section_1", 0, 1 )
-domaine.AddPoint( 0, gp_XY( 39901.15, 34762.30 ) )
-domaine.AddPoint( 0, gp_XY( 38086.50, 29964.69 ) )
-domaine.AddPoint( 0, gp_XY( 44835.83, 24264.97 ) )
-domaine.AddPoint( 0, gp_XY( 46758.56, 25021.86 ) )
-domaine.AddPoint( 0, gp_XY( 46757.20, 26601.21 ) )
-domaine.AddPoint( 0, gp_XY( 48566.45, 30152.81 ) )
-domaine.AddPoint( 0, gp_XY( 45532.36, 33239.83 ) )
-domaine.AddPoint( 0, gp_XY( 43548.77, 34048.39 ) )
-
-domaine.Update()
-
-
-lit_majeur = hydro_doc.CreateObject( KIND_POLYLINEXY )
-lit_majeur.SetName( "lit_majeur" )
-
-lit_majeur.SetZLevel( 7 )
-
-lit_majeur.AddSection( "Section_1", 1, 1 )
-lit_majeur.AddPoint( 0, gp_XY( 41225.22, 34118.46 ) )
-lit_majeur.AddPoint( 0, gp_XY( 41716.41, 33705.87 ) )
-lit_majeur.AddPoint( 0, gp_XY( 42384.43, 33293.27 ) )
-lit_majeur.AddPoint( 0, gp_XY( 42561.26, 32684.19 ) )
-lit_majeur.AddPoint( 0, gp_XY( 42875.62, 32369.83 ) )
-lit_majeur.AddPoint( 0, gp_XY( 43700.82, 32350.18 ) )
-lit_majeur.AddPoint( 0, gp_XY( 44526.02, 31662.51 ) )
-lit_majeur.AddPoint( 0, gp_XY( 45370.87, 31819.69 ) )
-lit_majeur.AddPoint( 0, gp_XY( 46274.66, 31682.16 ) )
-lit_majeur.AddPoint( 0, gp_XY( 46981.97, 31328.50 ) )
-lit_majeur.AddPoint( 0, gp_XY( 47021.27, 30719.43 ) )
-lit_majeur.AddPoint( 0, gp_XY( 47217.74, 30051.41 ) )
-lit_majeur.AddPoint( 0, gp_XY( 47846.46, 29560.22 ) )
-lit_majeur.AddPoint( 0, gp_XY( 48730.61, 28735.02 ) )
-lit_majeur.AddPoint( 0, gp_XY( 48809.20, 27732.99 ) )
-lit_majeur.AddPoint( 0, gp_XY( 49143.21, 27163.21 ) )
-lit_majeur.AddPoint( 0, gp_XY( 49654.05, 26829.20 ) )
-lit_majeur.AddPoint( 0, gp_XY( 49693.34, 25355.63 ) )
-lit_majeur.AddPoint( 0, gp_XY( 48612.72, 23214.04 ) )
-lit_majeur.AddPoint( 0, gp_XY( 47453.51, 23115.80 ) )
-lit_majeur.AddPoint( 0, gp_XY( 46471.13, 24176.77 ) )
-lit_majeur.AddPoint( 0, gp_XY( 45960.29, 25257.39 ) )
-lit_majeur.AddPoint( 0, gp_XY( 44899.32, 25591.40 ) )
-lit_majeur.AddPoint( 0, gp_XY( 44270.60, 26573.78 ) )
-lit_majeur.AddPoint( 0, gp_XY( 43248.92, 27909.82 ) )
-lit_majeur.AddPoint( 0, gp_XY( 42757.73, 28243.83 ) )
-lit_majeur.AddPoint( 0, gp_XY( 42266.54, 28342.07 ) )
-lit_majeur.AddPoint( 0, gp_XY( 41736.06, 28106.30 ) )
-lit_majeur.AddPoint( 0, gp_XY( 41402.05, 28833.26 ) )
-lit_majeur.AddPoint( 0, gp_XY( 40910.86, 28911.85 ) )
-lit_majeur.AddPoint( 0, gp_XY( 40576.85, 29324.45 ) )
-lit_majeur.AddPoint( 0, gp_XY( 40144.60, 29599.51 ) )
-lit_majeur.AddPoint( 0, gp_XY( 39024.69, 30130.00 ) )
-lit_majeur.AddPoint( 0, gp_XY( 38612.09, 30365.77 ) )
-lit_majeur.AddPoint( 0, gp_XY( 38828.21, 33391.50 ) )
-
-lit_majeur.Update()
-
-
-zonePont = hydro_doc.CreateObject( KIND_POLYLINEXY )
-zonePont.SetName( "zonePont" )
-
-zonePont.SetZLevel( 8 )
-
-zonePont.AddSection( "Section_1", 0, 1 )
-zonePont.AddPoint( 0, gp_XY( 42665.99, 32409.30 ) )
-zonePont.AddPoint( 0, gp_XY( 42550.53, 32102.00 ) )
-zonePont.AddPoint( 0, gp_XY( 42634.02, 32078.91 ) )
-zonePont.AddPoint( 0, gp_XY( 42760.14, 32375.55 ) )
-
-zonePont.Update()
-
-
-pilesPont = hydro_doc.CreateObject( KIND_POLYLINEXY )
-pilesPont.SetName( "pilesPont" )
-
-pilesPont.SetZLevel( 9 )
-
-pilesPont.AddSection( "pile_1", 0, 1 )
-pilesPont.AddPoint( 0, gp_XY( 42682.74, 32343.21 ) )
-pilesPont.AddPoint( 0, gp_XY( 42707.79, 32333.28 ) )
-pilesPont.AddPoint( 0, gp_XY( 42702.98, 32321.41 ) )
-pilesPont.AddPoint( 0, gp_XY( 42678.02, 32331.39 ) )
-pilesPont.AddSection( "ple_2", 0, 1 )
-pilesPont.AddPoint( 1, gp_XY( 42661.48, 32289.81 ) )
-pilesPont.AddPoint( 1, gp_XY( 42656.20, 32278.41 ) )
-pilesPont.AddPoint( 1, gp_XY( 42680.85, 32266.59 ) )
-pilesPont.AddPoint( 1, gp_XY( 42685.58, 32278.46 ) )
-pilesPont.AddSection( "pile_3", 0, 1 )
-pilesPont.AddPoint( 2, gp_XY( 42636.43, 32232.62 ) )
-pilesPont.AddPoint( 2, gp_XY( 42662.90, 32221.76 ) )
-pilesPont.AddPoint( 2, gp_XY( 42658.07, 32209.53 ) )
-pilesPont.AddPoint( 2, gp_XY( 42631.35, 32220.39 ) )
-pilesPont.AddSection( "pile_4", 0, 1 )
-pilesPont.AddPoint( 3, gp_XY( 42618.95, 32182.53 ) )
-pilesPont.AddPoint( 3, gp_XY( 42643.52, 32171.19 ) )
-pilesPont.AddPoint( 3, gp_XY( 42638.37, 32159.06 ) )
-pilesPont.AddPoint( 3, gp_XY( 42612.99, 32170.62 ) )
-
-pilesPont.Update()
-
-
-Polyline_1 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-Polyline_1.SetName( "Polyline_1" )
-
-Polyline_1.SetZLevel( 25 )
-
-Polyline_1.AddSection( "Section_1", 0, 0 )
-Polyline_1.AddPoint( 0, gp_XY( 42541.98, 32295.56 ) )
-Polyline_1.AddPoint( 0, gp_XY( 42827.09, 32211.82 ) )
-
-Polyline_1.Update()
-
-
-pontEtPiles_7 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-pontEtPiles_7.SetName( "pontEtPiles_7" )
-
-pontEtPiles_7.SetZLevel( 29 )
-
-pontEtPiles_7.AddSection( "Section_1", 0, 0 )
-pontEtPiles_7.AddPoint( 0, gp_XY( 42682.74, 32343.21 ) )
-pontEtPiles_7.AddPoint( 0, gp_XY( 42707.79, 32333.28 ) )
-pontEtPiles_7.AddPoint( 0, gp_XY( 42702.98, 32321.41 ) )
-pontEtPiles_7.AddPoint( 0, gp_XY( 42678.02, 32331.39 ) )
-pontEtPiles_7.AddPoint( 0, gp_XY( 42682.74, 32343.21 ) )
-
-pontEtPiles_7.Update()
-
-
-pontEtPiles_8 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-pontEtPiles_8.SetName( "pontEtPiles_8" )
-
-pontEtPiles_8.SetZLevel( 28 )
-
-pontEtPiles_8.AddSection( "Section_1", 0, 0 )
-pontEtPiles_8.AddPoint( 0, gp_XY( 42661.48, 32289.81 ) )
-pontEtPiles_8.AddPoint( 0, gp_XY( 42656.20, 32278.41 ) )
-pontEtPiles_8.AddPoint( 0, gp_XY( 42680.85, 32266.59 ) )
-pontEtPiles_8.AddPoint( 0, gp_XY( 42685.58, 32278.46 ) )
-pontEtPiles_8.AddPoint( 0, gp_XY( 42661.48, 32289.81 ) )
+from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference
+from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetry, createImmersibleZone, mergePolylines, getChildrenInStudy
+from salome.hydrotools.hydroGeoMeshUtils import splitShapesAll, mergePolylines
 
-pontEtPiles_8.Update()
-
-
-pontEtPiles_9 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-pontEtPiles_9.SetName( "pontEtPiles_9" )
-
-pontEtPiles_9.SetZLevel( 27 )
-
-pontEtPiles_9.AddSection( "Section_1", 0, 0 )
-pontEtPiles_9.AddPoint( 0, gp_XY( 42636.43, 32232.62 ) )
-pontEtPiles_9.AddPoint( 0, gp_XY( 42662.90, 32221.76 ) )
-pontEtPiles_9.AddPoint( 0, gp_XY( 42658.07, 32209.53 ) )
-pontEtPiles_9.AddPoint( 0, gp_XY( 42631.35, 32220.39 ) )
-pontEtPiles_9.AddPoint( 0, gp_XY( 42636.43, 32232.62 ) )
-
-pontEtPiles_9.Update()
-
-
-pontEtPiles_10 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-pontEtPiles_10.SetName( "pontEtPiles_10" )
-
-pontEtPiles_10.SetZLevel( 26 )
-
-pontEtPiles_10.AddSection( "Section_1", 0, 0 )
-pontEtPiles_10.AddPoint( 0, gp_XY( 42618.95, 32182.53 ) )
-pontEtPiles_10.AddPoint( 0, gp_XY( 42643.52, 32171.19 ) )
-pontEtPiles_10.AddPoint( 0, gp_XY( 42638.37, 32159.06 ) )
-pontEtPiles_10.AddPoint( 0, gp_XY( 42612.99, 32170.62 ) )
-pontEtPiles_10.AddPoint( 0, gp_XY( 42618.95, 32182.53 ) )
-
-pontEtPiles_10.Update()
-
-
-garonne_2 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-garonne_2.SetName( "garonne_2" )
-
-garonne_2.SetZLevel( 37 )
-
-garonne_2.AddSection( "Section_1", 1, 0 )
-garonne_2.AddPoint( 0, gp_XY( 42652.10, 32372.34 ) )
-garonne_2.AddPoint( 0, gp_XY( 42693.37, 32357.54 ) )
-garonne_2.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-
-garonne_2.Update()
-
-
-garonne_3 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-garonne_3.SetName( "garonne_3" )
-
-garonne_3.SetZLevel( 36 )
-
-garonne_3.AddSection( "Section_1", 1, 0 )
-garonne_3.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-garonne_3.AddPoint( 0, gp_XY( 42779.45, 32327.87 ) )
-garonne_3.AddPoint( 0, gp_XY( 42909.80, 32291.33 ) )
-garonne_3.AddPoint( 0, gp_XY( 43177.03, 32269.95 ) )
-garonne_3.AddPoint( 0, gp_XY( 43465.65, 32344.78 ) )
-garonne_3.AddPoint( 0, gp_XY( 43754.27, 32152.37 ) )
-garonne_3.AddPoint( 0, gp_XY( 44128.40, 31842.37 ) )
-garonne_3.AddPoint( 0, gp_XY( 44003.90, 31269.93 ) )
-garonne_3.AddPoint( 0, gp_XY( 44010.82, 30869.63 ) )
-garonne_3.AddPoint( 0, gp_XY( 44064.26, 30655.84 ) )
-garonne_3.AddPoint( 0, gp_XY( 44434.73, 30366.18 ) )
-garonne_3.AddPoint( 0, gp_XY( 45208.04, 30484.81 ) )
-garonne_3.AddPoint( 0, gp_XY( 45705.01, 30287.34 ) )
-garonne_3.AddPoint( 0, gp_XY( 45933.89, 30046.87 ) )
-garonne_3.AddPoint( 0, gp_XY( 46127.34, 29490.68 ) )
-garonne_3.AddPoint( 0, gp_XY( 46111.60, 29226.08 ) )
-garonne_3.AddPoint( 0, gp_XY( 46228.62, 28784.05 ) )
-garonne_3.AddPoint( 0, gp_XY( 46247.64, 28449.75 ) )
-garonne_3.AddPoint( 0, gp_XY( 46108.48, 28086.94 ) )
-garonne_3.AddPoint( 0, gp_XY( 45618.52, 27553.74 ) )
-garonne_3.AddPoint( 0, gp_XY( 45276.77, 27042.78 ) )
-garonne_3.AddPoint( 0, gp_XY( 45001.89, 26273.15 ) )
-garonne_3.AddPoint( 0, gp_XY( 45167.76, 25975.34 ) )
-garonne_3.AddPoint( 0, gp_XY( 46018.15, 25848.84 ) )
-garonne_3.AddPoint( 0, gp_XY( 46378.94, 25872.21 ) )
-garonne_3.AddPoint( 0, gp_XY( 46885.57, 25937.64 ) )
-garonne_3.AddPoint( 0, gp_XY( 47278.36, 25782.88 ) )
-garonne_3.AddPoint( 0, gp_XY( 47153.86, 25728.04 ) )
-garonne_3.AddPoint( 0, gp_XY( 46987.51, 25749.97 ) )
-garonne_3.AddPoint( 0, gp_XY( 46658.26, 25715.71 ) )
-garonne_3.AddPoint( 0, gp_XY( 45650.76, 25634.46 ) )
-garonne_3.AddPoint( 0, gp_XY( 45122.63, 25748.21 ) )
-garonne_3.AddPoint( 0, gp_XY( 44797.63, 26325.09 ) )
-garonne_3.AddPoint( 0, gp_XY( 45114.51, 27168.75 ) )
-garonne_3.AddPoint( 0, gp_XY( 45508.28, 27713.21 ) )
-garonne_3.AddPoint( 0, gp_XY( 45994.19, 28382.53 ) )
-garonne_3.AddPoint( 0, gp_XY( 45927.01, 29201.34 ) )
-garonne_3.AddPoint( 0, gp_XY( 45756.39, 29859.47 ) )
-garonne_3.AddPoint( 0, gp_XY( 45390.76, 30151.97 ) )
-garonne_3.AddPoint( 0, gp_XY( 45039.85, 30120.84 ) )
-garonne_3.AddPoint( 0, gp_XY( 44513.26, 30084.28 ) )
-garonne_3.AddPoint( 0, gp_XY( 43923.42, 30426.28 ) )
-garonne_3.AddPoint( 0, gp_XY( 43768.81, 30934.29 ) )
-garonne_3.AddPoint( 0, gp_XY( 43820.10, 31425.20 ) )
-garonne_3.AddPoint( 0, gp_XY( 43854.78, 31801.12 ) )
-garonne_3.AddPoint( 0, gp_XY( 43479.64, 32053.54 ) )
-garonne_3.AddPoint( 0, gp_XY( 42923.47, 32051.85 ) )
-garonne_3.AddPoint( 0, gp_XY( 42695.92, 32118.36 ) )
-garonne_3.AddPoint( 0, gp_XY( 42656.54, 32131.87 ) )
-
-garonne_3.Update()
-
-
-garonne_4 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-garonne_4.SetName( "garonne_4" )
-
-garonne_4.SetZLevel( 35 )
-
-garonne_4.AddSection( "Section_1", 1, 0 )
-garonne_4.AddPoint( 0, gp_XY( 42656.54, 32131.87 ) )
-garonne_4.AddPoint( 0, gp_XY( 42610.32, 32148.41 ) )
-garonne_4.AddPoint( 0, gp_XY( 42572.86, 32161.44 ) )
-
-garonne_4.Update()
-
-
-garonne_5 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-garonne_5.SetName( "garonne_5" )
-
-garonne_5.SetZLevel( 34 )
-
-garonne_5.AddSection( "Section_1", 1, 0 )
-garonne_5.AddPoint( 0, gp_XY( 42572.86, 32161.44 ) )
-garonne_5.AddPoint( 0, gp_XY( 42532.63, 32175.19 ) )
-garonne_5.AddPoint( 0, gp_XY( 42493.64, 32187.97 ) )
-garonne_5.AddPoint( 0, gp_XY( 42074.27, 32302.91 ) )
-garonne_5.AddPoint( 0, gp_XY( 41624.75, 32330.93 ) )
-garonne_5.AddPoint( 0, gp_XY( 41325.93, 32187.97 ) )
-garonne_5.AddPoint( 0, gp_XY( 40879.52, 31987.29 ) )
-garonne_5.AddPoint( 0, gp_XY( 40308.78, 32018.46 ) )
-garonne_5.AddPoint( 0, gp_XY( 39782.86, 32207.17 ) )
-garonne_5.AddPoint( 0, gp_XY( 38814.10, 32560.43 ) )
-garonne_5.AddPoint( 0, gp_XY( 38302.17, 32903.70 ) )
-garonne_5.AddPoint( 0, gp_XY( 38191.48, 33184.55 ) )
-garonne_5.AddSection( "Section_2", 1, 0 )
-garonne_5.AddPoint( 1, gp_XY( 38191.48, 33184.55 ) )
-garonne_5.AddPoint( 1, gp_XY( 38553.78, 33013.53 ) )
-garonne_5.AddPoint( 1, gp_XY( 38993.90, 32767.64 ) )
-garonne_5.AddPoint( 1, gp_XY( 39678.58, 32533.58 ) )
-garonne_5.AddPoint( 1, gp_XY( 40240.26, 32305.27 ) )
-garonne_5.AddPoint( 1, gp_XY( 40717.94, 32193.70 ) )
-garonne_5.AddPoint( 1, gp_XY( 41361.00, 32464.18 ) )
-garonne_5.AddPoint( 1, gp_XY( 41831.41, 32626.69 ) )
-garonne_5.AddPoint( 1, gp_XY( 41950.14, 32618.24 ) )
-garonne_5.AddPoint( 1, gp_XY( 42524.97, 32419.61 ) )
-garonne_5.AddPoint( 1, gp_XY( 42616.62, 32385.32 ) )
-garonne_5.AddPoint( 1, gp_XY( 42652.10, 32372.34 ) )
-
-garonne_5.Update()
-
-
-zonePont_1 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-zonePont_1.SetName( "zonePont_1" )
-
-zonePont_1.SetZLevel( 33 )
-
-zonePont_1.AddSection( "Section_1", 0, 0 )
-zonePont_1.AddPoint( 0, gp_XY( 42652.10, 32372.34 ) )
-zonePont_1.AddPoint( 0, gp_XY( 42572.86, 32161.44 ) )
-
-zonePont_1.Update()
-
-
-zonePont_2 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-zonePont_2.SetName( "zonePont_2" )
-
-zonePont_2.SetZLevel( 32 )
-
-zonePont_2.AddSection( "Section_1", 0, 0 )
-zonePont_2.AddPoint( 0, gp_XY( 42572.86, 32161.44 ) )
-zonePont_2.AddPoint( 0, gp_XY( 42550.53, 32102.00 ) )
-zonePont_2.AddPoint( 0, gp_XY( 42634.02, 32078.91 ) )
-zonePont_2.AddPoint( 0, gp_XY( 42656.54, 32131.87 ) )
-
-zonePont_2.Update()
-
-
-zonePont_3 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-zonePont_3.SetName( "zonePont_3" )
-
-zonePont_3.SetZLevel( 31 )
-
-zonePont_3.AddSection( "Section_1", 0, 0 )
-zonePont_3.AddPoint( 0, gp_XY( 42656.54, 32131.87 ) )
-zonePont_3.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-
-zonePont_3.Update()
-
-
-zonePont_4 = hydro_doc.CreateObject( KIND_POLYLINEXY )
-zonePont_4.SetName( "zonePont_4" )
-
-zonePont_4.SetZLevel( 30 )
-
-zonePont_4.AddSection( "Section_1", 0, 0 )
-zonePont_4.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-zonePont_4.AddPoint( 0, gp_XY( 42760.14, 32375.55 ) )
-zonePont_4.AddPoint( 0, gp_XY( 42665.99, 32409.30 ) )
-zonePont_4.AddPoint( 0, gp_XY( 42652.10, 32372.34 ) )
-
-zonePont_4.Update()
-
-
-litMineurPont = hydro_doc.CreateObject( KIND_POLYLINEXY )
-litMineurPont.SetName( "litMineurPont" )
-
-litMineurPont.AddSection( "Section_1_1", 1, 0 )
-litMineurPont.AddPoint( 0, gp_XY( 42652.10, 32372.34 ) )
-litMineurPont.AddPoint( 0, gp_XY( 42693.37, 32357.54 ) )
-litMineurPont.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-litMineurPont.AddSection( "Section_1_2", 1, 0 )
-litMineurPont.AddPoint( 1, gp_XY( 42656.54, 32131.87 ) )
-litMineurPont.AddPoint( 1, gp_XY( 42610.32, 32148.41 ) )
-litMineurPont.AddPoint( 1, gp_XY( 42572.86, 32161.44 ) )
-litMineurPont.AddSection( "Section_1_3", 0, 0 )
-litMineurPont.AddPoint( 2, gp_XY( 42652.10, 32372.34 ) )
-litMineurPont.AddPoint( 2, gp_XY( 42572.86, 32161.44 ) )
-litMineurPont.AddSection( "Section_1_4", 0, 0 )
-litMineurPont.AddPoint( 3, gp_XY( 42656.54, 32131.87 ) )
-litMineurPont.AddPoint( 3, gp_XY( 42744.75, 32339.36 ) )
-
-litMineurPont.Update()
-
-
-litMineurAval = hydro_doc.CreateObject( KIND_POLYLINEXY )
-litMineurAval.SetName( "litMineurAval" )
-
-litMineurAval.AddSection( "Section_1_1", 1, 0 )
-litMineurAval.AddPoint( 0, gp_XY( 42572.86, 32161.44 ) )
-litMineurAval.AddPoint( 0, gp_XY( 42532.63, 32175.19 ) )
-litMineurAval.AddPoint( 0, gp_XY( 42493.64, 32187.97 ) )
-litMineurAval.AddPoint( 0, gp_XY( 42074.27, 32302.91 ) )
-litMineurAval.AddPoint( 0, gp_XY( 41624.75, 32330.93 ) )
-litMineurAval.AddPoint( 0, gp_XY( 41325.93, 32187.97 ) )
-litMineurAval.AddPoint( 0, gp_XY( 40879.52, 31987.29 ) )
-litMineurAval.AddPoint( 0, gp_XY( 40308.78, 32018.46 ) )
-litMineurAval.AddPoint( 0, gp_XY( 39782.86, 32207.17 ) )
-litMineurAval.AddPoint( 0, gp_XY( 38814.10, 32560.43 ) )
-litMineurAval.AddPoint( 0, gp_XY( 38302.17, 32903.70 ) )
-litMineurAval.AddPoint( 0, gp_XY( 38191.48, 33184.55 ) )
-litMineurAval.AddSection( "Section_2_1", 1, 0 )
-litMineurAval.AddPoint( 1, gp_XY( 38191.48, 33184.55 ) )
-litMineurAval.AddPoint( 1, gp_XY( 38553.78, 33013.53 ) )
-litMineurAval.AddPoint( 1, gp_XY( 38993.90, 32767.64 ) )
-litMineurAval.AddPoint( 1, gp_XY( 39678.58, 32533.58 ) )
-litMineurAval.AddPoint( 1, gp_XY( 40240.26, 32305.27 ) )
-litMineurAval.AddPoint( 1, gp_XY( 40717.94, 32193.70 ) )
-litMineurAval.AddPoint( 1, gp_XY( 41361.00, 32464.18 ) )
-litMineurAval.AddPoint( 1, gp_XY( 41831.41, 32626.69 ) )
-litMineurAval.AddPoint( 1, gp_XY( 41950.14, 32618.24 ) )
-litMineurAval.AddPoint( 1, gp_XY( 42524.97, 32419.61 ) )
-litMineurAval.AddPoint( 1, gp_XY( 42616.62, 32385.32 ) )
-litMineurAval.AddPoint( 1, gp_XY( 42652.10, 32372.34 ) )
-litMineurAval.AddSection( "Section_1_2", 0, 0 )
-litMineurAval.AddPoint( 2, gp_XY( 42652.10, 32372.34 ) )
-litMineurAval.AddPoint( 2, gp_XY( 42572.86, 32161.44 ) )
-
-litMineurAval.Update()
-
-
-litMineurAmont = hydro_doc.CreateObject( KIND_POLYLINEXY )
-litMineurAmont.SetName( "litMineurAmont" )
-
-litMineurAmont.AddSection( "Section_1_1", 1, 0 )
-litMineurAmont.AddPoint( 0, gp_XY( 42744.75, 32339.36 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 42779.45, 32327.87 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 42909.80, 32291.33 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43177.03, 32269.95 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43465.65, 32344.78 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43754.27, 32152.37 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44128.40, 31842.37 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44003.90, 31269.93 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44010.82, 30869.63 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44064.26, 30655.84 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44434.73, 30366.18 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45208.04, 30484.81 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45705.01, 30287.34 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45933.89, 30046.87 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46127.34, 29490.68 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46111.60, 29226.08 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46228.62, 28784.05 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46247.64, 28449.75 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46108.48, 28086.94 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45618.52, 27553.74 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45276.77, 27042.78 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45001.89, 26273.15 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45167.76, 25975.34 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46018.15, 25848.84 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46378.94, 25872.21 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46885.57, 25937.64 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 47278.36, 25782.88 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 47153.86, 25728.04 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46987.51, 25749.97 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 46658.26, 25715.71 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45650.76, 25634.46 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45122.63, 25748.21 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44797.63, 26325.09 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45114.51, 27168.75 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45508.28, 27713.21 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45994.19, 28382.53 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45927.01, 29201.34 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45756.39, 29859.47 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45390.76, 30151.97 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 45039.85, 30120.84 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 44513.26, 30084.28 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43923.42, 30426.28 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43768.81, 30934.29 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43820.10, 31425.20 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43854.78, 31801.12 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 43479.64, 32053.54 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 42923.47, 32051.85 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 42695.92, 32118.36 ) )
-litMineurAmont.AddPoint( 0, gp_XY( 42656.54, 32131.87 ) )
-litMineurAmont.AddSection( "Section_1_2", 0, 0 )
-litMineurAmont.AddPoint( 1, gp_XY( 42656.54, 32131.87 ) )
-litMineurAmont.AddPoint( 1, gp_XY( 42744.75, 32339.36 ) )
-
-litMineurAmont.Update()
-
-
-Cloud_02 = hydro_doc.CreateObject( KIND_BATHYMETRY )
-Cloud_02.SetName( "Cloud_02" )
-
-Cloud_02.SetAltitudesInverted( 0 )
-if not(Cloud_02.ImportFromFile( os.path.join(HYDRO_SAMPLES, "Cloud_02.xyz" ))):
-  raise ValueError('problem while loading bathymetry')
-
-Cloud_02.Update()
-
-
-garonne_point_L93 = hydro_doc.CreateObject( KIND_BATHYMETRY )
-garonne_point_L93.SetName( "garonne_point_L93" )
-
-garonne_point_L93.SetAltitudesInverted( 0 )
-if not(garonne_point_L93.ImportFromFile( os.path.join(HYDRO_SAMPLES, "garonne_point_L93.xyz" ))):
-  raise ValueError('problem while loading bathymetry')
-
-garonne_point_L93.Update()
-
-
-litMajeur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-litMajeur.SetName( "litMajeur" )
-
-litMajeur.SetZLevel( 5 )
-
-litMajeur.SetFillingColor( QColor( 0, 170, 127, 255 ) )
-
-litMajeur.SetAltitudeObject( Cloud_02 )
-litMajeur.SetPolyline( lit_majeur )
-
-litMajeur.Update()
-
-
-domaineEtendu = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-domaineEtendu.SetName( "domaineEtendu" )
-
-domaineEtendu.SetZLevel( 4 )
-
-domaineEtendu.SetFillingColor( QColor( 201, 203, 55, 255 ) )
-
-domaineEtendu.SetAltitudeObject( Cloud_02 )
-domaineEtendu.SetPolyline( domaine )
-
-domaineEtendu.Update()
-
-
-litMineur_aval = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-litMineur_aval.SetName( "litMineur_aval" )
-
-litMineur_aval.SetZLevel( 38 )
-
-litMineur_aval.SetFillingColor( QColor( 255, 255, 0, 255 ) )
-
-litMineur_aval.SetAltitudeObject( garonne_point_L93 )
-litMineur_aval.SetPolyline( litMineurAval )
-
-litMineur_aval.Update()
-
-
-litMineur_pont = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-litMineur_pont.SetName( "litMineur_pont" )
-
-litMineur_pont.SetZLevel( 39 )
-
-litMineur_pont.SetFillingColor( QColor( 170, 255, 255, 255 ) )
-
-litMineur_pont.SetAltitudeObject( garonne_point_L93 )
-litMineur_pont.SetPolyline( litMineurPont )
-
-litMineur_pont.Update()
-
-
-litMineur_amont = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-litMineur_amont.SetName( "litMineur_amont" )
-
-litMineur_amont.SetZLevel( 40 )
-
-litMineur_amont.SetFillingColor( QColor( 170, 255, 127, 255 ) )
-
-litMineur_amont.SetAltitudeObject( garonne_point_L93 )
-litMineur_amont.SetPolyline( litMineurAmont )
-
-litMineur_amont.Update()
-
-
-pile1 = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-pile1.SetName( "pile1" )
-
-pile1.SetZLevel( 41 )
-
-pile1.SetPolyline( pontEtPiles_7 )
-pile1.SetIsSubmersible(False)
-
-pile1.Update()
-
-
-pile2 = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-pile2.SetName( "pile2" )
-
-pile2.SetZLevel( 42 )
+hydro_doc = HYDROData_Document.Document()
 
-pile2.SetPolyline( pontEtPiles_8 )
-pile2.SetIsSubmersible(False)
+offsetX = 430000.
+offsetY = 6350000.
+hydro_doc.SetLocalCS( offsetX, offsetY )
 
-pile2.Update()
+garonne_ign_01 = loadImage(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne_ign_01.png"), "garonne_ign_01", 0)
+GeolocaliseImageCoords(garonne_ign_01,
+                       QPoint(40, 817), QPoint(1325, 85),
+                       QPointF(471562, 6.36775e+06), QPointF(489400, 6.37702e+06))
 
+garonne_ign_02 = loadImage(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne_ign_02.png"), "garonne_ign_02", 1)
+GeolocaliseImageReference(garonne_ign_02, garonne_ign_01,
+                          QPoint(1389, 447), QPoint(784, 481),
+                          QPoint(631, 95), QPoint(26, 129))
 
-pile3 = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-pile3.SetName( "pile3" )
+garonnes = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne.shp"), "garonne_PolyXY", True, 5)
+limites_domaine = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "domaine.shp"), "domaine_PolyXY", False, 6)
+lits_majeur = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lit_majeur.shp"), "lit_majeur_PolyXY", True, 7)
+pilesPont = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "pilesPont.shp"), "pilesPont_PolyXY", False, 8)
+zonesPont = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "zonePont.shp"), "zonePont_PolyXY", False, 9)
 
-pile3.SetZLevel( 43 )
+Cloud_02 = importBathymetry(hydro_doc, os.path.join(HYDRO_SAMPLES, "Cloud_02.xyz"))
+garonne_point_L93 = importBathymetry(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne_point_L93.xyz"))
 
-pile3.SetPolyline( pontEtPiles_9 )
-pile3.SetIsSubmersible(False)
+domaineEtendu = createImmersibleZone(hydro_doc, "domaineEtendu", limites_domaine[0], Cloud_02, True, 2)
+litMajeur = createImmersibleZone(hydro_doc, "litMajeur", lits_majeur[0], garonne_point_L93, True, 3)
 
-pile3.Update()
+seq = garonnes + zonesPont
+garzones = splitShapesAll(hydro_doc, seq)
 
+garZonesPont = [garzones[0], garzones[2], garzones[4], garzones[6]]
+litMineurPont = mergePolylines(hydro_doc, "litMineurPont", garZonesPont)
 
-pile4 = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE )
-pile4.SetName( "pile4" )
+garonnesAval = [garzones[3], garzones[4]]
+litMineurAval = mergePolylines(hydro_doc, "litMineurAval", garonnesAval)
 
-pile4.SetZLevel( 44 )
+garonnesAmont = [garzones[1], garzones[6]]
+litMineurAmont = mergePolylines(hydro_doc, "litMineurAmont", garonnesAmont)
 
-pile4.SetPolyline( pontEtPiles_10 )
-pile4.SetIsSubmersible(False)
+litMineur_aval = createImmersibleZone(hydro_doc, "litMineur_aval", litMineurAval, garonne_point_L93, True, 3)
+litMineur_amont = createImmersibleZone(hydro_doc, "litMineur_amont", litMineurAmont, garonne_point_L93, True, 3)
+litMineur_pont = createImmersibleZone(hydro_doc, "litMineur_pont", litMineurPont, garonne_point_L93, True, 3)
 
-pile4.Update()
+pile_pont0 = createImmersibleZone(hydro_doc, "pile_pont0", pilesPont[0], None, False, 3)
+pile_pont1 = createImmersibleZone(hydro_doc, "pile_pont1", pilesPont[1], None, False, 3)
+pile_pont2 = createImmersibleZone(hydro_doc, "pile_pont2", pilesPont[2], None, False, 3)
+pile_pont3 = createImmersibleZone(hydro_doc, "pile_pont3", pilesPont[3], None, False, 3)
 
 
 # Calculation case
@@ -932,10 +87,10 @@ garonne_1.AddGeometryObject( litMajeur )
 garonne_1.AddGeometryObject( litMineur_amont )
 garonne_1.AddGeometryObject( litMineur_aval )
 garonne_1.AddGeometryObject( litMineur_pont )
-garonne_1.AddGeometryObject( pile1 )
-garonne_1.AddGeometryObject( pile2 )
-garonne_1.AddGeometryObject( pile3 )
-garonne_1.AddGeometryObject( pile4 )
+garonne_1.AddGeometryObject( pile_pont0 )
+garonne_1.AddGeometryObject( pile_pont1 )
+garonne_1.AddGeometryObject( pile_pont2 )
+garonne_1.AddGeometryObject( pile_pont3 )
 
 case_geom_group = domaineEtendu.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
@@ -947,15 +102,15 @@ case_geom_group = litMineur_aval.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
 case_geom_group = litMineur_pont.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
-case_geom_group = pile1.GetGroup( 0 )
+case_geom_group = pile_pont0.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
-case_geom_group = pile2.GetGroup( 0 )
+case_geom_group = pile_pont1.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
-case_geom_group = pile3.GetGroup( 0 )
+case_geom_group = pile_pont2.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
-case_geom_group = pile4.GetGroup( 0 )
+case_geom_group = pile_pont3.GetGroup( 0 )
 garonne_1.AddGeometryGroup( case_geom_group )
-garonne_1.SetBoundaryPolyline( domaine )
+garonne_1.SetBoundaryPolyline( limites_domaine[0] )
 
 # Start the algorithm of the partition and assignment
 garonne_1.Update()
@@ -1058,7 +213,7 @@ geompy = geomBuilder.New()
 # --- basic properties control: edges length, surfaces
 controlGeomProps(geompy, garonne_riveGauche,  29149.1353799,  35949580.6716)
 controlGeomProps(geompy, garonne_aval,   7965.23431497,  935955.786347)
-controlGeomProps(geompy, garonne_pont,   961.8255222,  19618.016847)
+controlGeomProps(geompy, garonne_pont,   962.0745533,  19649.150520)
 controlGeomProps(geompy, garonne_amont,   22635.6212065,  2531409.65041)
 controlGeomProps(geompy, garonne_riveDroite,  32012.2241814, 25998085.6892)
 

diff --git a/doc/salome/examples/pilesPont.shp b/doc/salome/examples/pilesPont.shp
new file mode 100644 (file)
index 0000000..4629a3a
Binary files /dev/null and b/doc/salome/examples/pilesPont.shp differ

diff --git a/doc/salome/examples/pilesPont.shx b/doc/salome/examples/pilesPont.shx
new file mode 100644 (file)
index 0000000..0b34a02
Binary files /dev/null and b/doc/salome/examples/pilesPont.shx differ

diff --git a/doc/salome/examples/simplePolyline.shp b/doc/salome/examples/simplePolyline.shp
new file mode 100644 (file)
index 0000000..424bf0c
Binary files /dev/null and b/doc/salome/examples/simplePolyline.shp differ

diff --git a/doc/salome/examples/simplePolyline.shx b/doc/salome/examples/simplePolyline.shx
new file mode 100644 (file)
index 0000000..0d1b73d
Binary files /dev/null and b/doc/salome/examples/simplePolyline.shx differ

diff --git a/doc/salome/examples/zonePont.shp b/doc/salome/examples/zonePont.shp
new file mode 100644 (file)
index 0000000..23fe47b
Binary files /dev/null and b/doc/salome/examples/zonePont.shp differ

diff --git a/doc/salome/examples/zonePont.shx b/doc/salome/examples/zonePont.shx
new file mode 100644 (file)
index 0000000..9c9eb7d
Binary files /dev/null and b/doc/salome/examples/zonePont.shx differ

diff --git a/src/HYDROTools/hydroGeoMeshUtils.py b/src/HYDROTools/hydroGeoMeshUtils.py
index 5dcea33efedc9dd8ecf851db3a587fcf951ca706..7db1b6cdc9708e6500cfdce534d25a2c2649c675 100644 (file)
--- a/src/HYDROTools/hydroGeoMeshUtils.py
+++ b/src/HYDROTools/hydroGeoMeshUtils.py
@@ -251,7 +251,8 @@ def createImmersibleZone(document, imzName, polyLine, bathy, isImmersible, displ
     imz = document.CreateObject(KIND_IMMERSIBLE_ZONE)
     imz.SetName(imzName)
     imz.SetZLevel(displayLevel)
-    imz.SetAltitudeObject(bathy)
+    if bathy is not None:
+        imz.SetAltitudeObject(bathy)
     imz.SetPolyline(polyLine)
     imz.SetIsSubmersible(isImmersible)
     imz.SetFillingColor(QColor(randint(0,255), randint(0,255), randint(0,255), 255))