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
Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017
[modules/hydro.git]
/
src
/
HYDRO_tests
/
test_HYDROData_Stream.cxx
diff --git
a/src/HYDRO_tests/test_HYDROData_Stream.cxx
b/src/HYDRO_tests/test_HYDROData_Stream.cxx
index e3754b2e55ec03446b16b96eb5076e50a0200738..86c3d676350d726c6a92a78809a782d6c3ada00c 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_Stream.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_Stream.cxx
@@
-28,6
+28,7
@@
#include <AIS_InteractiveContext.hxx>
#include <TestViewer.h>
#include <QApplication>
#include <AIS_InteractiveContext.hxx>
#include <TestViewer.h>
#include <QApplication>
+#include <QTest>
extern QString REF_DATA_PATH;
NCollection_Sequence<HYDROData_IPolyline::Point> points2;
extern QString REF_DATA_PATH;
NCollection_Sequence<HYDROData_IPolyline::Point> points2;
@@
-72,6
+73,8
@@
void test_HYDROData_Stream::test_alt_object()
Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
CPPUNIT_ASSERT_EQUAL( false, (bool)aStream.IsNull() );
Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
CPPUNIT_ASSERT_EQUAL( false, (bool)aStream.IsNull() );
+ CPPUNIT_ASSERT_EQUAL( true, (bool)aStream->GetAltitudeObject().IsNull() );
+ CPPUNIT_ASSERT_EQUAL( false, (bool)aStream->DTM().IsNull() );
CPPUNIT_ASSERT_EQUAL( false, (bool)aStream->GetAltitudeObject().IsNull() );
CPPUNIT_ASSERT_EQUAL( KIND_DTM, aStream->getAltitudeObjectType() );
CPPUNIT_ASSERT_EQUAL( false, (bool)aStream->GetAltitudeObject().IsNull() );
CPPUNIT_ASSERT_EQUAL( KIND_DTM, aStream->getAltitudeObjectType() );
@@
-88,8
+91,7
@@
void test_HYDROData_Stream::test_params_sync()
Handle(HYDROData_Stream) aStream =
Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
Handle(HYDROData_Stream) aStream =
Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
- Handle(HYDROData_DTM) aDTM =
- Handle(HYDROData_DTM)::DownCast( aStream->GetAltitudeObject() );
+ Handle(HYDROData_DTM) aDTM = aStream->DTM();
CPPUNIT_ASSERT_EQUAL( false, (bool)aDTM.IsNull() );
Handle(HYDROData_Profile) aProfile1 =
CPPUNIT_ASSERT_EQUAL( false, (bool)aDTM.IsNull() );
Handle(HYDROData_Profile) aProfile1 =
@@
-241,7
+243,10
@@
void test_HYDROData_Stream::test_presentation()
for( int i=0; it.More(); it.Next(), i++ )
{
if( i>=25 && i<=35 )
for( int i=0; it.More(); it.Next(), i++ )
{
if( i>=25 && i<=35 )
+ {
+ it.Current()->Update();
profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
+ }
}
Handle(HYDROData_Stream) aStream =
}
Handle(HYDROData_Stream) aStream =
@@
-249,13
+254,13
@@
void test_HYDROData_Stream::test_presentation()
aStream->SetProfiles( profiles, false );
aStream->SetDDZ( 0.2 );
aStream->SetProfiles( profiles, false );
aStream->SetDDZ( 0.2 );
- aStream->SetSpatialStep(
2.
0 );
+ aStream->SetSpatialStep(
1
0 );
aStream->Update();
TopoDS_Shape aPrs3d = aStream->GetShape3D();
TopoDS_Shape aPrs2d = aStream->GetTopShape();
aStream->Update();
TopoDS_Shape aPrs3d = aStream->GetShape3D();
TopoDS_Shape aPrs2d = aStream->GetTopShape();
- TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d" );
+ TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d"
, 1, 1
);
CPPUNIT_ASSERT_IMAGES;
TestViewer::eraseAll( true );
CPPUNIT_ASSERT_IMAGES;
TestViewer::eraseAll( true );