Moved point interpolation and least squares fitting to contruction program

[flightgear.git] / DEM / dem.hxx

diff --git a/DEM/dem.hxx b/DEM/dem.hxx
index 44e91a8b011cb14a2921e7b84afd909f6b6d4e9a..46849e3a4ef8712786c1ea9679fa71ea2fa1d439 100644 (file)
--- a/DEM/dem.hxx
+++ b/DEM/dem.hxx
@@ -1,10 +1,8 @@
-// -*- Mode: C++ -*-
-//
-// dem.h -- DEM management class
+// dem.hxx -- DEM management class
 //
 // Written by Curtis Olson, started March 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  Curtis L. Olson  - curt@flightgear.org
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -24,8 +22,8 @@
 // (Log is kept at end of this file)
 
 
-#ifndef _DEM_H
-#define _DEM_H
+#ifndef _DEM_HXX
+#define _DEM_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -33,11 +31,7 @@
 #endif                                   
 
 
-#include <stdio.h>
-
-#include <Bucket/bucketutils.h>
-
-//#include <zlib/zlib.h>
+#include <Bucket/newbucket.hxx>
 #include <Misc/fgstream.hxx>
 
 
@@ -45,7 +39,10 @@
 #define DEM_SIZE_1 1201
 
 
-class fgDEM {
+class FGDem {
+
+private:
+
     // file pointer for input
     // gzFile fd;
     fg_gzifstream *in;
@@ -59,7 +56,7 @@ class fgDEM {
     // Distance between column and row data points (in arc seconds)
     double col_step, row_step;
     
-    // pointers to the actual mesh data allocated here
+    // pointers to the actual grid data allocated here
     float (*dem_data)[DEM_SIZE_1];
     float (*output_data)[DEM_SIZE_1];
 
@@ -95,14 +92,17 @@ class fgDEM {
 public:
 
     // Constructor
-    fgDEM( void );
-    fgDEM( const string& file );
+    FGDem( void );
+    FGDem( const string& file );
+
+    // Destructor
+    ~FGDem( void );
 
     // open a DEM file (use "-" if input is coming from stdin)
     int open ( const string& file );
 
     // close a DEM file
-    int close ();
+    int close();
 
     // parse a DEM file
     int parse();
@@ -113,21 +113,19 @@ public:
     // read and parse DEM "B" record
     void read_b_record();
 
-    // Informational methods
-    double get_originx( void ) { return originx; }
-    double get_originy( void ) { return originy; }
-    int get_cols( void ) { return cols; }
-    int get_rows( void ) { return rows; }
-    double get_col_step( void ) { return col_step; }
-    double get_row_step( void ) { return row_step; }
-
-    // return the current altitude based on mesh data.  We should
+    // write out the area of data covered by the specified bucket.
+    // Data is written out column by column starting at the lower left
+    // hand corner.
+    int write_area( const string& root, FGBucket& b, bool compress );
+
+#if 0
+    // return the current altitude based on grid data.  We should
     // rewrite this to interpolate exact values, but for now this is
     // good enough
     double interpolate_altitude( double lon, double lat );
 
     // Use least squares to fit a simpler data set to dem data
-    void fit( double error, fgBUCKET *p );
+    void fit( double error, FGBucket& p );
 
     // Initialize output mesh structure
     void outputmesh_init( void );
@@ -139,17 +137,35 @@ public:
     void outputmesh_set_pt( int i, int j, double value );
 
     // Write out a node file that can be used by the "triangle" program
-    void outputmesh_output_nodes( const string& fg_root, fgBUCKET *p );
+    void outputmesh_output_nodes( const string& fg_root, FGBucket& p );
+#endif
 
-    // Destructor
-    ~fgDEM( void );
+    // Informational methods
+    inline double get_originx() const { return originx; }
+    inline double get_originy() const { return originy; }
+    inline int get_cols() const { return cols; }
+    inline int get_rows() const { return rows; }
+    inline double get_col_step() const { return col_step; }
+    inline double get_row_step() const { return row_step; }
 };
 
 
-#endif // _DEM_H
+#endif // _DEM_HXX
 
 
 // $Log$
+// Revision 1.13  1999/03/13 17:40:39  curt
+// Moved point interpolation and least squares fitting to contruction program
+// area.
+// Moved leastsqs.* to Lib/Math/
+//
+// Revision 1.12  1999/03/12 22:53:09  curt
+// Added a routine to dump out the portion of the dem data covered by a
+// specified bucket.  Other changes related to needs of scenery tools overhaul.
+//
+// Revision 1.11  1999/03/11 23:31:57  curt
+// Tweaks to use newbucket.hxx
+//
 // Revision 1.10  1999/03/10 01:09:13  curt
 // Tweaks to go along with scenery tools overhaul.
 // Added a new constructor that accepts the file name.