From 015435649c14e69a097ddf92048b07d55b2eeda7 Mon Sep 17 00:00:00 2001 From: asl Date: Tue, 10 Nov 2015 12:28:25 +0300 Subject: [PATCH] debug of the land cover maps --- src/HYDROData/HYDROData_LandCoverMap.cxx | 30 ++++-- src/HYDROData/HYDROData_LandCoverMap.h | 2 + .../reference_data/LCM_split_2a.png | Bin 0 -> 8418 bytes .../reference_data/LCM_split_2b.png | Bin 0 -> 9010 bytes .../reference_data/lcm_poly_2_sections.png | Bin 0 -> 6805 bytes .../test_HYDROData_LandCoverMap.cxx | 95 ++++++++++++++++++ src/HYDRO_tests/test_HYDROData_LandCoverMap.h | 4 + 7 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 src/HYDRO_tests/reference_data/LCM_split_2a.png create mode 100644 src/HYDRO_tests/reference_data/LCM_split_2b.png create mode 100644 src/HYDRO_tests/reference_data/lcm_poly_2_sections.png diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx index 5487b6ad..d56db3d2 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.cxx +++ b/src/HYDROData/HYDROData_LandCoverMap.cxx @@ -437,6 +437,15 @@ bool HYDROData_LandCoverMap::Add( const Handle( HYDROData_Object )& theObject, c return LocalPartition( aFace, theType ); } +bool HYDROData_LandCoverMap::Add( const TopoDS_Wire& theWire, const QString& theType ) +{ + if( !theWire.Closed() ) + return false; + + TopoDS_Face aFace = BRepBuilderAPI_MakeFace( theWire, Standard_True ).Face(); + return LocalPartition( aFace, theType ); +} + /** Add a new polyline as land cover @param thePolyline the polyline to add as land cover @@ -449,15 +458,22 @@ bool HYDROData_LandCoverMap::Add( const Handle( HYDROData_PolylineXY )& thePolyl return false; TopoDS_Shape aShape = thePolyline->GetShape(); - if( aShape.ShapeType()!=TopAbs_WIRE ) - return false; + if( aShape.ShapeType()==TopAbs_WIRE ) + return Add( TopoDS::Wire( aShape ), theType ); - TopoDS_Wire aWire = TopoDS::Wire( aShape ); - if( !aWire.Closed() ) - return false; + if( aShape.ShapeType()==TopAbs_COMPOUND ) + { + TopExp_Explorer anExp( aShape, TopAbs_WIRE ); + for( ; anExp.More(); anExp.Next() ) + { + TopoDS_Wire aPart = TopoDS::Wire( anExp.Current() ); + if( !Add( aPart, theType ) ) + return false; + } + return true; + } - TopoDS_Face aFace = BRepBuilderAPI_MakeFace( aWire, Standard_True ).Face(); - return LocalPartition( aFace, theType ); + return false; } /** diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h index f3492f17..96acd1fc 100644 --- a/src/HYDROData/HYDROData_LandCoverMap.h +++ b/src/HYDROData/HYDROData_LandCoverMap.h @@ -30,6 +30,7 @@ typedef NCollection_IndexedDataMap HYDROData_MapOfFaceToSt DEFINE_STANDARD_HANDLE( HYDROData_LandCoverMap, HYDROData_Entity ) class TopoDS_Shape; +class TopoDS_Wire; class TopoDS_Iterator; class TopTools_ListOfShape; class Handle( HYDROData_PolylineXY ); @@ -121,6 +122,7 @@ public: protected: void SetShape( const TopoDS_Shape& ); + bool Add( const TopoDS_Wire&, const QString& ); bool LocalPartition( const TopoDS_Shape&, const QString& theNewType ); static TopoDS_Shape MergeFaces(const TopTools_ListOfShape& theFaces, bool IsToUnify, double theTolerance = 1E-5 ); diff --git a/src/HYDRO_tests/reference_data/LCM_split_2a.png b/src/HYDRO_tests/reference_data/LCM_split_2a.png new file mode 100644 index 0000000000000000000000000000000000000000..51cf6e0e3fe183d2e88f66bfc38450b7ac3a0611 GIT binary patch literal 8418 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 literal 0 HcmV?d00001 diff --git a/src/HYDRO_tests/reference_data/LCM_split_2b.png b/src/HYDRO_tests/reference_data/LCM_split_2b.png new file mode 100644 index 0000000000000000000000000000000000000000..2f054f8920e09debc55e8fea1ff18da1e76efc43 GIT binary patch literal 9010 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 g{qH<{^(y}Gg20tAQzLI3~& literal 0 HcmV?d00001 diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index a64ed480..7e47eaf4 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -841,3 +841,98 @@ void test_HYDROData_LandCoverMap::test_shp_loop_back() CPPUNIT_ASSERT_EQUAL(0, remove(aSFileName.toStdString().c_str())); } +void test_HYDROData_LandCoverMap::test_add_2_section_poly() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 ); + + Handle(HYDROData_PolylineXY) Polyline_12 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_12->SetName( "Polyline_12" ); + + Polyline_12->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_12->AddPoint( 0, gp_XY( -148.70, 145.68 ) ); + Polyline_12->AddPoint( 0, gp_XY( -81.71, 210.97 ) ); + Polyline_12->AddPoint( 0, gp_XY( -21.09, 122.79 ) ); + Polyline_12->AddPoint( 0, gp_XY( -106.30, 102.44 ) ); + Polyline_12->AddSection( "Section_2", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_12->AddPoint( 1, gp_XY( -7.09, 227.08 ) ); + Polyline_12->AddPoint( 1, gp_XY( 46.32, 228.78 ) ); + Polyline_12->AddPoint( 1, gp_XY( 69.64, 165.61 ) ); + Polyline_12->AddPoint( 1, gp_XY( 13.68, 156.28 ) ); + + Polyline_12->Update(); + + Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + CPPUNIT_ASSERT_EQUAL( true, LCM->Add( Polyline_12, "" ) ); + + TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "lcm_poly_2_sections" ); + CPPUNIT_ASSERT_IMAGES + + aDoc->Close(); +} + +void test_HYDROData_LandCoverMap::test_split_2() +{ + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 ); + + Handle(HYDROData_PolylineXY) Polyline_1 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_1->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_1->AddPoint( 0, gp_XY( -264.84, 323.44 ) ); + Polyline_1->AddPoint( 0, gp_XY( 254.45, 301.19 ) ); + Polyline_1->AddPoint( 0, gp_XY( -291.54, -47.48 ) ); + Polyline_1->Update(); + + Handle(HYDROData_PolylineXY) Polyline_6 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_6->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_6->AddPoint( 0, gp_XY( -155.15, 199.47 ) ); + Polyline_6->AddPoint( 0, gp_XY( -71.19, 289.12 ) ); + Polyline_6->AddPoint( 0, gp_XY( 22.01, 211.57 ) ); + Polyline_6->AddPoint( 0, gp_XY( -84.00, 134.73 ) ); + Polyline_6->Update(); + + Handle(HYDROData_PolylineXY) Polyline_7 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_7->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_7->AddPoint( 0, gp_XY( -50.56, 232.20 ) ); + Polyline_7->AddPoint( 0, gp_XY( 40.51, 286.98 ) ); + Polyline_7->AddPoint( 0, gp_XY( 118.77, 256.39 ) ); + Polyline_7->AddPoint( 0, gp_XY( 72.52, 114.10 ) ); + Polyline_7->Update(); + + Handle(HYDROData_PolylineXY) Polyline_8 = + Handle(HYDROData_PolylineXY)::DownCast( aDoc->CreateObject( KIND_POLYLINEXY ) ); + Polyline_8->AddSection( "Section_1", HYDROData_PolylineXY::SECTION_POLYLINE, true ); + Polyline_8->AddPoint( 0, gp_XY( -44.16, 190.93 ) ); + Polyline_8->AddPoint( 0, gp_XY( 9.91, 226.51 ) ); + Polyline_8->AddPoint( 0, gp_XY( 35.53, 175.99 ) ); + Polyline_8->AddPoint( 0, gp_XY( -9.30, 157.50 ) ); + Polyline_8->Update(); + + Handle(HYDROData_PolylineXY) Polyline_9 = + 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( -53.41, 246.43 ) ); + Polyline_9->AddPoint( 0, gp_XY( 10.62, 245.01 ) ); + Polyline_9->Update(); + + + Handle(HYDROData_LandCoverMap) LCM = Handle(HYDROData_LandCoverMap)::DownCast( aDoc->CreateObject( KIND_LAND_COVER_MAP ) ); + CPPUNIT_ASSERT_EQUAL( true, LCM->Add( Polyline_1, "" ) ); + CPPUNIT_ASSERT_EQUAL( true, LCM->Add( Polyline_6, "" ) ); + CPPUNIT_ASSERT_EQUAL( true, LCM->Add( Polyline_7, "" ) ); + + CPPUNIT_ASSERT_EQUAL( true, LCM->Split( Polyline_9 ) ); + + TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "LCM_split_2a" ); + CPPUNIT_ASSERT_IMAGES + + CPPUNIT_ASSERT_EQUAL( true, LCM->Split( Polyline_8 ) ); + + TestViewer::show( LCM->GetShape(), AIS_Shaded, true, "LCM_split_2b" ); + CPPUNIT_ASSERT_IMAGES + + aDoc->Close(); +} diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h index f8f2a40a..8772f9db 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.h +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.h @@ -27,8 +27,10 @@ class test_HYDROData_LandCoverMap : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( test_HYDROData_LandCoverMap ); CPPUNIT_TEST( test_add_2_objects ); + CPPUNIT_TEST( test_add_2_section_poly ); CPPUNIT_TEST( test_add_triangles ); CPPUNIT_TEST( test_split ); + CPPUNIT_TEST( test_split_2 ); CPPUNIT_TEST( test_incomplete_split ); CPPUNIT_TEST( test_merge ); CPPUNIT_TEST( test_remove ); @@ -50,8 +52,10 @@ class test_HYDROData_LandCoverMap : public CppUnit::TestFixture public: void test_add_2_objects(); + void test_add_2_section_poly(); void test_add_triangles(); void test_split(); + void test_split_2(); void test_incomplete_split(); void test_merge(); void test_remove(); -- 2.39.2