{
double anX = theFirstX * (1-t) + theLastX * t;
double anY = theFirstY * (1-t) + theLastY * t;
- double aZ = aStepZ * aStepZ + sin( (float)rand() );
+ double aZ = aStepZ * aStepZ + sin( 10*t );
theStream << anX << " " << anY << " " << aZ << " \n";
aStepZ += 0.2;
{
QTextStream anOutStream( &aTmpFile );
- srand( 4587 );
generateOne( anOutStream, 0, 5, 0, -5 );
generateOne( anOutStream, 10, 5, 10, -5 );
generateOne( anOutStream, 20, 5, 20, -5 );
generateOne( anOutStream, 1040.079834, -441.303467, 1017.623413, -459.9102175 );
generateOne( anOutStream, 1055.478516, -456.060547, 1034.946899, -475.9505 );
generateOne( anOutStream, 1074.085327, -474.025665, 1058.044922, -493.274017 );
- srand( time( 0 ) );
}
aTmpFile.close();
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 );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.9755, anAltitude, EPS );
+ 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.0147, 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 );
- CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.9534, anAltitude, EPS );
+ 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( 1.5032, 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( 6.3088, 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( 11.090, 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();