1
0
Fork 0

Changes to track libArray api tweaks.

This commit is contained in:
curt 2003-03-19 22:52:04 +00:00
parent bab9af52b3
commit 0cbbe80488
3 changed files with 6 additions and 6 deletions

View file

@ -106,8 +106,8 @@ static void calc_elevations( const string &root, Matrix_Point3Df &Pts ) {
Point3Df p = Pts(i,j); Point3Df p = Pts(i,j);
if ( p.z() < -9000.0 ) { if ( p.z() < -9000.0 ) {
done = false; done = false;
elev = array.interpolate_altitude( p.x() * 3600.0, elev = array.altitude_from_grid( p.x() * 3600.0,
p.y() * 3600.0 ); p.y() * 3600.0 );
if ( elev > -9000 ) { if ( elev > -9000 ) {
p.z() = elev; p.z() = elev;
Pts(i,j) = p; Pts(i,j) = p;

View file

@ -505,8 +505,8 @@ static void fix_point_heights( TGConstruct& c, const TGArray& array )
cout << " forced = " << z << endl; cout << " forced = " << z << endl;
} else { } else {
// interpolate point from DEM data. // interpolate point from DEM data.
z = array.interpolate_altitude( raw_nodes[i].x() * 3600.0, z = array.altitude_from_grid( raw_nodes[i].x() * 3600.0,
raw_nodes[i].y() * 3600.0 ); raw_nodes[i].y() * 3600.0 );
cout << " interpolated = " << z << endl; cout << " interpolated = " << z << endl;
} }
raw_nodes[i].setz( z ); raw_nodes[i].setz( z );

View file

@ -99,8 +99,8 @@ point_list calc_elevations( const string& root, const point_list& geod_nodes ) {
if ( result[j].z() < -9000 ) { if ( result[j].z() < -9000 ) {
done = false; done = false;
cout << "interpolating for " << result[j] << endl; cout << "interpolating for " << result[j] << endl;
elev = array.interpolate_altitude( result[j].x() * 3600.0, elev = array.altitude_from_grid( result[j].x() * 3600.0,
result[j].y() * 3600.0 ); result[j].y() * 3600.0 );
if ( elev > -9000 ) { if ( elev > -9000 ) {
result[j].setz( elev ); result[j].setz( elev );
} }