X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_LandCoverMap.cxx;h=be1326b9074d45b1f9fe1ffae78274b170d815c7;hb=ba53436c18b7ed378d149952aff0b5ecafc3e902;hp=2f9896cf45f3ff9ba3065e286768014dc25389bc;hpb=541470db80142c32e3812a7b79e26727df1dcece;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index 2f9896cf..be1326b9 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,9 +42,14 @@ #include #include #include +#include +#include -const QString REF_DATA_PATH = qgetenv( "HYDRO_REFERENCE_DATA" ); -const QString DEF_STR_PATH = qgetenv( "HYDRO_SRC_DIR" ) + "/src/HYDROGUI/resources/def_strickler_table.txt"; +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + +extern QString REF_DATA_PATH; +const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table_06.txt"; void test_HYDROData_LandCoverMap::test_add_2_objects() { @@ -55,19 +60,35 @@ void test_HYDROData_LandCoverMap::test_add_2_objects() CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC1 = Face( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + TopoDS_Face aLC1 = Face2d( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + //DEBTRACE("--- ajout test1 " << aLC1); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) ); - TopoDS_Face aLC2 = Face( QList() << 30 << 20 << 60 << 10 << 70 << 35 << 40 << 40 ); + TopoDS_Face aLC2 = Face2d( QList() << 30 << 20 << 60 << 10 << 70 << 35 << 40 << 40 ); + //DEBTRACE("--- ajout test2 " << aLC2); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, "test2" ) ); + HYDROData_LandCoverMap::Explorer anIt( aMap ); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + //DEBTRACE(anIt.Face() << " " << anIt.StricklerType()); + CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() ); + anIt.Next(); + //DEBTRACE(anIt.Face() << " " << anIt.StricklerType()); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString( "test2" ), anIt.StricklerType() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( false, anIt.More() ); + + //DEBTRACE("--- show") TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Add_2_Objects" ); CPPUNIT_ASSERT_IMAGES - HYDROData_LandCoverMap::Iterator anIt( aMap ); + anIt.Init(*aMap); CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + //DEBTRACE(anIt.Face() << " " << anIt.StricklerType()); CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() ); anIt.Next(); + //DEBTRACE(anIt.Face() << " " << anIt.StricklerType()); CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); CPPUNIT_ASSERT_EQUAL( QString( "test2" ), anIt.StricklerType() ); anIt.Next(); @@ -85,12 +106,12 @@ void test_HYDROData_LandCoverMap::test_split() CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC = Face( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + TopoDS_Face aLC = Face2d( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC, "test1" ) ); Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); - TopoDS_Wire aWire = Wire( QList() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10, false ); + TopoDS_Wire aWire = Wire2d( QList() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10, false ); aPolyline->SetShape( aWire ); CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) ); @@ -99,7 +120,7 @@ void test_HYDROData_LandCoverMap::test_split() TestViewer::show( aWire, 0, true, Qt::blue ); CPPUNIT_ASSERT_IMAGES - HYDROData_LandCoverMap::Iterator anIt( aMap ); + HYDROData_LandCoverMap::Explorer anIt( aMap ); CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() ); anIt.Next(); @@ -120,21 +141,21 @@ void test_HYDROData_LandCoverMap::test_incomplete_split() CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC = Face( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + TopoDS_Face aLC = Face2d( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC, "test1" ) ); Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); - TopoDS_Wire aWire = Wire( QList() << 10 << 40 << 30 << 10 << 40 << 10, false ); + TopoDS_Wire aWire = Wire2d( QList() << 10 << 40 << 30 << 10 << 40 << 10, false ); aPolyline->SetShape( aWire ); - CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) ); + CPPUNIT_ASSERT_EQUAL( false, aMap->Split( aPolyline ) ); TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Split_2" ); TestViewer::show( aWire, 0, true, Qt::green ); CPPUNIT_ASSERT_IMAGES - HYDROData_LandCoverMap::Iterator anIt( aMap ); + HYDROData_LandCoverMap::Explorer anIt( aMap ); CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() ); anIt.Next(); @@ -152,17 +173,17 @@ void test_HYDROData_LandCoverMap::test_merge() CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC1 = Face( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + TopoDS_Face aLC1 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) ); - TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + TopoDS_Face aLC2 = Face2d( 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, "test2" ) ); - TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + TopoDS_Face aLC3 = Face2d( QList() << 4 << 54 << 1 << 47 << 51 << 45 << 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) ); @@ -188,6 +209,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); @@ -197,17 +278,17 @@ void test_HYDROData_LandCoverMap::test_remove() CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC1 = Face( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + TopoDS_Face aLC1 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) ); - TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + TopoDS_Face aLC2 = Face2d( 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, "test2" ) ); - TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + TopoDS_Face aLC3 = Face2d( QList() << 4 << 54 << 1 << 47 << 51 << 45 << 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, "test3" ) ); @@ -248,6 +329,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 +339,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 +351,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 +365,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 +379,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 +389,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 +401,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 +415,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 +442,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 +452,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 +464,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 +476,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 +491,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 +501,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 +513,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 +525,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()); } } @@ -438,18 +551,17 @@ void test_HYDROData_LandCoverMap::test_import_dbf() // aST.size() == aDBFV.size()!! Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); - TopoDS_Wire aWire = Wire( QList() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10 ); + TopoDS_Wire aWire = Wire2d( QList() << 10 << 40 << 30 << 10 << 40 << 10 << 60 << 10 ); aPolyline->SetShape( aWire ); for (int i = 0; i < 3; i++) aMap->Add(aPolyline, ""); - TopoDS_Face aLC1 = Face( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); + TopoDS_Face aLC1 = Face2d( QList() << 10 << 10 << 50 << 20 << 30 << 50 << 15 << 30 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) ); CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) ); QList Inds = QList() << 1 << 2 << 3; aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds); - HYDROData_LandCoverMap::Iterator anIt( aMap ); - + HYDROData_LandCoverMap::Explorer anIt( aMap ); CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() ); anIt.Next(); CPPUNIT_ASSERT_EQUAL( QString( "road" ), anIt.StricklerType() ); @@ -468,18 +580,18 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types() 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 aLC1 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) ); - TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + TopoDS_Face aLC2 = Face2d( 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" ) ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) ); - TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + TopoDS_Face aLC3 = Face2d( 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" ) ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) ); // build presentation object Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); @@ -489,7 +601,7 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_types() // select one of faces (first) TestViewer::select( 200, 300 ); CPPUNIT_ASSERT_IMAGES - + TestViewer::eraseAll(true, true); aDoc->Close(); } @@ -504,22 +616,23 @@ void test_HYDROData_LandCoverMap::test_land_cover_prs_by_coeff() 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 aLC1 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Zones de champs cultivé à végétation basse")) ); - TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + TopoDS_Face aLC2 = Face2d( 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" ) ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Zones de champs cultivé à végétation haute")) ); - TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + TopoDS_Face aLC3 = Face2d( 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" ) ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Zones de champs, prairies, sans cultures")) ); 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,30 +644,40 @@ 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" ); CPPUNIT_ASSERT_EQUAL( KIND_LAND_COVER_MAP, aMap->GetKind() ); - TopoDS_Face aLC1 = Face( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + TopoDS_Face aLC1 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, "test1" ) ); - TopoDS_Face aLC2 = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + TopoDS_Face aLC2 = Face2d( 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, "test2" ) ); - TopoDS_Face aLC3 = Face( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + TopoDS_Face aLC3 = Face2d( QList() << 4 << 54 << 1 << 47 << 51 << 45 << 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(); } @@ -582,15 +705,17 @@ void test_HYDROData_LandCoverMap::test_transparent_prs() Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); - aMap->LocalPartition( Face( QList() << 1 << 1 << 10 << 10 << 10 << 20 ), "Zones de champs cultivé à végétation haute" ); - aMap->LocalPartition( Face( QList() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), "Zones de champs cultivé à végétation haute" ); + aMap->LocalPartition( Face2d( QList() << 1 << 1 << 10 << 10 << 10 << 20 ), QString::fromUtf8("Zones de champs cultivé à végétation haute")); + aMap->LocalPartition( Face2d( QList() << 5 << 5 << 10 << 5 << 10 << 8 << 5 << 12 << 5 << 8 ), QString::fromUtf8("Zones de champs cultivé à végétation haute")); aMap->SetName( "test_LCM" ); TestViewer::show( aZone->GetTopShape(), AIS_Shaded, true, "LandCoverMap_TransparentPrs" ); + aMap->SetTransparency( 0.5 ); + CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.5, aMap->GetTransparency(), 1E-6 ); + Handle(HYDROGUI_LandCoverMapPrs) aPrs = new HYDROGUI_LandCoverMapPrs( aMap ); aPrs->SetTable( aTable ); - aPrs->SetTransparency( 0.5 ); TestViewer::show( aPrs, AIS_Shaded, 0, true, "" ); CPPUNIT_ASSERT_IMAGES @@ -656,6 +781,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 @@ -681,16 +807,18 @@ void test_HYDROData_LandCoverMap::test_assign_to_calc_case() aDoc->Close(); } - +#include void test_HYDROData_LandCoverMap::test_shp_import_cyp() { + //TestViewer::eraseAll(true); + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); QString aFileName = REF_DATA_PATH + "/cyprus_natural.shp"; HYDROData_ShapeFile anImporter; QStringList PolygonList; TopTools_SequenceOfShape PolygonFaces; int Type = -1; - int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type); + int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type); CPPUNIT_ASSERT(aStat == 1); CPPUNIT_ASSERT_EQUAL(5, Type); CPPUNIT_ASSERT_EQUAL(268, PolygonFaces.Length()); @@ -720,7 +848,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_clc_dec() QStringList PolygonList; TopTools_SequenceOfShape PolygonFaces; int Type = -1; - int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type); + int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type); CPPUNIT_ASSERT(aStat == 1); CPPUNIT_ASSERT_EQUAL(5, Type); CPPUNIT_ASSERT_EQUAL(625, PolygonFaces.Length()); @@ -750,7 +878,7 @@ void test_HYDROData_LandCoverMap::test_shp_import_nld_areas() QStringList PolygonList; TopTools_SequenceOfShape PolygonFaces; int Type = -1; - int aStat = anImporter.ImportPolygons(aFileName, PolygonList, PolygonFaces, Type); + int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type); CPPUNIT_ASSERT(aStat == 1); CPPUNIT_ASSERT_EQUAL(5, Type); CPPUNIT_ASSERT_EQUAL(127, PolygonFaces.Length()); @@ -776,8 +904,11 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() { QString aFFileName = REF_DATA_PATH + "/CLC06-cut_1.shp"; QString aSFileName = REF_DATA_PATH + "/CLC06-cut_1_res.shp"; + //This test verify only some geom data (shp+shx) without any dbf reading/writing { + //DEBTRACE("aFFileName: " << aFFileName.toStdString()); + //DEBTRACE("aSFileName: " << aSFileName.toStdString()); Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); HYDROData_ShapeFile anImporter; QStringList PolygonList; @@ -785,7 +916,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() int Type = -1; //import LCM from file (#2-4; #12-14 polygons) - CPPUNIT_ASSERT( anImporter.ImportPolygons(aFFileName, PolygonList, PolygonFaces, Type)); + CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aFFileName, PolygonList, PolygonFaces, Type)); Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); HYDROData_MapOfFaceToStricklerType aMapFace2ST; @@ -806,7 +937,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() //export lcm HYDROData_ShapeFile anExporter; QStringList aNonExpList; - anExporter.Export(aSFileName, LCM, aNonExpList); + anExporter.Export(aDoc, aSFileName, LCM, aNonExpList); CPPUNIT_ASSERT (aNonExpList.empty()); aDoc->Close(); @@ -819,7 +950,7 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() int Type = -1; //import all - CPPUNIT_ASSERT( anImporter.ImportPolygons(aSFileName, PolygonList, PolygonFaces, Type)); + CPPUNIT_ASSERT( anImporter.ImportPolygons(aDoc, aSFileName, PolygonList, PolygonFaces, Type)); Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); HYDROData_MapOfFaceToStricklerType aMapFace2ST; CPPUNIT_ASSERT_EQUAL(PolygonFaces.Length(), 6); @@ -914,8 +1045,13 @@ void test_HYDROData_LandCoverMap::test_split_2() Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); Polyline_9->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, false ); Polyline_9->AddPoint( 0, gp_XY( -103.92, 288.40 ) ); + Polyline_9->AddPoint( 0, gp_XY( -100.09, 285.22 ) ); + Polyline_9->AddPoint( 0, gp_XY( -96.10, 281.90 ) ); + Polyline_9->AddPoint( 0, gp_XY( -90.43, 277.19 ) ); Polyline_9->AddPoint( 0, gp_XY( -53.41, 246.43 ) ); Polyline_9->AddPoint( 0, gp_XY( 10.62, 245.01 ) ); + + Polyline_9->Update(); @@ -926,15 +1062,221 @@ void test_HYDROData_LandCoverMap::test_split_2() CPPUNIT_ASSERT_EQUAL( true, LCM->Split( Polyline_9 ) ); - Handle(HYDROGUI_LandCoverMapPrs) aPrs1 = new HYDROGUI_LandCoverMapPrs( LCM ); - TestViewer::show( aPrs1, AIS_Shaded, 0, true, "LCM_split_2a" ); + //Handle(HYDROGUI_LandCoverMapPrs) aPrs1 = new HYDROGUI_LandCoverMapPrs( LCM ); + TestViewer::show( LCM->GetShape(), AIS_Shaded, /*0,*/ true, "LCM_split_2a" ); CPPUNIT_ASSERT_IMAGES CPPUNIT_ASSERT_EQUAL( true, LCM->Split( Polyline_8 ) ); - Handle(HYDROGUI_LandCoverMapPrs) aPrs2 = new HYDROGUI_LandCoverMapPrs( LCM ); - TestViewer::show( aPrs2, AIS_Shaded, 0, true, "LCM_split_2b" ); + // Handle(HYDROGUI_LandCoverMapPrs) aPrs2 = new HYDROGUI_LandCoverMapPrs( LCM ); + TestViewer::show( LCM->GetShape(), AIS_Shaded, /*0,*/ true, "LCM_split_2b" ); CPPUNIT_ASSERT_IMAGES 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 = Face2d( QList() << 12 << 19 << 82 << 9 << 126 << 53 << 107 << 80 << 29 << 75 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêt et végétation arbustive en mutation")) ); + + TopoDS_Face aLC2 = Face2d( 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, QString::fromUtf8("Forêts de conifères")) ); + + TopoDS_Face aLC3 = Face2d( QList() << 4 << 54 << 1 << 47 << 51 << 45 << + 127 << 42 << 145 << 43 << 148 << 60 << 90 << 65 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC3, QString::fromUtf8("Forêts de feuillus")) ); + + QString aTmpFileName = "test.telemac"; + QString aTmpPath = QDir::tempPath() + "/" + aTmpFileName; + QString messStat; + CPPUNIT_ASSERT_EQUAL( true, aMap->ExportTelemac( aTmpPath, 1E-4, aTable, messStat ) ); + 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 = Face2d( QList() << 10 << 10 << 30 << 10 << 20 << 20 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC1, QString::fromUtf8("Forêts de conifères")) ); + + TopoDS_Face aLC2 = Face2d( QList() << 110 << 10 << 130 << 10 << 120 << 20 ); + CPPUNIT_ASSERT_EQUAL( true, aMap->LocalPartition( aLC2, QString::fromUtf8("Forêts de feuillus")) ); + + 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::fromUtf8("Forêts de feuillus"), anIt.StricklerType() ); + CPPUNIT_ASSERT( anIt.Face().TShape()!=aLC1.TShape() ); + anIt.Next(); + CPPUNIT_ASSERT_EQUAL( true, anIt.More() ); + CPPUNIT_ASSERT_EQUAL( QString::fromUtf8("Forêts de conifères"), 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(); +} + +void test_HYDROData_LandCoverMap::test_shp_clc_classification_perf() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + QString aFileName = REF_DATA_PATH + "/CLC_decoupe.shp"; + HYDROData_ShapeFile anImporter; + QStringList PolygonList; + TopTools_SequenceOfShape PolygonFaces; + int Type = -1; + int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type); + CPPUNIT_ASSERT(aStat == 1); + CPPUNIT_ASSERT_EQUAL(5, Type); + CPPUNIT_ASSERT_EQUAL(625, PolygonFaces.Length()); + + Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + HYDROData_MapOfFaceToStricklerType aMapFace2ST; + +#ifdef NDEBUG + int SI = 100; + int EI = 300; +#else + int SI = 150; + int EI = 200; +#endif + + for ( int i = SI; i <= EI; i++ ) + { + TopoDS_Shape aShape = PolygonFaces(i); + if ( aShape.IsNull() ) + continue; + aMapFace2ST.Add( TopoDS::Face( aShape ), "ST_" + QString::number(i) ); + } + + LCM->StoreLandCovers(aMapFace2ST); + + std::vector pnts; +#ifdef NDEBUG + int N = 1000; //1000*1000 points; uniform distribution for release mode +#else + int N = 100; +#endif + + pnts.reserve(N); + double x0 = 448646.91897505691; + double x1 = 487420.3990381231; + double y0 = 6373566.5122489957; + double y1 = 6392203.4117361344; + for (size_t i=0; i < N; i++) + { + for (size_t j=0; j < N; j++) + { + double px = x0 + (x1-x0)*((double)i/(double)N); + double py = y0 + (y1-y0)*((double)j/(double)N); + pnts.push_back(gp_XY(px,py)); + } + } + OSD_Timer aTimer; + std::vector > TRes; + aTimer.Start(); + LCM->ClassifyPoints(pnts, TRes); + aTimer.Stop(); +#ifdef NDEBUG + CPPUNIT_ASSERT( aTimer.ElapsedTime() < 1.4); + aTimer.Show(); +#endif +} + +void test_HYDROData_LandCoverMap::test_shp_clc_classification_check() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1); + QString aFileName = REF_DATA_PATH + "/CLC_decoupe.shp"; + HYDROData_ShapeFile anImporter; + QStringList PolygonList; + TopTools_SequenceOfShape PolygonFaces; + int Type = -1; + int aStat = anImporter.ImportPolygons(aDoc, aFileName, PolygonList, PolygonFaces, Type); + CPPUNIT_ASSERT(aStat == 1); + Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + HYDROData_MapOfFaceToStricklerType aMapFace2ST; + + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(172) ), "Tissu urbain continu" ); + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(179) ), "Aéroports" ); + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(185) ), "Rizières" ); + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(187) ), "Vignobles" ); + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(190) ), "Oliveraies" ); + aMapFace2ST.Add( TopoDS::Face( PolygonFaces(196) ), "Estuaires" ); + + LCM->StoreLandCovers(aMapFace2ST); + + TopoDS_Shape Sh = LCM->GetShape(); + + std::vector pnts; + pnts.push_back(gp_XY(0,0)); + + pnts.push_back(gp_XY(468380, 6382300)); + pnts.push_back(gp_XY(468380, 6382900)); + pnts.push_back(gp_XY(468380, 6383200)); + pnts.push_back(gp_XY(468250, 6384700)); + pnts.push_back(gp_XY(470350, 6384700)); + pnts.push_back(gp_XY(469279.642874048, 6385132.45048612 )); + + std::vector > TRes; + LCM->ClassifyPoints(pnts, TRes); + + CPPUNIT_ASSERT (TRes[0].empty()); + CPPUNIT_ASSERT (TRes[1].empty()); + CPPUNIT_ASSERT (TRes[2].empty()); + CPPUNIT_ASSERT_EQUAL (*TRes[3].begin(), QString("Estuaires")); + CPPUNIT_ASSERT_EQUAL (*TRes[4].begin(), QString("Oliveraies")); + CPPUNIT_ASSERT_EQUAL (*TRes[5].begin(), QString("Vignobles")); + + //std::less comparator; so compare first and second elem safely + CPPUNIT_ASSERT_EQUAL (*TRes[6].begin(), QString("Estuaires")); + CPPUNIT_ASSERT_EQUAL (*(++TRes[6].begin()), QString("Tissu urbain continu")); + + /// + Handle(HYDROData_StricklerTable) aTable = Handle(HYDROData_StricklerTable)::DownCast( aDoc->CreateObject( KIND_STRICKLER_TABLE ) ); + CPPUNIT_ASSERT_EQUAL( true, aTable->Import( DEF_STR_PATH ) ); + std::vector coeffs; + LCM->ClassifyPoints(pnts, aTable, coeffs, 0.0, true); + + CPPUNIT_ASSERT_EQUAL (coeffs[0], 0.0); + CPPUNIT_ASSERT_EQUAL (coeffs[1], 0.0); + CPPUNIT_ASSERT_EQUAL (coeffs[2], 0.0); + CPPUNIT_ASSERT_EQUAL (coeffs[3], 98.0); + CPPUNIT_ASSERT_EQUAL (coeffs[4], 26.0); + CPPUNIT_ASSERT_EQUAL (coeffs[5], 24.0); + CPPUNIT_ASSERT_EQUAL (coeffs[6], 98.0); + +} +