Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TShell cannot be disconnected; use TCompound of shells/faces instead
[modules/hydro.git]
/
src
/
HYDRO_tests
/
test_HYDROData_LandCoverMap.cxx
diff --git
a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index 2f9896cf45f3ff9ba3065e286768014dc25389bc..d4da4adba918cdfee33a94e49c709524dd6b132d 100644
(file)
--- 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
TestViewer::show( aMap->GetShape(), AIS_Shaded, true, "LandCoverMap_Add_2_Objects" );
CPPUNIT_ASSERT_IMAGES
- HYDROData_LandCoverMap::
Iterato
r anIt( aMap );
+ HYDROData_LandCoverMap::
Explore
r anIt( aMap );
CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
anIt.Next();
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
TestViewer::show( aWire, 0, true, Qt::blue );
CPPUNIT_ASSERT_IMAGES
- HYDROData_LandCoverMap::
Iterato
r anIt( aMap );
+ HYDROData_LandCoverMap::
Explore
r anIt( aMap );
CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
anIt.Next();
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
TestViewer::show( aWire, 0, true, Qt::green );
CPPUNIT_ASSERT_IMAGES
- HYDROData_LandCoverMap::
Iterato
r anIt( aMap );
+ HYDROData_LandCoverMap::
Explore
r anIt( aMap );
CPPUNIT_ASSERT_EQUAL( true, anIt.More() );
CPPUNIT_ASSERT_EQUAL( QString( "test1" ), anIt.StricklerType() );
anIt.Next();
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);
CPPUNIT_ASSERT_EQUAL( true, aMap->Split( aPolyline ) );
QList<int> Inds = QList<int>() << 1 << 2 << 3;
aMap->ImportDBF(aFileName, "TESTFIELD1", aDBFV, aST, Inds);
- HYDROData_LandCoverMap::
Iterato
r anIt( aMap );
+ HYDROData_LandCoverMap::
Explore
r anIt( aMap );
CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() );
anIt.Next();
CPPUNIT_ASSERT_EQUAL( QString( "forest" ), anIt.StricklerType() );
anIt.Next();
@@
-914,8
+914,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 ) );
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->AddPoint( 0, gp_XY( -53.41, 246.43 ) );
Polyline_9->AddPoint( 0, gp_XY( 10.62, 245.01 ) );
+
+
Polyline_9->Update();
Polyline_9->Update();
@@
-926,14
+931,14
@@
void test_HYDROData_LandCoverMap::test_split_2()
CPPUNIT_ASSERT_EQUAL( true, LCM->Split( Polyline_9 ) );
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 ) );
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();
CPPUNIT_ASSERT_IMAGES
aDoc->Close();