X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_LandCoverMap.cxx;h=83345f84f23a6bc5c5116caba53b76c7e9b8bae6;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=98152c213ff9aa7e6156d790e86c90c23fb58f02;hpb=af8ddda6b2f69cd209acf146c9723bc439607626;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 98152c21..83345f84 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -188,6 +189,66 @@ void test_HYDROData_LandCoverMap::test_merge() aDoc->Close(); } +void test_HYDROData_LandCoverMap::test_merge_refs_691() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_PolylineXY) Polyline_4 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_4->SetName( "test_Polyline_4" ); + Polyline_4->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_4->AddPoint( 0, gp_XY( -242.741935, -16.129032 ) ); + Polyline_4->AddPoint( 0, gp_XY( -339.516129, -95.161290 ) ); + Polyline_4->AddPoint( 0, gp_XY( -204.032258, -167.740000 ) ); + Polyline_4->AddPoint( 0, gp_XY( -86.290000, -158.060000 ) ); + Polyline_4->AddPoint( 0, gp_XY( -83.064516, -37.096774 ) ); + Polyline_4->AddPoint( 0, gp_XY( -116.935484, 17.741935 ) ); + Polyline_4->AddSection( "Section_2", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_4->AddPoint( 1, gp_XY( -239.516129, -295.161290 ) ); + Polyline_4->AddPoint( 1, gp_XY( -204.030000, -167.740000 ) ); + Polyline_4->AddPoint( 1, gp_XY( -86.290000, -158.060000 ) ); + Polyline_4->AddPoint( 1, gp_XY( -2.419355, -288.709677 ) ); + Polyline_4->AddPoint( 1, gp_XY( -165.322581, -351.612903 ) ); + Polyline_4->Update(); + + Handle(HYDROData_LandCoverMap) aMap = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + + CPPUNIT_ASSERT_EQUAL( true, aMap->Add( Polyline_4, "test" ) ); + + TopTools_ListOfShape aList; + HYDROData_LandCoverMap::Explorer anIt( aMap ); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "test" ), anIt.StricklerType() ); + aList.Append( anIt.Face() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "test" ), anIt.StricklerType() ); + aList.Append( anIt.Face() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt.More() ); + + BRepCheck_Analyzer aCheck1( aMap->GetShape() ); + CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck1.IsValid() ); + + CPPUNIT_ASSERT_EQUAL( true, aMap->Merge( aList, "test" ) ); + + BRepCheck_Analyzer aCheck2( aMap->GetShape() ); + CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck2.IsValid() ); + + // we try construct the triangulation to check that it is correct + BRepMesh_IncrementalMesh anIncMesh( aMap->GetShape(), 0.01 ); + CPPUNIT_ASSERT_EQUAL( true, (bool)anIncMesh.IsDone() ); + BRepCheck_Analyzer aCheck3( aMap->GetShape() ); + CPPUNIT_ASSERT_EQUAL( true, (bool)aCheck3.IsValid() ); + + Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); + TestViewer::show( aPrs, AIS_Shaded, 0, true, "LandCoverMap_Merge_2" ); + CPPUNIT_ASSERT_IMAGES + + aDoc->Close(); +} + void test_HYDROData_LandCoverMap::test_remove() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); @@ -248,6 +309,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_11" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -256,7 +319,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_12" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -266,7 +331,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_13" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -278,6 +345,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_14" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } // @@ -290,6 +359,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_21" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -298,7 +369,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_22" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -308,7 +381,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_23" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -320,6 +395,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_24" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } } @@ -345,6 +422,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_11" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -353,7 +432,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_12" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -363,7 +444,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_13" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -373,7 +456,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_14" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } // @@ -386,6 +471,8 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_21" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -394,7 +481,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_22" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -404,7 +493,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_23" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } { TopTools_ListOfShape Faces; @@ -414,7 +505,9 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles() TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false ); TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_24" ); CPPUNIT_ASSERT_IMAGES - CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL); + CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_COMPOUND); + BRepCheck_Analyzer aBCA(aMergedFace); + CPPUNIT_ASSERT(aBCA.IsValid()); } } @@ -449,7 +542,6 @@ void test_HYDROData_LandCoverMap::test_import_dbf() QList Inds = QList() << 1 << 2 << 3; aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds); HYDROData_LandCoverMap::Explorer anIt( aMap ); - CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() ); anIt.Next(); CPPUNIT_ASSERT_EQUAL( QString( "road" ), anIt.StricklerType() ); @@ -519,7 +611,8 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff() Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); aPrs->SetTable( aTable ); - aPrs->SetColorScale( TestViewer::showColorScale( true ) ); + TestViewer::showColorScale( true ); + aPrs->SetColorScale( TestViewer::colorScale() ); TestViewer::show( aPrs, AIS_Shaded, 4, true, "LandCoverMap_PrsByCoeff" ); CPPUNIT_ASSERT_IMAGES @@ -531,6 +624,11 @@ void test_HYDROData_LandCoverMap::test_dump_python() { Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + Handle(HYDROData_StricklerTable) aTable = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); + aTable->SetName( "DefStr" ); + Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); aMap->SetName( "test_LCM" ); @@ -551,10 +649,15 @@ void test_HYDROData_LandCoverMap::test_dump_python() 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) ); - QString aTmpPath = QDir::tempPath() + "/lc_dump.py"; + QString aBaseName = "lc_dump.py"; + QString aBaseShp = "lc_dump.shp"; + QString aBaseDbf = "lc_dump.dbf"; + QString aTmpPath = QDir::tempPath() + "/" + aBaseName; CPPUNIT_ASSERT_EQUAL( true, aDoc->DumpToPython( aTmpPath, false ) ); - //TODO: compare files + //TODO: CPPUNIT_ASSERT_SCRIPTS_EQUAL( aBaseName, true, false, 20 ); + //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseShp ); + //TODO: CPPUNIT_ASSERT_FILES_EQUAL( aBaseDbf ); aDoc->Close(); } @@ -658,6 +761,7 @@ void test_HYDROData_LandCoverMap::test_add_triangles() CPPUNIT_ASSERT_EQUAL( true, aMap->Add( Polyline_4, "" ) ); Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); + TopoDS_Shape aSh = aMap->GetShape(); TestViewer::show( aPrs, AIS_Shaded, 0, true, "LandCover_Triangles" ); CPPUNIT_ASSERT_IMAGES @@ -945,3 +1049,77 @@ void test_HYDROData_LandCoverMap::test_split_2() aDoc->Close(); } + +void test_HYDROData_LandCoverMap::test_export_telemac() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_StricklerTable) aTable = + Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); + + Handle(HYDROData_LandCoverMap) aMap = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + + TopoDS_Face aLC1 = Face( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "Zones de champs cultivé à végétation basse" ) ); + + TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + 44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 << + 128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 << + 31 << 114 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "Zones de champs cultivé à végétation haute" ) ); + + TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "Zones de champs, prairies, sans cultures" ) ); + + QString aTmpFileName = "test.telemac"; + QString aTmpPath = QDir::tempPath() + "/" + aTmpFileName; + CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable ) ); + CPPUNIT_ASSERT_SCRIPTS_EQUAL( aTmpFileName, true, true, 0 ); + + aDoc->Close(); +} + +void test_HYDROData_LandCoverMap::test_copy() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + + Handle(HYDROData_LandCoverMap) aMap = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + aMap->SetName( "map_1" ); + + TopoDS_Face aLC1 = Face( QList() << 10 << 10 << 30 << 10 << 20 << 20 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "Zones de champs cultivé à végétation basse" ) ); + + TopoDS_Face aLC2 = Face( QList() << 110 << 10 << 130 << 10 << 120 << 20 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "Zones de champs cultivé à végétation haute" ) ); + + Handle(HYDROData_LandCoverMap) aMap2 = + Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + aMap->CopyTo( aMap2, true ); + + CPPUNIT_ASSERT_EQUAL( QString( "map_2" ), aMap2->GetName() ); + HYDROData_LandCoverMap::Explorer anIt( aMap2 ); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "Zones de champs cultivé à végétation basse" ), anIt.StricklerType() ); + CPPUNIT_ASSERT( anIt.Face().TShape()!=aLC1.TShape() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "Zones de champs cultivé à végétation haute" ), anIt.StricklerType() ); + CPPUNIT_ASSERT( anIt.Face().TShape()!=aLC2.TShape() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt.More() ); + + TopoDS_Shape aShape1 = aMap->GetShape(); + TopoDS_Shape aShape2 = aMap2->GetShape(); + gp_Trsf aTr; + aTr.SetTranslation( gp_Vec( 0, 50, 0 ) ); + aShape2.Move( TopLoc_Location( aTr ) ); + TestViewer::show( aShape1, AIS_Shaded, /*0,*/ true, "LCM_copied" ); + TestViewer::show( aShape2, AIS_Shaded, /*0,*/ true, "" ); + CPPUNIT_ASSERT_IMAGES + + aDoc->Close(); +}