throw out "zoomed" tapes. These drew 60% of the scale with bullets rather

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

diff --git a/src/Instrumentation/dme.hxx b/src/Instrumentation/dme.hxx
index c70c43ab8ca76e06294b889f5fefa3ec18f7a766..1d3e2e1ccf47680f5cda6e0811c4123c9b807973 100644 (file)
--- a/src/Instrumentation/dme.hxx
+++ b/src/Instrumentation/dme.hxx
@@ -13,8 +13,7 @@
 
 #include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
-
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 
 /**
@@ -26,22 +25,23 @@
  * /position/latitude-deg
  * /position/altitude-ft
  * /systems/electrical/outputs/dme
- * /instrumentation/dme/serviceable
- * /instrumentation/dme/frequencies/source
- * /instrumentation/dme/frequencies/selected-mhz
+ * /instrumentation/"name"/serviceable
+ * /instrumentation/"name"/frequencies/source
+ * /instrumentation/"name"/frequencies/selected-mhz
  *
  * Output properties:
  *
- * /instrumentation/dme/in-range
- * /instrumentation/dme/indicated-distance-nm
- * /instrumentation/dme/indicated-ground-speed-kt
- * /instrumentation/dme/indicated-time-kt
+ * /instrumentation/"name"/in-range
+ * /instrumentation/"name"/indicated-distance-nm
+ * /instrumentation/"name"/indicated-ground-speed-kt
+ * /instrumentation/"name"/indicated-time-kt
  */
-class DME : public FGSubsystem
+class DME : public SGSubsystem
 {
 
 public:
 
+    DME ( SGPropertyNode *node );
     DME ();
     virtual ~DME ();
 
@@ -71,9 +71,13 @@ private:
     double _time_before_search_sec;
 
     bool _transmitter_valid;
-    Point3D _transmitter;
+    SGVec3d _transmitter;
     double _transmitter_elevation_ft;
     double _transmitter_range_nm;
+    double _transmitter_bias;
+
+    string name;
+    int num;
 
 };