Modified Files:

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

diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx
index 7700376f41081c44799afdab5aff0295ad340bd9..2aa0ef6a87806a24e850178231c9c07114b652d3 100755 (executable)
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx
@@ -27,7 +27,6 @@
  * /heading
  * /systems/electrical/outputs/TACAN
  * /instrumentation/"name"/serviceable
- * /instrumentation/"name"/frequencies/source
  * /instrumentation/"name"/frequencies/selected-mhz
  *
  * Output properties:
@@ -37,13 +36,12 @@
  * /instrumentation/"name"/indicated-ground-speed-kt
  * /instrumentation/"name"/indicated-time-kt
  */
-class TACAN : public SGSubsystem
+class TACAN : public SGSubsystem, public SGPropertyChangeListener
 {
 
 public:
 
     TACAN ( SGPropertyNode *node );
-    TACAN ();
     virtual ~TACAN ();
 
     virtual void init ();
@@ -53,7 +51,11 @@ private:
 
     void search (double frequency, double longitude_rad,
                  double latitude_rad, double altitude_m);
-    double searchChannel (const string& _channel);
+    double searchChannel (const string& channel);
+    void valueChanged (SGPropertyNode *);
+
+    string _name;
+    unsigned int _num;
 
     SGPropertyNode_ptr _longitude_node;
     SGPropertyNode_ptr _latitude_node;
@@ -62,7 +64,6 @@ private:
     SGPropertyNode_ptr _yaw_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
-    SGPropertyNode_ptr _source_node;
     SGPropertyNode_ptr _frequency_node;
     SGPropertyNode_ptr _display_node;
     SGPropertyNode_ptr _x_shift_node;
@@ -77,46 +78,43 @@ private:
     SGPropertyNode_ptr _ident_node;
     SGPropertyNode_ptr _name_node;
 
-    SGPropertyNode_ptr _carrier_name_node;
     SGPropertyNode_ptr _channel_node;
-
-    SGPropertyNode_ptr _tanker_callsign_node;
-    SGPropertyNode_ptr _mp_callsign_node;
-
+    SGPropertyNode_ptr _channel_in0_node;
+    SGPropertyNode_ptr _channel_in1_node;
+    SGPropertyNode_ptr _channel_in2_node;
+    SGPropertyNode_ptr _channel_in3_node;
+    SGPropertyNode_ptr _channel_in4_node;
+
+    SGPropertyNode_ptr _carrier_name_node;             // FIXME unused
+    SGPropertyNode_ptr _tanker_callsign_node;          // FIXME
+    SGPropertyNode_ptr _mp_callsign_node;              // FIXME
+
+    bool _new_frequency;
+    string _channel;
     double _last_distance_nm;
-    double _last_frequency_mhz;
+    double _frequency_mhz;
     double _time_before_search_sec;
 
-    bool _carrier_valid;
-    bool _tanker_valid;
-    bool _mp_tanker_valid;
+    bool _mobile_valid;
     bool _transmitter_valid;
 
-    Point3D _transmitter;
-    double _transmitter_lat, _transmitter_lon;
-    double _transmitter_elevation_ft;
+    SGVec3d _transmitter;
+    SGGeod _transmitter_pos;
     double _transmitter_range_nm;
     double _transmitter_bearing_deg;
     double _transmitter_bias;
     string _transmitter_name;
+    string _transmitter_ident;
 
-    double _carrier_lat, _carrier_lon;
-    double _carrier_elevation_ft;
-    double _carrier_range_nm;
-    double _carrier_bearing_deg;
-    double _carrier_bias;
-    string _carrier_name;
-
-    double _tanker_lat, _tanker_lon;
-    double _tanker_elevation_ft;
-    double _tanker_range_nm;
-    double _tanker_bearing_deg;
-    double _tanker_bias;
-    string _tanker_name;
-
-    string name;
-    int num;
+    double _mobile_lat, _mobile_lon;
+    double _mobile_elevation_ft;
+    double _mobile_range_nm;
+    double _mobile_bearing_deg;
+    double _mobile_bias;
+    string _mobile_name;
+    string _mobile_ident;
 
+    int _listener_active;
 };