ajustement parametres autotests

[modules/hydro.git] / doc / salome / examples / h010_normalCaseManualMesh.py

diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py
index db0e6ff5897960a510d9fcf5597515cdd0578c78..ae8198a21e69bdc71063a45572cb5eea39f0bf2f 100644 (file)
--- a/doc/salome/examples/h010_normalCaseManualMesh.py
+++ b/doc/salome/examples/h010_normalCaseManualMesh.py
@@ -14,8 +14,8 @@ theStudy = salome.myStudy
 #----------------------
 
 from HYDROPy import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
 
 hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
 
@@ -274,16 +274,31 @@ garonne_1.Update()
 garonne_1_litMineur = hydro_doc.FindObjectByName( "garonne_1_Reg_1" )
 garonne_1_Zone_1 = hydro_doc.FindObjectByName( "garonne_1_Zone_1" )
 garonne_1_Zone_1.SetMergeType( HYDROData_Zone.Merge_ZMIN )
+garonne_1_Zone_1.SetColor( QColor( 192, 113, 64 ))
 garonne_1_litMineur.AddZone( garonne_1_Zone_1 )
+
 garonne_1_riveDroite = hydro_doc.FindObjectByName( "garonne_1_Reg_2" )
 garonne_1_Zone_2 = hydro_doc.FindObjectByName( "garonne_1_Zone_2" )
+garonne_1_Zone_2.SetColor( QColor( 141, 192, 64 ))
 garonne_1_riveDroite.AddZone( garonne_1_Zone_2 )
+
 garonne_1_Zone_3 = hydro_doc.FindObjectByName( "garonne_1_Zone_3" )
+garonne_1_Zone_3.SetMergeType( HYDROData_Zone.Merge_Object )
+Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" )
+garonne_1_Zone_3.SetMergeObject( Cloud_02 )
+garonne_1_Zone_3.SetColor( QColor( 64, 192, 77 ))
 garonne_1_riveDroite.AddZone( garonne_1_Zone_3 )
+
 garonne_1_riveGauche = hydro_doc.FindObjectByName( "garonne_1_Reg_3" )
 garonne_1_Zone_4 = hydro_doc.FindObjectByName( "garonne_1_Zone_4" )
+garonne_1_Zone_4.SetMergeType( HYDROData_Zone.Merge_Object )
+Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" )
+garonne_1_Zone_4.SetMergeObject( Cloud_02 )
+garonne_1_Zone_4.SetColor( QColor( 64, 75, 192 ))
 garonne_1_riveGauche.AddZone( garonne_1_Zone_4 )
+
 garonne_1_Zone_5 = hydro_doc.FindObjectByName( "garonne_1_Zone_5" )
+garonne_1_Zone_5.SetColor( QColor( 64, 192, 77 ))
 garonne_1_riveGauche.AddZone( garonne_1_Zone_5 )
 
 garonne_1_litMineur.SetName("garonne_1_litMineur")
@@ -318,18 +333,18 @@ print "Geom shape name:", HYDRO_garonne_1.GetName()
 garonne_1_litMineur_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(garonne_1_litMineur_Outer, [7, 9])
 garonne_1_domaineEtendu_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37])
+geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33])
 
 aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(aval, [4])
+geompy.UnionIDs(aval, [7])
 amont = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(amont, [11])
+geompy.UnionIDs(amont, [9])
 SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(SectionsGaronne, [4, 11])
+geompy.UnionIDs(SectionsGaronne, [7, 9])
 bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(bordGaucheDomaine, [14, 28, 20, 24, 19, 17, 26, 22])
+geompy.UnionIDs(bordGaucheDomaine, [31, 34, 36, 38, 40, 41])
 bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(bordDroiteDomaine, [41, 35, 31, 33, 39, 37])
+geompy.UnionIDs(bordDroiteDomaine, [14, 17, 19, 21, 23, 25, 26, 28])
 
 # --- publications dans l'étude
 geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' )