From f35d66602860ea0fc2934bfa7540913c615bed7e Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Wed, 18 Nov 2020 10:53:02 +0100 Subject: [PATCH] use hydroGeoMeshUtils in scripts: h012, h013, h014: Embankments --- doc/salome/examples/h012_caseDigueManual.py | 329 ++--------------- .../examples/h013_caseDigueManualMesh.py | 331 +++--------------- .../examples/h014_caseDigueManualInterpolZ.py | 331 +++--------------- src/HYDROTools/hydroGeoMeshUtils.py | 111 +++++- 4 files changed, 220 insertions(+), 882 deletions(-) diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py index c7d457e5..d531bd92 100644 --- a/doc/salome/examples/h012_caseDigueManual.py +++ b/doc/salome/examples/h012_caseDigueManual.py @@ -2,6 +2,13 @@ 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 @@ -16,304 +23,44 @@ 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 ) ) - -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') - -garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ), - QPoint( 784, 481 ) ) - -garonne_ign_02.SetGlobalPoints( 3, - QPointF( 631, 95 ), - QPointF( 26, 129 ) ) -garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 ) - -garonne_ign_02.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( 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( 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() - -axeDigue = hydro_doc.CreateObject( KIND_POLYLINEXY ); -axeDigue.SetName( "axeDigue" ); - -axeDigue.SetZLevel( 8 ); - -axeDigue.AddSection( "Section_1", 1, 0 ); -axeDigue.AddPoint( 0, gp_XY( 40961.39, 31800.95 ) ); -axeDigue.AddPoint( 0, gp_XY( 41296.95, 31992.70 ) ); -axeDigue.AddPoint( 0, gp_XY( 41656.48, 31872.85 ) ); -axeDigue.AddPoint( 0, gp_XY( 42004.02, 31441.42 ) ); -axeDigue.AddPoint( 0, gp_XY( 42123.86, 31021.97 ) ); -axeDigue.AddPoint( 0, gp_XY( 42579.27, 30926.10 ) ); -axeDigue.AddPoint( 0, gp_XY( 43082.60, 30638.48 ) ); -axeDigue.AddPoint( 0, gp_XY( 43130.54, 30075.22 ) ); -axeDigue.AddPoint( 0, gp_XY( 43538.00, 29763.63 ) ); -axeDigue.AddPoint( 0, gp_XY( 44053.33, 29787.60 ) ); -axeDigue.AddPoint( 0, gp_XY( 44736.43, 29847.52 ) ); - -axeDigue.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() - - -altitudeDigue = hydro_doc.CreateObject( KIND_PROFILE ); -altitudeDigue.SetName( "altitudeDigue" ); - -profile_points = [ gp_XY( 1, 23 ), - gp_XY( 5000, 25.5 ) ]; -altitudeDigue.SetParametricPoints( profile_points ); - -altitudeDigue.Update(); - - -sectionDigue = hydro_doc.CreateObject( KIND_PROFILE ); -sectionDigue.SetName( "sectionDigue" ); - -profile_points = [ gp_XY( -10, -10 ), - gp_XY( -8, -1 ), - gp_XY( 0, 0 ), - gp_XY( 8, -1 ), - gp_XY( 10, -10 ) ]; -sectionDigue.SetParametricPoints( profile_points ); +from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference +from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetry, createImmersibleZone, mergePolylines, getChildrenInStudy +from salome.hydrotools.hydroGeoMeshUtils import createAxis3DDEmbankmentAltiProfile, createAxis3DDEmbankmentBathy +from salome.hydrotools.hydroGeoMeshUtils import createEmbankmentSectionA, createEmbankmentSectionB -sectionDigue.Update(); - - -axe3DDigue = hydro_doc.CreateObject( KIND_POLYLINE ); -axe3DDigue.SetName( "axe3DDigue" ); - -axe3DDigue.SetPolylineXY( axeDigue ); -axe3DDigue.SetProfileUZ( altitudeDigue.GetProfileUZ() ); - -axe3DDigue.Update(); - - -litMineur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) -litMineur.SetName( "litMineur" ) - -litMineur.SetZLevel( 6 ) - -litMineur.SetAltitudeObject( garonne_point_L93 ) -litMineur.SetPolyline( garonne ) - -litMineur.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 ) +hydro_doc = HYDROData_Document.Document() -domaineEtendu.Update() +offsetX = 430000. +offsetY = 6350000. +hydro_doc.SetLocalCS( offsetX, offsetY ) +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)) -digue = hydro_doc.CreateObject( KIND_DIGUE ); -digue.SetName( "digue" ); +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)) -digue.SetZLevel( 9 ); +garonnes = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne.shp"), "garonne_PolyXY", True, 6) +limites_domaine = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "domaine.shp"), "domaine_PolyXY", False, 7) +lits_majeur = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lit_majeur.shp"), "lit_majeur_PolyXY", True, 8) +axesDigue = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "axeDigue.shp"), "axeDigue_PolyXY", True, 9) -digue.SetGuideLine( axe3DDigue ); -digue.SetProfile( sectionDigue ); -digue.SetEquiDistance( 50 ); +Cloud_02 = importBathymetry(hydro_doc, "Cloud_02", HYDRO_SAMPLES) +garonne_point_L93 = importBathymetry(hydro_doc, "garonne_point_L93", HYDRO_SAMPLES) -digue.Update(); +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) +litMineur = createImmersibleZone(hydro_doc, "litMineur", garonnes[0], garonne_point_L93, True, 4) +altiDiguePts = [(1., 23.0), + ( 5000., 25.5 )] +altiProfile, axe3D = createAxis3DDEmbankmentAltiProfile(hydro_doc, "axe3DDigue", axesDigue[0], altiDiguePts) +sectionPoints = [(0, 0), (8, -1), (10,-10)] +section, digue = createEmbankmentSectionA(hydro_doc, "digue", axe3D, sectionPoints, 50., 5) # Calculation case garonne_1 = hydro_doc.CreateObject( KIND_CALCULATION ) @@ -339,7 +86,7 @@ case_geom_group = digue.GetGroup( 3 ); garonne_1.AddGeometryGroup( case_geom_group ); case_geom_group = digue.GetGroup( 1 ); 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() diff --git a/doc/salome/examples/h013_caseDigueManualMesh.py b/doc/salome/examples/h013_caseDigueManualMesh.py index 2299dc9e..36047b85 100644 --- a/doc/salome/examples/h013_caseDigueManualMesh.py +++ b/doc/salome/examples/h013_caseDigueManualMesh.py @@ -2,6 +2,13 @@ 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 @@ -16,304 +23,44 @@ 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 ) ) - -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') - -garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ), - QPoint( 784, 481 ) ) - -garonne_ign_02.SetGlobalPoints( 3, - QPointF( 631, 95 ), - QPointF( 26, 129 ) ) -garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 ) - -garonne_ign_02.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( 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( 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() - -axeDigue = hydro_doc.CreateObject( KIND_POLYLINEXY ); -axeDigue.SetName( "axeDigue" ); - -axeDigue.SetZLevel( 8 ); - -axeDigue.AddSection( "Section_1", 1, 0 ); -axeDigue.AddPoint( 0, gp_XY( 40961.39, 31800.95 ) ); -axeDigue.AddPoint( 0, gp_XY( 41296.95, 31992.70 ) ); -axeDigue.AddPoint( 0, gp_XY( 41656.48, 31872.85 ) ); -axeDigue.AddPoint( 0, gp_XY( 42004.02, 31441.42 ) ); -axeDigue.AddPoint( 0, gp_XY( 42123.86, 31021.97 ) ); -axeDigue.AddPoint( 0, gp_XY( 42579.27, 30926.10 ) ); -axeDigue.AddPoint( 0, gp_XY( 43082.60, 30638.48 ) ); -axeDigue.AddPoint( 0, gp_XY( 43130.54, 30075.22 ) ); -axeDigue.AddPoint( 0, gp_XY( 43538.00, 29763.63 ) ); -axeDigue.AddPoint( 0, gp_XY( 44053.33, 29787.60 ) ); -axeDigue.AddPoint( 0, gp_XY( 44736.43, 29847.52 ) ); - -axeDigue.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() - - -altitudeDigue = hydro_doc.CreateObject( KIND_PROFILE ); -altitudeDigue.SetName( "altitudeDigue" ); - -profile_points = [ gp_XY( 1, 23 ), - gp_XY( 5000, 25.5 ) ]; -altitudeDigue.SetParametricPoints( profile_points ); - -altitudeDigue.Update(); - - -sectionDigue = hydro_doc.CreateObject( KIND_PROFILE ); -sectionDigue.SetName( "sectionDigue" ); +from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference +from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetry, createImmersibleZone, mergePolylines, getChildrenInStudy +from salome.hydrotools.hydroGeoMeshUtils import createAxis3DDEmbankmentAltiProfile, createAxis3DDEmbankmentBathy +from salome.hydrotools.hydroGeoMeshUtils import createEmbankmentSectionA, createEmbankmentSectionB -profile_points = [ gp_XY( -10, -10 ), - gp_XY( -8, -1 ), - gp_XY( 0, 0 ), - gp_XY( 8, -1 ), - gp_XY( 10, -10 ) ]; -sectionDigue.SetParametricPoints( profile_points ); - -sectionDigue.Update(); - - -axe3DDigue = hydro_doc.CreateObject( KIND_POLYLINE ); -axe3DDigue.SetName( "axe3DDigue" ); - -axe3DDigue.SetPolylineXY( axeDigue ); -axe3DDigue.SetProfileUZ( altitudeDigue.GetProfileUZ() ); - -axe3DDigue.Update(); - - -litMineur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) -litMineur.SetName( "litMineur" ) - -litMineur.SetZLevel( 6 ) - -litMineur.SetAltitudeObject( garonne_point_L93 ) -litMineur.SetPolyline( garonne ) - -litMineur.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 ) +hydro_doc = HYDROData_Document.Document() -domaineEtendu.Update() +offsetX = 430000. +offsetY = 6350000. +hydro_doc.SetLocalCS( offsetX, offsetY ) +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)) -digue = hydro_doc.CreateObject( KIND_DIGUE ); -digue.SetName( "digue" ); +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)) -digue.SetZLevel( 9 ); +garonnes = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne.shp"), "garonne_PolyXY", True, 6) +limites_domaine = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "domaine.shp"), "domaine_PolyXY", False, 7) +lits_majeur = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lit_majeur.shp"), "lit_majeur_PolyXY", True, 8) +axesDigue = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "axeDigue.shp"), "axeDigue_PolyXY", True, 9) -digue.SetGuideLine( axe3DDigue ); -digue.SetProfile( sectionDigue ); -digue.SetEquiDistance( 50 ); +Cloud_02 = importBathymetry(hydro_doc, "Cloud_02", HYDRO_SAMPLES) +garonne_point_L93 = importBathymetry(hydro_doc, "garonne_point_L93", HYDRO_SAMPLES) -digue.Update(); +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) +litMineur = createImmersibleZone(hydro_doc, "litMineur", garonnes[0], garonne_point_L93, True, 4) +altiDiguePts = [(1., 23.0), + ( 5000., 25.5 )] +altiProfile, axe3D = createAxis3DDEmbankmentAltiProfile(hydro_doc, "axe3DDigue", axesDigue[0], altiDiguePts) +sectionPoints = [(0, 0), (8, -1), (10,-10)] +section, digue = createEmbankmentSectionA(hydro_doc, "digue", axe3D, sectionPoints, 50., 5) # Calculation case garonne_1 = hydro_doc.CreateObject( KIND_CALCULATION ) @@ -339,10 +86,10 @@ case_geom_group = digue.GetGroup( 3 ); garonne_1.AddGeometryGroup( case_geom_group ); case_geom_group = digue.GetGroup( 1 ); 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(); +garonne_1.Update() garonne_1_litMineur = hydro_doc.FindObjectByName( "garonne_1_Reg_1" ) garonne_1_Zone_1 = hydro_doc.FindObjectByName( "garonne_1_Zone_1" ) diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py index 9937b681..21dfb1d9 100644 --- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py +++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py @@ -2,6 +2,13 @@ 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 @@ -16,304 +23,44 @@ 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 ) ) - -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') - -garonne_ign_02.SetLocalPoints( QPoint( 1389, 447 ), - QPoint( 784, 481 ) ) - -garonne_ign_02.SetGlobalPoints( 3, - QPointF( 631, 95 ), - QPointF( 26, 129 ) ) -garonne_ign_02.SetTrsfReferenceImage( garonne_ign_01 ) - -garonne_ign_02.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( 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( 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() - -axeDigue = hydro_doc.CreateObject( KIND_POLYLINEXY ); -axeDigue.SetName( "axeDigue" ); - -axeDigue.SetZLevel( 8 ); - -axeDigue.AddSection( "Section_1", 1, 0 ); -axeDigue.AddPoint( 0, gp_XY( 40961.39, 31800.95 ) ); -axeDigue.AddPoint( 0, gp_XY( 41296.95, 31992.70 ) ); -axeDigue.AddPoint( 0, gp_XY( 41656.48, 31872.85 ) ); -axeDigue.AddPoint( 0, gp_XY( 42004.02, 31441.42 ) ); -axeDigue.AddPoint( 0, gp_XY( 42123.86, 31021.97 ) ); -axeDigue.AddPoint( 0, gp_XY( 42579.27, 30926.10 ) ); -axeDigue.AddPoint( 0, gp_XY( 43082.60, 30638.48 ) ); -axeDigue.AddPoint( 0, gp_XY( 43130.54, 30075.22 ) ); -axeDigue.AddPoint( 0, gp_XY( 43538.00, 29763.63 ) ); -axeDigue.AddPoint( 0, gp_XY( 44053.33, 29787.60 ) ); -axeDigue.AddPoint( 0, gp_XY( 44736.43, 29847.52 ) ); - -axeDigue.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() - - -altitudeDigue = hydro_doc.CreateObject( KIND_PROFILE ); -altitudeDigue.SetName( "altitudeDigue" ); - -profile_points = [ gp_XY( 1, 23 ), - gp_XY( 5000, 25.5 ) ]; -altitudeDigue.SetParametricPoints( profile_points ); - -altitudeDigue.Update(); - - -sectionDigue = hydro_doc.CreateObject( KIND_PROFILE ); -sectionDigue.SetName( "sectionDigue" ); +from salome.hydrotools.hydroGeoMeshUtils import loadImage, GeolocaliseImageCoords, GeolocaliseImageReference +from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetry, createImmersibleZone, mergePolylines, getChildrenInStudy +from salome.hydrotools.hydroGeoMeshUtils import createAxis3DDEmbankmentAltiProfile, createAxis3DDEmbankmentBathy +from salome.hydrotools.hydroGeoMeshUtils import createEmbankmentSectionA, createEmbankmentSectionB -profile_points = [ gp_XY( -10, -10 ), - gp_XY( -8, -1 ), - gp_XY( 0, 0 ), - gp_XY( 8, -1 ), - gp_XY( 10, -10 ) ]; -sectionDigue.SetParametricPoints( profile_points ); - -sectionDigue.Update(); - - -axe3DDigue = hydro_doc.CreateObject( KIND_POLYLINE ); -axe3DDigue.SetName( "axe3DDigue" ); - -axe3DDigue.SetPolylineXY( axeDigue ); -axe3DDigue.SetProfileUZ( altitudeDigue.GetProfileUZ() ); - -axe3DDigue.Update(); - - -litMineur = hydro_doc.CreateObject( KIND_IMMERSIBLE_ZONE ) -litMineur.SetName( "litMineur" ) - -litMineur.SetZLevel( 6 ) - -litMineur.SetAltitudeObject( garonne_point_L93 ) -litMineur.SetPolyline( garonne ) - -litMineur.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 ) +hydro_doc = HYDROData_Document.Document() -domaineEtendu.Update() +offsetX = 430000. +offsetY = 6350000. +hydro_doc.SetLocalCS( offsetX, offsetY ) +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)) -digue = hydro_doc.CreateObject( KIND_DIGUE ); -digue.SetName( "digue" ); +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)) -digue.SetZLevel( 9 ); +garonnes = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "garonne.shp"), "garonne_PolyXY", True, 6) +limites_domaine = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "domaine.shp"), "domaine_PolyXY", False, 7) +lits_majeur = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "lit_majeur.shp"), "lit_majeur_PolyXY", True, 8) +axesDigue = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "axeDigue.shp"), "axeDigue_PolyXY", True, 9) -digue.SetGuideLine( axe3DDigue ); -digue.SetProfile( sectionDigue ); -digue.SetEquiDistance( 50 ); +Cloud_02 = importBathymetry(hydro_doc, "Cloud_02", HYDRO_SAMPLES) +garonne_point_L93 = importBathymetry(hydro_doc, "garonne_point_L93", HYDRO_SAMPLES) -digue.Update(); +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) +litMineur = createImmersibleZone(hydro_doc, "litMineur", garonnes[0], garonne_point_L93, True, 4) +altiDiguePts = [(1., 23.0), + ( 5000., 25.5 )] +altiProfile, axe3D = createAxis3DDEmbankmentAltiProfile(hydro_doc, "axe3DDigue", axesDigue[0], altiDiguePts) +sectionPoints = [(0, 0), (8, -1), (10,-10)] +section, digue = createEmbankmentSectionA(hydro_doc, "digue", axe3D, sectionPoints, 50., 5) # Calculation case garonne_1 = hydro_doc.CreateObject( KIND_CALCULATION ) @@ -339,10 +86,10 @@ case_geom_group = digue.GetGroup( 3 ); garonne_1.AddGeometryGroup( case_geom_group ); case_geom_group = digue.GetGroup( 1 ); 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(); +garonne_1.Update() garonne_1_litMineur = hydro_doc.FindObjectByName( "garonne_1_Reg_1" ) garonne_1_Zone_1 = hydro_doc.FindObjectByName( "garonne_1_Zone_1" ) diff --git a/src/HYDROTools/hydroGeoMeshUtils.py b/src/HYDROTools/hydroGeoMeshUtils.py index 55d21a18..5089394a 100644 --- a/src/HYDROTools/hydroGeoMeshUtils.py +++ b/src/HYDROTools/hydroGeoMeshUtils.py @@ -68,7 +68,7 @@ def importPolylines(document, shapeFile, shapeName, iSpline, displayLevel): for i in range(shape.NbSections()): shape.SetSectionType(i, shapeType) shape.Update() - shape.SetZLevel( displayLevel ) + shape.SetZLevel(displayLevel) shapes.append(shape) index = 0 # for multiple shapes while isShapeFound: @@ -83,7 +83,7 @@ def importPolylines(document, shapeFile, shapeName, iSpline, displayLevel): for i in range(shape.NbSections()): shape.SetSectionType(i, shapeType) shape.Update() - shape.SetZLevel( displayLevel ) + shape.SetZLevel(displayLevel) shapes.append(shape) return shapes @@ -101,11 +101,11 @@ def importBathymetry(document, bathyName, bathyPath): def createImmersibleZone(document, imzName, polyLine, bathy, isImmersible, displayLevel): """ """ - imz = document.CreateObject( KIND_IMMERSIBLE_ZONE ) - imz.SetName( imzName ) - imz.SetZLevel( displayLevel ) - imz.SetAltitudeObject( bathy ) - imz.SetPolyline( polyLine ) + imz = document.CreateObject(KIND_IMMERSIBLE_ZONE) + imz.SetName(imzName) + imz.SetZLevel(displayLevel) + imz.SetAltitudeObject(bathy) + imz.SetPolyline(polyLine) imz.SetIsSubmersible(isImmersible) imz.SetFillingColor(QColor(randint(0,255), randint(0,255), randint(0,255), 255)) imz.Update() @@ -118,3 +118,100 @@ def mergePolylines(document, polyName, polyLines, isConnectedBySegment = False, op.Merge(document, polyName, polyLines, isConnectedBySegment, tolerance) shape = document.FindObjectByName(polyName) return shape + +def createAxis3DDEmbankmentAltiProfile(document, axis3DName, axisXY, altiPts): + """ + document: current HYDROData_Document + axis3DName: name to give to the axis3D created + axisXY: imported polyline, Embankment line + altiPts: list of tuples(x, h) : parametric coordinate, altitude, along the axis + return altiProfile, axis3D + """ + altiProfile = document.CreateObject(KIND_PROFILE) + altiProfile.SetName("%s_altiProfile"%axis3DName) + altiProfilePoints = [] + for p in altiPts: + altiProfilePoints.append(gp_XY(p[0], p[1])) + altiProfile.SetParametricPoints(altiProfilePoints) + altiProfile.Update() + axis3D = document.CreateObject(KIND_POLYLINE) + axis3D.SetName(axis3DName) + axis3D.SetPolylineXY(axisXY) + axis3D.SetProfileUZ(altiProfile.GetProfileUZ()) + axis3D.Update() + return (altiProfile, axis3D) + +def createAxis3DDEmbankmentBathy(document, axis3DName, axisXY, aCloud): + """ + document: current HYDROData_Document + axis3DName: name to give to the axis3D created + axisXY: imported polyline, Embankment line + aCloud: altimetry, for projection of axisXY + return altiProfile, axis3D + """ + altiProfile = document.CreateObject(KIND_PROFILE) + altiProfile.SetName("%s_altiProfile"%axis3DName) + axis3D = document.CreateObject(KIND_POLYLINE) + axis3D.SetName(axis3DName) + axis3D.SetPolylineXY(axisXY) + axis3D.SetAltitudeObject(aCloud) + axis3D.SetChildProfileUZ(altiProfile.GetProfileUZ()) + altiProfile.Update() + axis3D.Update() + return (altiProfile, axis3D) + +def createEmbankmentSectionA(document, embankmentName, axis3D, sectionPoints, d, displayLevel): + """ + document: current HYDROData_Document + embankmentName: name to give to the embankment + axis3D: the 3D axis of the embankment + sectionPoints: a list of tuple (x, h) to define a half section, beginning to x=0 (center) + d calculation parameter, take 2 or 3 times the section width + displayLevel : z level for 2D representation: high values are drawn above low values + return section, embankment + """ + section = document.CreateObject(KIND_PROFILE) + section.SetName("%s_section"%embankmentName) + sectionPts = [] + for i,p in enumerate(sectionPoints): + sectionPts.append(gp_XY(p[0], p[1])) + if i>0: + sectionPts.insert(0, gp_XY(-p[0], p[1])) + section.SetParametricPoints(sectionPts) + section.Update() + embankment = document.CreateObject(KIND_DIGUE) + embankment.SetName(embankmentName) + embankment.SetGuideLine(axis3D) + embankment.SetProfileMode(True) + embankment.SetProfile(section) + embankment.SetEquiDistance(d) + embankment.SetZLevel(displayLevel) + embankment.SetFillingColor(QColor(randint(0,255), randint(0,255), randint(0,255), 255)) + embankment.Update() + return (section, embankment) + +def createEmbankmentSectionB(document, embankmentName, axis3D, LC,DZ,CZ, d, displayLevel): + """ + document: current HYDROData_Document + embankmentName: name to give to the embankment + axis3D: the 3D axis of the embankment + LC, DZ, CZ: width, height, height offset above axis3D + d calculation parameter, take 2 or 3 times the section width + displayLevel : z level for 2D representation: high values are drawn above low values + return embankment + """ + embankment = document.CreateObject(KIND_DIGUE) + embankment.SetName(embankmentName) + embankment.SetGuideLine(axis3D) + embankment.SetProfileMode(False) + embankment.SetLCValue(LC) + embankment.SetDeltaZValue(DZ) + embankment.SetCoteZValue(CZ) + embankment.SetEquiDistance(d) + embankment.SetZLevel(displayLevel) + embankment.SetFillingColor(QColor(randint(0,255), randint(0,255), randint(0,255), 255)) + embankment.Update() + return embankment + + + -- 2.39.2