X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_LandCoverMap.cxx;h=d4da4adba918cdfee33a94e49c709524dd6b132d;hb=670039d7a5d25b1da51956b668f212756d31a86e;hp=a64ed48016064057184f6a3e132cee902b065586;hpb=8bbde00ccd3a0e63d2e2b39e87f01398582ebfcb;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index a64ed480..d4da4adb 100644
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -64,7 +64,7 @@ void test_HYDROData_LandCoverMap::test_add_2_objects()
   TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Add_2_Objects" );
   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();
@@ -99,7 +99,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();
@@ -134,7 +134,7 @@ void test_HYDROData_LandCoverMap::test_incomplete_split()
   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();
@@ -448,7 +448,7 @@ void test_HYDROData_LandCoverMap::test_import_dbf()
   CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
   QList<int> Inds = QList<int>() << 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();
@@ -841,3 +841,105 @@ 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( -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();
+
+
+  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 ) );
+
+  //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( LCM->GetShape(), AIS_Shaded, /*0,*/ true, "LCM_split_2b" );
+  CPPUNIT_ASSERT_IMAGES
+
+  aDoc->Close();
+}