Salome HOME
projects / modules / hydro.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
correction test case H015
[modules/hydro.git] / doc / salome / examples / h016_pilesPontManualMesh.py
diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py
index f47928f995fa04c49084ab51d415a121b2737651..d7f32c7ec392dd29d75350cf38d3884179a39170 100644 (file)
--- a/doc/salome/examples/h016_pilesPontManualMesh.py
+++ b/doc/salome/examples/h016_pilesPontManualMesh.py
@@ -18,8 +18,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() )
 
@@ -962,58 +962,64 @@ casGaronne_1.SetBoundaryPolyline( domaine )
 casGaronne_1.Update()
 casGaronne_1_riveDroite = hydro_doc.FindObjectByName( "casGaronne_1_Reg_1" )
 casGaronne_1_Zone_1 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_1" )
-casGaronne_1_Zone_1.SetColor( QColor( 64, 192, 147 ))
+casGaronne_1_Zone_1.SetColor( QColor( 64, 156, 192 ))
 casGaronne_1_riveDroite.AddZone( casGaronne_1_Zone_1 )
 casGaronne_1_Zone_2 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_2" )
-casGaronne_1_Zone_2.SetColor( QColor( 111, 192, 64 ))
+casGaronne_1_Zone_2.SetMergeType( HYDROData_Zone.Merge_Object )
+Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" )
+casGaronne_1_Zone_2.SetMergeObject( Cloud_02 )
+casGaronne_1_Zone_2.SetColor( QColor( 192, 183, 64 ))
 casGaronne_1_riveDroite.AddZone( casGaronne_1_Zone_2 )
 casGaronne_1_aval = hydro_doc.FindObjectByName( "casGaronne_1_Reg_2" )
 casGaronne_1_Zone_3 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_3" )
 casGaronne_1_Zone_3.SetMergeType( HYDROData_Zone.Merge_Object )
 garonne_point_L93 = hydro_doc.FindObjectByName( "garonne_point_L93" )
 casGaronne_1_Zone_3.SetMergeObject( garonne_point_L93 )
-casGaronne_1_Zone_3.SetColor( QColor( 192, 183, 64 ))
+casGaronne_1_Zone_3.SetColor( QColor( 64, 183, 192 ))
 casGaronne_1_aval.AddZone( casGaronne_1_Zone_3 )
 casGaronne_1_riveGauche = hydro_doc.FindObjectByName( "casGaronne_1_Reg_3" )
 casGaronne_1_Zone_4 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_4" )
-casGaronne_1_Zone_4.SetColor( QColor( 158, 192, 64 ))
+casGaronne_1_Zone_4.SetMergeType( HYDROData_Zone.Merge_Object )
+Cloud_02 = hydro_doc.FindObjectByName( "Cloud_02" )
+casGaronne_1_Zone_4.SetMergeObject( Cloud_02 )
+casGaronne_1_Zone_4.SetColor( QColor( 64, 192, 162 ))
 casGaronne_1_riveGauche.AddZone( casGaronne_1_Zone_4 )
 casGaronne_1_Zone_6 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_6" )
-casGaronne_1_Zone_6.SetColor( QColor( 64, 192, 156 ))
+casGaronne_1_Zone_6.SetColor( QColor( 64, 192, 90 ))
 casGaronne_1_riveGauche.AddZone( casGaronne_1_Zone_6 )
 casGaronne_1_pont = hydro_doc.FindObjectByName( "casGaronne_1_Reg_4" )
 casGaronne_1_Zone_5 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_5" )
 casGaronne_1_Zone_5.SetMergeType( HYDROData_Zone.Merge_Object )
 garonne_point_L93 = hydro_doc.FindObjectByName( "garonne_point_L93" )
 casGaronne_1_Zone_5.SetMergeObject( garonne_point_L93 )
-casGaronne_1_Zone_5.SetColor( QColor( 192, 85, 64 ))
+casGaronne_1_Zone_5.SetColor( QColor( 64, 190, 192 ))
 casGaronne_1_pont.AddZone( casGaronne_1_Zone_5 )
 casGaronne_1_amont = hydro_doc.FindObjectByName( "casGaronne_1_Reg_5" )
 casGaronne_1_Zone_7 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_7" )
 casGaronne_1_Zone_7.SetMergeType( HYDROData_Zone.Merge_Object )
 garonne_point_L93 = hydro_doc.FindObjectByName( "garonne_point_L93" )
 casGaronne_1_Zone_7.SetMergeObject( garonne_point_L93 )
-casGaronne_1_Zone_7.SetColor( QColor( 64, 90, 192 ))
+casGaronne_1_Zone_7.SetColor( QColor( 109, 192, 64 ))
 casGaronne_1_amont.AddZone( casGaronne_1_Zone_7 )
 casGaronne_1_pile1 = hydro_doc.FindObjectByName( "casGaronne_1_Reg_6" )
 casGaronne_1_Zone_8 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_8" )
 casGaronne_1_Zone_8.SetMergeType( HYDROData_Zone.Merge_ZMAX )
-casGaronne_1_Zone_8.SetColor( QColor( 64, 190, 192 ))
+casGaronne_1_Zone_8.SetColor( QColor( 192, 179, 64 ))
 casGaronne_1_pile1.AddZone( casGaronne_1_Zone_8 )
 casGaronne_1_pile2 = hydro_doc.FindObjectByName( "casGaronne_1_Reg_7" )
 casGaronne_1_Zone_9 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_9" )
 casGaronne_1_Zone_9.SetMergeType( HYDROData_Zone.Merge_ZMAX )
-casGaronne_1_Zone_9.SetColor( QColor( 160, 192, 64 ))
+casGaronne_1_Zone_9.SetColor( QColor( 192, 75, 64 ))
 casGaronne_1_pile2.AddZone( casGaronne_1_Zone_9 )
 casGaronne_1_pile3 = hydro_doc.FindObjectByName( "casGaronne_1_Reg_8" )
 casGaronne_1_Zone_10 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_10" )
 casGaronne_1_Zone_10.SetMergeType( HYDROData_Zone.Merge_ZMAX )
-casGaronne_1_Zone_10.SetColor( QColor( 192, 166, 64 ))
+casGaronne_1_Zone_10.SetColor( QColor( 162, 192, 64 ))
 casGaronne_1_pile3.AddZone( casGaronne_1_Zone_10 )
 casGaronne_1_pile4 = hydro_doc.FindObjectByName( "casGaronne_1_Reg_9" )
 casGaronne_1_Zone_11 = hydro_doc.FindObjectByName( "casGaronne_1_Zone_11" )
 casGaronne_1_Zone_11.SetMergeType( HYDROData_Zone.Merge_ZMAX )
-casGaronne_1_Zone_11.SetColor( QColor( 64, 192, 92 ))
+casGaronne_1_Zone_11.SetColor( QColor( 64, 192, 81 ))
 casGaronne_1_pile4.AddZone( casGaronne_1_Zone_11 )
 casGaronne_1_riveDroite.SetName( "casGaronne_1_riveDroite" )
 casGaronne_1_aval.SetName( "casGaronne_1_aval" )
@@ -1083,25 +1089,25 @@ geompy.UnionIDs(geomObj_8, [68, 70, 66, 63])
 riveDroite = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"])
 geompy.UnionIDs(riveDroite, [2])
 riveGauche = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"])
-geompy.UnionIDs(riveGauche, [33])
+geompy.UnionIDs(riveGauche, [29])
 litMineur_aval = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"])
-geompy.UnionIDs(litMineur_aval, [26])
+geompy.UnionIDs(litMineur_aval, [22])
 litMineur_pont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"])
-geompy.UnionIDs(litMineur_pont, [50])
+geompy.UnionIDs(litMineur_pont, [42])
 litMineur_amont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"])
-geompy.UnionIDs(litMineur_amont, [89])
+geompy.UnionIDs(litMineur_amont, [81])
 sections = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(sections, [32, 91, 28, 52])
+geompy.UnionIDs(sections, [24, 28, 44, 83])
 amont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(amont, [91])
+geompy.UnionIDs(amont, [83])
 aval = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(aval, [28])
 bordDroit = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(bordDroit, [4, 7, 25, 9, 15, 23, 13, 11])
+geompy.UnionIDs(bordDroit, [4, 7, 9, 11, 19, 21])
 bordGauche = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(bordGauche, [43, 45, 49, 47, 41, 35])
+geompy.UnionIDs(bordGauche, [31, 34, 36, 41])
 piles = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"])
-geompy.UnionIDs(piles, [57, 75, 88, 68, 63, 59, 54, 77, 61, 86, 81, 66, 84, 72, 70, 79])
+geompy.UnionIDs(piles, [73,58,71,49,55,67,46,80,53,76,78,62,69,60,51,64])
 geompy.addToStudyInFather( HYDRO_casGaronne_1, casGaronne_1_pile3_Outer, 'casGaronne_1_pile3_Outer' )
 geompy.addToStudyInFather( HYDRO_casGaronne_1, casGaronne_1_pile1_Outer, 'casGaronne_1_pile1_Outer' )
 geompy.addToStudyInFather( HYDRO_casGaronne_1, casGaronne_1_pile2_Outer, 'casGaronne_1_pile2_Outer' )
@@ -1128,7 +1134,7 @@ geompy.addToStudyInFather( HYDRO_casGaronne_1, piles, 'piles' )
 #controlGeomProps(geompy, litMineur_pont,   961.8255222,  19618.0787789)
 #controlGeomProps(geompy, litMineur_amont,   22635.6212065,  2548509.17447)
 #controlGeomProps(geompy, riveDroite,  32012.2241814,  26188706.2202)
-ontrolGeomProps(geompy, riveGauche,  29149.1353799,  35949580.6716)
+controlGeomProps(geompy, riveGauche,  29149.1353799,  35949580.6716)
 controlGeomProps(geompy, litMineur_aval,   7965.23431497,  935955.786347)
 controlGeomProps(geompy, litMineur_pont,   961.8255222,  19618.016847)
 controlGeomProps(geompy, litMineur_amont,   22635.6212065,  2531409.65041)
@@ -1241,7 +1247,7 @@ casGaronne_1.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1)
 #controlSubMeshStats(riveDroite_1, 4040)
 #controlSubMeshStats(riveGauche_1, 4627)
 controlMeshStats(casGaronne_1, 6985, 745, 13761)
-controlSubMeshStats(litMineur_pont_2, 185)
+controlSubMeshStats(litMineur_pont_2, 202)
 controlSubMeshStats(litMineur_amont_2, 3000)
 controlSubMeshStats(litMineur_aval_2, 2000)
 controlSubMeshStats(riveDroite_1, 3941)
SALOME HYDRO module

Copyright © 2005–2024 Open CASCADE.
All rights reserved.
Legal Information