working on the termination of the last hardcoded dialogs in Autopilot/auto_gui.cxx:

[flightgear.git] / src / Autopilot / xmlauto.hxx

diff --git a/src/Autopilot/xmlauto.hxx b/src/Autopilot/xmlauto.hxx
index 8ff6db71d19db6035d5e72be553f99fa7f02f1fc..d87dc6a65fd7f0b464bada80d151e7570742b378 100644 (file)
--- a/src/Autopilot/xmlauto.hxx
+++ b/src/Autopilot/xmlauto.hxx
@@ -16,7 +16,7 @@
 //
 // 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -78,9 +78,9 @@ public:
 
     virtual ~FGXMLAutoComponent() {}
 
-    virtual void update (double dt) {}
+    virtual void update (double dt)=0;
     
-    inline string get_name() { return name; }
+    inline const string& get_name() { return name; }
 };
 
 
@@ -100,6 +100,8 @@ private:
     double r_n;                 // reference (set point) value
     double y_scale;             // scale process input from property system
     double r_scale;             // scale reference input from property system
+    double y_offset;
+    double r_offset;
 
     // Configuration values
     double Kp;                  // proportional gain
@@ -123,6 +125,8 @@ private:
     double edf_n_1;             // edf[n-1] (derivative error)
     double edf_n_2;             // edf[n-2] (derivative error)
     double u_n_1;               // u[n-1]   (output)
+    double desiredTs;            // desired sampling interval (sec)
+    double elapsedTime;          // elapsed time (sec)
     
     
     
@@ -230,7 +234,8 @@ private:
     double rateOfChange;  // The maximum allowable rate of change [1/s]
     deque <double> output;
     deque <double> input;
-    string filterType;
+    enum filterTypes { exponential, doubleExponential, movingAverage, noiseSpike };
+    filterTypes filterType;
 
     bool debug;