Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Instrumentation / altimeter.hxx

diff --git a/src/Instrumentation/altimeter.hxx b/src/Instrumentation/altimeter.hxx
index e5baae64c81f360312f6417b2bef37746bb58139..f57c1ad37400d2503835dfdc4c6dde4ce2ef0d02 100644 (file)
--- a/src/Instrumentation/altimeter.hxx
+++ b/src/Instrumentation/altimeter.hxx
@@ -9,6 +9,7 @@
 #define __INSTRUMENTS_ALTIMETER_HXX 1
 
 #include <simgear/props/props.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <Environment/atmosphere.hxx>
 
@@ -36,25 +37,32 @@ public:
 
     virtual void init ();
     virtual void update (double dt);
+    virtual void bind();
+    virtual void unbind();
 
-private:
+    double getSettingInHg() const;
+    void setSettingInHg( double value );
+    double getSettingHPa() const;
+    void setSettingHPa( double value );
 
-    string _name;
-    int _num;
+private:
+    SGPropertyNode_ptr _rootNode;
     string _static_pressure;
     double _tau;
     double _quantum;
     double _kollsman;
     double raw_PA;
+    double _settingInHg;
 
     SGPropertyNode_ptr _serviceable_node;
-    SGPropertyNode_ptr _setting_node;
     SGPropertyNode_ptr _pressure_node;
     SGPropertyNode_ptr _press_alt_node;
     SGPropertyNode_ptr _mode_c_node;
     SGPropertyNode_ptr _altitude_node;
 
     FGAltimeter _altimeter;
+
+    simgear::TiedPropertyList _tiedProperties;
 };
 
 #endif // __INSTRUMENTS_ALTIMETER_HXX