TACAN: fix distance calculations and some other problems.

[flightgear.git] / src / Systems / pitot.hxx

diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx
index e606fe4e622cd51ff600e4f4ed0ef8929e8fce12..f694439d906eb70425df762d4e941d1ce6ac90d1 100644 (file)
--- a/src/Systems/pitot.hxx
+++ b/src/Systems/pitot.hxx
@@ -1,6 +1,7 @@
 // pitot.hxx - the pitot air system.
 // Written by David Megginson, started 2002.
 //
+// Last modified by Eric van den Berg, 01 Nov 2013
 // This file is in the Public Domain and comes with no warranty.
 
 
@@ -13,8 +14,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-SG_USING_STD(string);
+#include <string>
+using std::string;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
@@ -29,13 +30,13 @@ SG_USING_STD(string);
  * Input properties:
  *
  * /systems/"name"/serviceable
- * /environment/pressure-slugft3
- * /environment/density-slugft3
- * /velocities/airspeed-kt
+ * /environment/pressure-inhg
+ * /velocities/mach
  *
  * Output properties:
  *
  * /systems/"name"/total-pressure-inhg
+ * /systems/"name"/measured-total-pressure-inhg
  */
 class PitotSystem : public SGSubsystem
 {
@@ -43,7 +44,6 @@ class PitotSystem : public SGSubsystem
 public:
 
     PitotSystem ( SGPropertyNode *node );
-    PitotSystem ( int i );
     virtual ~PitotSystem ();
 
     virtual void init ();
@@ -53,14 +53,16 @@ public:
 
 private:
 
-    int num;
-    string name;
+    std::string _name;
+    int _num;
+    double _stall_factor;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _pressure_node;
-    SGPropertyNode_ptr _density_node;
-    SGPropertyNode_ptr _velocity_node;
+    SGPropertyNode_ptr _mach_node;
     SGPropertyNode_ptr _total_pressure_node;
-    
+    SGPropertyNode_ptr _measured_total_pressure_node;
+    SGPropertyNode_ptr _alpha_deg_node;
+    SGPropertyNode_ptr _beta_deg_node;
 };
 
 #endif // __SYSTEMS_PITOT_HXX