From a63104e89dd1385527aba717734368e104752b8a Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Fri, 7 Apr 2017 15:08:29 +0200 Subject: [PATCH] debug LandCoverMap --- src/HYDROData/HYDROData_CalculationCase.cxx | 4 ++ src/HYDROData/HYDROData_Entity.cxx | 3 +- src/HYDROGUI/resources/HYDROGUI_images.ts | 2 +- ...r_table.txt => def_strickler_table_06.txt} | 0 .../resources/def_strickler_table_12.txt | 45 ++++++++++++++++++ src/HYDROTools/interpolS.py | 1 + .../reference_data/CLC_decoupe.dbf | Bin 0 -> 338879 bytes src/HYDRO_tests/reference_data/CMakeLists.txt | 1 + .../test_HYDROData_LandCoverMap.cxx | 2 +- .../test_HYDROData_StricklerTable.cxx | 2 +- 10 files changed, 56 insertions(+), 4 deletions(-) rename src/HYDROGUI/resources/{def_strickler_table.txt => def_strickler_table_06.txt} (100%) create mode 100644 src/HYDROGUI/resources/def_strickler_table_12.txt create mode 100644 src/HYDRO_tests/reference_data/CLC_decoupe.dbf diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index 89fc176b..c8e80a8e 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -607,6 +607,7 @@ Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() cons { Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast( GetReferenceObject( DataTag_LandCoverMap ) ); + DEBTRACE("GetLandCoverMap " << aMap.IsNull()); return aMap; } @@ -920,9 +921,12 @@ double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& std::vector HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector& thePoints, double DefValue, bool UseMax ) const { + DEBTRACE("GetStricklerCoefficientForPoints"); Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap(); Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable(); std::vector theCoeffs; + DEBTRACE("aLCM.IsNull() " << aLCM.IsNull()); + DEBTRACE("aTable.IsNull() "<< aTable.IsNull()); if( aLCM.IsNull() || aTable.IsNull() ) return theCoeffs; diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx index 31ae1a67..79444df5 100644 --- a/src/HYDROData/HYDROData_Entity.cxx +++ b/src/HYDROData/HYDROData_Entity.cxx @@ -489,6 +489,7 @@ void HYDROData_Entity::SetReferenceObjects( const HYDROData_SequenceOfObjects& t Handle(HYDROData_Entity) HYDROData_Entity::GetReferenceObject( const int theTag, const int theIndex ) const { + DEBTRACE("GetReferenceObject " << theTag << " " << theIndex); Handle(HYDROData_Entity) aRes; Handle(TDataStd_ReferenceList) aRefs = getReferenceList( theTag, false ); @@ -578,12 +579,12 @@ void HYDROData_Entity::ClearReferenceObjects( const int theTag ) Handle(TDataStd_ReferenceList) HYDROData_Entity::getReferenceList( const int theTag, const bool theIsCreate ) const { + DEBTRACE("getReferenceList " << theTag << " " << theIsCreate); TDF_Label aLabel = theTag == 0 ? myLab : myLab.FindChild( theTag ); Handle(TDataStd_ReferenceList) aRefs; if ( !aLabel.FindAttribute( TDataStd_ReferenceList::GetID(), aRefs ) && theIsCreate ) aRefs = TDataStd_ReferenceList::Set( aLabel ); - return aRefs; } diff --git a/src/HYDROGUI/resources/HYDROGUI_images.ts b/src/HYDROGUI/resources/HYDROGUI_images.ts index f994e690..560c4d13 100644 --- a/src/HYDROGUI/resources/HYDROGUI_images.ts +++ b/src/HYDROGUI/resources/HYDROGUI_images.ts @@ -359,7 +359,7 @@ DEFAULT_STRICKLER_TABLE_FILE - def_strickler_table.txt + def_strickler_table_12.txt IMPORT_STRICKLER_TABLE_ICO diff --git a/src/HYDROGUI/resources/def_strickler_table.txt b/src/HYDROGUI/resources/def_strickler_table_06.txt similarity index 100% rename from src/HYDROGUI/resources/def_strickler_table.txt rename to src/HYDROGUI/resources/def_strickler_table_06.txt diff --git a/src/HYDROGUI/resources/def_strickler_table_12.txt b/src/HYDROGUI/resources/def_strickler_table_12.txt new file mode 100644 index 00000000..bf213d2e --- /dev/null +++ b/src/HYDROGUI/resources/def_strickler_table_12.txt @@ -0,0 +1,45 @@ +CODE_12 +"Tissu urbain continu" 15.0 E6004D 111 +"Tissu urbain discontinu" 32.0 FF0000 112 +"Zones industrielles ou commerciales et installations publiques" 30.0 CC4DF2 121 +"Réseaux routier et ferroviaire et espaces associés" 35.0 CC0000 122 +"Zones portuaires" 45.0 E6CCCC 123 +"Aéroports" 43.0 E6CCE6 124 +"Extraction de matériaux" 19.0 A600CC 131 +"Décharges" 21.0 A64D00 132 +"Chantiers" 17.0 FF4DFF 133 +"Espaces verts urbains" 25.0 FFA6FF 141 +"Equipements sportifs et de loisirs" 40.0 FFE6FF 142 +"Terres arables hors périmètres d'irrigation" 31.0 FFFFA8 211 +"Périmètres irrigués en permanence" 43.0 FFFF00 212 +"Rizières" 42.0 E6E600 213 +"Vignobles" 24.0 E68000 221 +"Vergers et petits fruits" 25.0 F2A64D 222 +"Oliveraies" 26.0 E6A600 223 +"Prairies et autres surfaces toujours en herbe à usage agricole" 33.0 E6E64D 231 +"Cultures annuelles associées à des cultures permanentes" 27.0 FFE6A6 241 +"Systèmes culturaux et parcellaires complexes" 19.0 FFE64D 242 +"Surfaces essentiellement agricoles, interrompues par des espaces naturels importants" 16.0 E6CC4D 243 +"Territoires agroforestiers" 14.0 F2CCA6 244 +"Forêts de feuillus" 9.0 80FF00 311 +"Forêts de conifères" 13.0 A600 312 +"Forêts mélangées" 10.0 4DFF00 313 +"Pelouses et pâturages naturels" 31.0 CCF24D 321 +"Landes et broussailles" 12.0 A6FF80 322 +"Végétation sclérophylle" 10.0 A6E64D 323 +"Forêt et végétation arbustive en mutation" 9.0 A6F200 324 +"Plages, dunes et sable" 39.0 E6E6E6 331 +"Roches nues" 45.0 CCCCCC 332 +"Végétation clairsemée" 43.0 CCFFCC 333 +"Zones incendiées" 65.0 0 334 +"Glaciers et neiges éternelles" 75.0 A6E6CC 335 +"Marais intérieurs" 60.0 A6A6FF 411 +"Tourbières" 65.0 4D4DFF 412 +"Marais maritimes" 74.0 CCCCFF 421 +"Marais salants" 73.0 E6E6FF 422 +"Zones intertidales" 75.0 A6A6E6 423 +"Cours et voies d'eau" 88.0 CCF2 511 +"Plans d'eau" 90.0 80F2E6 512 +"Lagunes littorales" 95.0 FFA6 521 +"Estuaires" 98.0 A6FFE6 522 +"Mers et océans" 99.0 E6F2FF 523 diff --git a/src/HYDROTools/interpolS.py b/src/HYDROTools/interpolS.py index 000df600..aaf31353 100644 --- a/src/HYDROTools/interpolS.py +++ b/src/HYDROTools/interpolS.py @@ -69,6 +69,7 @@ def assignStrickler(case_name, med_file_name, output_file_name, med_field_name=' values = [] x_coords = coords[0::sdim] y_coords = coords[1::sdim] + #print "case.GetStricklerCoefficientForPoints" values = case.GetStricklerCoefficientForPoints(x_coords, y_coords, 0.0, True) # Write the values to the field diff --git a/src/HYDRO_tests/reference_data/CLC_decoupe.dbf b/src/HYDRO_tests/reference_data/CLC_decoupe.dbf new file mode 100644 index 0000000000000000000000000000000000000000..4024dbb55d045e02987c9ba4e2381404060d7cec GIT binary patch literal 338879 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 #include -const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt"; +const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table_06.txt"; void test_HYDROData_StricklerTable::test_import() { -- 2.39.2