if ( !createTestFile( aFileName ) )
return; // No file has been created
- CPPUNIT_ASSERT( aBathymetry->ImportFromFile( aFileName.toStdString().c_str() ) );
+ CPPUNIT_ASSERT( aBathymetry->ImportFromFiles( QStringList(aFileName)) );
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints();
- CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() );
+ CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() );
gp_XY aTestPoint( 1, 1 );
- double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
+ double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.2432, anAltitude, EPS );
aTestPoint = gp_XY( 0.5, 0.5 );
- anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.3816, anAltitude, EPS );
+ anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.7127, anAltitude, EPS );
aTestPoint = gp_XY( 1.5, 1 );
- anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
+ anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.2432, anAltitude, EPS );
aTestPoint = gp_XY( 1.5, 0.7 );
- anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.1608, anAltitude, EPS );
+ anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.4116, anAltitude, EPS );
aTestPoint = gp_XY( 1.5, -0.7 );
- anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 5.0093, anAltitude, EPS );
+ anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.0479, anAltitude, EPS );
aTestPoint = gp_XY( 2, 3.5 );
- anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 12.6829, anAltitude, EPS );
+ anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.2525, anAltitude, EPS );
aDoc->Close();
}
if ( anIsFileCreated )
{
- CPPUNIT_ASSERT( aBathymetry1->ImportFromFile( aFileName.toStdString().c_str() ) );
+ CPPUNIT_ASSERT( aBathymetry1->ImportFromFiles( QStringList(aFileName ) ) );
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints();
- CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() );
+ CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() );
}
Handle(HYDROData_Bathymetry) aBathymetry2 =
if ( anIsFileCreated )
{
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints();
- CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() );
+ CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() );
}
aDoc->Close();