From 06985ebabddd8885e7353eb7abaedaf40ad518d7 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 17 Mar 2003 04:50:40 +0000 Subject: [PATCH] Changes corresponding to API changes in libArray.a --- src/Airports/GenAirports/apt_surface.cxx | 2 +- src/Airports/GenAirports/build.cxx | 1 - src/BuildTiles/Main/main.cxx | 12 +++++++----- src/Prep/DemChop/testassem.cxx | 2 +- src/Prep/Makefile.am | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Airports/GenAirports/apt_surface.cxx b/src/Airports/GenAirports/apt_surface.cxx index 429fac52..6ed56840 100644 --- a/src/Airports/GenAirports/apt_surface.cxx +++ b/src/Airports/GenAirports/apt_surface.cxx @@ -85,7 +85,7 @@ static void calc_elevations( const string &root, Matrix_Point3Df &Pts ) { bool found_file = false; while ( !found_file && j < (int)elev_src.size() ) { string array_path = root + "/" + elev_src[j] + "/" + base - + "/" + b.gen_index_str() + ".arr"; + + "/" + b.gen_index_str(); if ( array.open(array_path) ) { found_file = true; cout << "Using array_path = " << array_path << endl; diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index c9026713..770e780c 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -47,7 +47,6 @@ #include #include -#include #include #include #include diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index 73173a4a..eec33d34 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -164,7 +164,8 @@ static int actual_load_polys( const string& dir, ext = file.substr(pos + 1); cout << file << " " << f_index << " '" << ext << "'" << endl; full_path = dir + "/" + file; - if ( (ext == "arr") || (ext == "arr.gz") ) { + if ( (ext == "arr") || (ext == "arr.gz") || + (ext == "fit") || (ext == "fit.gz")) { // skip } else if (ext == "osgb36") { cout << "Loading osgb36 poly definition file\n"; @@ -198,7 +199,8 @@ static int actual_load_polys( const string& dir, ext = file.substr(pos + 1); cout << file << " " << f_index << " '" << ext << "'" << endl; full_path = dir + "/" + file; - if ( (ext == "arr") || (ext == "arr.gz") || (ext == "ind") ) { + if ( (ext == "arr") || (ext == "arr.gz") || + (ext == "fit") || (ext == "fit.gz") || (ext == "ind") ) { // skip } else if (ext == "osgb36") { cout << "Loading osgb36 poly definition file\n"; @@ -419,7 +421,7 @@ static bool load_array( TGConstruct& c, TGArray& array) { for ( i = 0; i < (int)load_dirs.size(); ++i ) { string array_path = load_dirs[i] + "/" + base - + "/" + c.get_bucket().gen_index_str() + ".arr"; + + "/" + c.get_bucket().gen_index_str(); cout << "array_path = " << array_path << endl; if ( array.open(array_path) ) { @@ -443,8 +445,8 @@ static void first_triangulate( TGConstruct& c, const TGArray& array, // first we need to consolidate the points of the Array fit list and // all the polygons into a more "Triangle" friendly format - point_list corner_list = array.get_corner_node_list(); - point_list fit_list = array.get_fit_node_list(); + point_list corner_list = array.get_corner_list(); + point_list fit_list = array.get_fitted_list(); TGPolyList gpc_polys = c.get_clipped_polys(); cout << "ready to build node list and polygons" << endl; diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx index 45f91c58..b0132068 100644 --- a/src/Prep/DemChop/testassem.cxx +++ b/src/Prep/DemChop/testassem.cxx @@ -100,7 +100,7 @@ int main(int argc, char **argv) { cout << " start = " << startx << "," << starty << endl; for ( int jj = 0; jj < array.get_rows(); jj++ ) { for ( int ii = 0; ii < array.get_cols(); ii++ ) { - data[startx+ii][starty+jj] = array.get_point(ii, jj); + data[startx+ii][starty+jj] = array.get_array_elev(ii, jj); } } } diff --git a/src/Prep/Makefile.am b/src/Prep/Makefile.am index c6fa7377..6f69f8a6 100644 --- a/src/Prep/Makefile.am +++ b/src/Prep/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + ArrayFit \ DemChop \ DemInfo \ DemRaw2ascii \