Refactor Canvas and add some helpers.

[simgear.git] / simgear / math / interpolater.hxx

diff --git a/simgear/math/interpolater.hxx b/simgear/math/interpolater.hxx
index 501e4ac8d452f54d144c0fd5c7a6d29df5e20a3d..393e39ffb267ba58c3bfe0505d1a8f1fda2903db 100644 (file)
--- a/simgear/math/interpolater.hxx
+++ b/simgear/math/interpolater.hxx
@@ -6,7 +6,7 @@
 
 // Written by Curtis Olson, started April 1998.
 //
-// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+// Copyright (C) 1998  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -18,10 +18,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -30,16 +29,20 @@
 #define _INTERPOLATER_H
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-SG_USING_STD(string);
+#include <simgear/structure/SGReferenced.hxx>
 
-#define MAX_TABLE_SIZE 32
+#include <map>
+
+#include <string>
+using std::string;
+
+class SGPropertyNode;
 
 /**
  * A class that provids a simple linear 2d interpolation lookup table.
@@ -47,27 +50,50 @@ SG_USING_STD(string);
  * independant variable must be strictly ascending.  The dependent
  * variable can be anything.
  */
-class SGInterpTable {
-    int size;
-    double table[MAX_TABLE_SIZE][2];
-
+class SGInterpTable : public SGReferenced {
 public:
 
+    /**
+     * Constructor. Creates a new, empty table.
+     */
+    SGInterpTable();
+
+    /**
+     * Constructor. Loads the interpolation table from an interpolation
+     * property node.
+     * @param interpolation property node having entry children
+     */
+    SGInterpTable(const SGPropertyNode* interpolation);
+
     /**
      * Constructor. Loads the interpolation table from the specified file.
      * @param file name of interpolation file
      */
     SGInterpTable( const string& file );
 
+
+    /**
+     * Add an entry to the table, extending the table's length.
+     *
+     * @param ind The independent variable.
+     * @param dep The dependent variable.
+     */
+    void addEntry (double ind, double dep);
+    
+
     /**
      * Given an x value, linearly interpolate the y value from the table.
      * @param x independent variable
      * @return interpolated dependent variable
      */
-    double interpolate(double x);
+    double interpolate(double x) const;
 
     /** Destructor */
     ~SGInterpTable();
+
+private:
+    typedef std::map<double, double> Table;
+    Table _table;
 };