- fixed typos relating to nav frequency properties

[flightgear.git] / src / Cockpit / radiostack.cxx

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index bc41bbb9c4833ff8c0d8d7f85fbaed29beee8d2c..c9116f17a5c64437926a7e82c5ae72e17c3100fb 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -78,15 +78,27 @@ static void fgRadioSearch( void ) {
 }
 
 // Constructor
-FGRadioStack::FGRadioStack() {
-    nav1_radial = 0.0;
-    nav1_dme_dist = 0.0;
-    nav2_radial = 0.0;
-    nav2_dme_dist = 0.0;
-    need_update = true;
-    lon_node = fgGetNode("/position/longitude-deg");
-    lat_node = fgGetNode("/position/latitude-deg");
-    alt_node = fgGetNode("/position/altitude-ft");
+FGRadioStack::FGRadioStack() :
+    lon_node(fgGetNode("/position/longitude-deg", true)),
+    lat_node(fgGetNode("/position/latitude-deg", true)),
+    alt_node(fgGetNode("/position/altitude-ft", true)),
+    need_update(true),
+    nav1_radial(0.0),
+    nav1_dme_dist(0.0),
+    nav2_radial(0.0),
+    nav2_dme_dist(0.0)
+{
+    SGPath path( globals->get_fg_root() );
+    SGPath term = path;
+    term.append( "Navaids/range.term" );
+    SGPath low = path;
+    low.append( "Navaids/range.low" );
+    SGPath high = path;
+    high.append( "Navaids/range.high" );
+
+    term_tbl = new SGInterpTable( term.str() );
+    low_tbl = new SGInterpTable( low.str() );
+    high_tbl = new SGInterpTable( high.str() );
 }
 
 
@@ -94,6 +106,10 @@ FGRadioStack::FGRadioStack() {
 FGRadioStack::~FGRadioStack() 
 {
     unbind();                  // FIXME: should be called externally
+
+    delete term_tbl;
+    delete low_tbl;
+    delete high_tbl;
 }
 
 
@@ -107,18 +123,6 @@ FGRadioStack::init ()
     search();
     update();
 
-    SGPath path( globals->get_fg_root() );
-    SGPath term = path;
-    term.append( "Navaids/range.term" );
-    SGPath low = path;
-    low.append( "Navaids/range.low" );
-    SGPath high = path;
-    high.append( "Navaids/range.high" );
-
-    term_tbl = new SGInterpTable( term.str() );
-    low_tbl = new SGInterpTable( low.str() );
-    high_tbl = new SGInterpTable( high.str() );
-
     // Search radio database once per second
     global_events.Register( "fgRadioSearch()", fgRadioSearch,
                            fgEVENT::FG_EVENT_READY, 1000);
@@ -130,24 +134,31 @@ FGRadioStack::bind ()
                                // User inputs
     fgTie("/radios/nav[0]/frequencies/selected-mhz", this,
          &FGRadioStack::get_nav1_freq, &FGRadioStack::set_nav1_freq);
-    fgTie("/radios/nav[0]/standby-mhz", this,
+    fgSetArchivable("/radios/nav[0]/frequencies/selected-mhz");
+    fgTie("/radios/nav[0]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav1_alt_freq, &FGRadioStack::set_nav1_alt_freq);
+    fgSetArchivable("/radios/nav[0]/frequencies/standby-mhz");
     fgTie("/radios/nav[0]/radials/selected-deg", this,
          &FGRadioStack::get_nav1_sel_radial,
          &FGRadioStack::set_nav1_sel_radial);
+    fgSetArchivable("/radios/nav[0]/radials/selected-deg");
     fgTie("/radios/nav[0]/volume", this,
          &FGRadioStack::get_nav1_vol_btn,
          &FGRadioStack::set_nav1_vol_btn);
+    fgSetArchivable("/radios/nav[0]/volume");
     fgTie("/radios/nav[0]/ident", this,
          &FGRadioStack::get_nav1_ident_btn,
          &FGRadioStack::set_nav1_ident_btn);
+    fgSetArchivable("/radios/nav[0]/ident");
 
                                // Radio outputs
-    fgTie("/radios/nav[0]/radials/actual-deg", this, &FGRadioStack::get_nav1_radial);
+    fgTie("/radios/nav[0]/radials/actual-deg", this,
+         &FGRadioStack::get_nav1_radial);
     fgTie("/radios/nav[0]/to-flag", this, &FGRadioStack::get_nav1_to_flag);
     fgTie("/radios/nav[0]/from-flag", this, &FGRadioStack::get_nav1_from_flag);
     fgTie("/radios/nav[0]/in-range", this, &FGRadioStack::get_nav1_inrange);
-    fgTie("/radios/nav[0]/dme/distance-nm", this, &FGRadioStack::get_nav1_dme_dist);
+    fgTie("/radios/nav[0]/dme/distance-nm", this,
+         &FGRadioStack::get_nav1_dme_dist);
     fgTie("/radios/nav[0]/dme/in-range", this,
          &FGRadioStack::get_nav1_dme_inrange);
     fgTie("/radios/nav[0]/heading-needle-deflection", this,
@@ -158,24 +169,31 @@ FGRadioStack::bind ()
                                // User inputs
     fgTie("/radios/nav[1]/frequencies/selected-mhz", this,
          &FGRadioStack::get_nav2_freq, &FGRadioStack::set_nav2_freq);
-    fgTie("/radios/nav[1]/standby-mhz", this,
+    fgSetArchivable("/radios/nav[1]/frequencies/selected-mhz");
+    fgTie("/radios/nav[1]/frequencies/standby-mhz", this,
          &FGRadioStack::get_nav2_alt_freq, &FGRadioStack::set_nav2_alt_freq);
+    fgSetArchivable("/radios/nav[1]/frequencies/standby-mhz");
     fgTie("/radios/nav[1]/radials/selected-deg", this,
          &FGRadioStack::get_nav2_sel_radial,
          &FGRadioStack::set_nav2_sel_radial);
+    fgSetArchivable("/radios/nav[1]/radials/selected-deg");
     fgTie("/radios/nav[1]/volume", this,
          &FGRadioStack::get_nav2_vol_btn,
          &FGRadioStack::set_nav2_vol_btn);
+    fgSetArchivable("/radios/nav[1]/volume");
     fgTie("/radios/nav[1]/ident", this,
          &FGRadioStack::get_nav2_ident_btn,
          &FGRadioStack::set_nav2_ident_btn);
+    fgSetArchivable("/radios/nav[1]/ident");
 
                                // Radio outputs
-    fgTie("/radios/nav[1]/radials/actual-deg", this, &FGRadioStack::get_nav2_radial);
+    fgTie("/radios/nav[1]/radials/actual-deg", this,
+         &FGRadioStack::get_nav2_radial);
     fgTie("/radios/nav[1]/to-flag", this, &FGRadioStack::get_nav2_to_flag);
     fgTie("/radios/nav[1]/from-flag", this, &FGRadioStack::get_nav2_from_flag);
     fgTie("/radios/nav[1]/in-range", this, &FGRadioStack::get_nav2_inrange);
-    fgTie("/radios/nav[1]/dme/distance-nm", this, &FGRadioStack::get_nav2_dme_dist);
+    fgTie("/radios/nav[1]/dme/distance-nm", this,
+         &FGRadioStack::get_nav2_dme_dist);
     fgTie("/radios/nav[1]/dme/in-range", this,
          &FGRadioStack::get_nav2_dme_inrange);
     fgTie("/radios/nav[1]/heading-needle-deflection", this,
@@ -186,16 +204,21 @@ FGRadioStack::bind ()
                                // User inputs
     fgTie("/radios/adf/frequencies/selected-khz", this,
          &FGRadioStack::get_adf_freq, &FGRadioStack::set_adf_freq);
+    fgSetArchivable("/radios/adf/frequencies/selected-khz");
     fgTie("/radios/adf/frequencies/standby-khz", this,
          &FGRadioStack::get_adf_alt_freq, &FGRadioStack::set_adf_alt_freq);
+    fgSetArchivable("/radios/adf/frequencies/standby-khz");
     fgTie("/radios/adf/rotation-deg", this,
          &FGRadioStack::get_adf_rotation, &FGRadioStack::set_adf_rotation);
+    fgSetArchivable("/radios/adf/rotation-deg");
     fgTie("/radios/adf/volume", this,
          &FGRadioStack::get_adf_vol_btn,
          &FGRadioStack::set_adf_vol_btn);
+    fgSetArchivable("/radios/adf/volume");
     fgTie("/radios/adf/ident", this,
          &FGRadioStack::get_adf_ident_btn,
          &FGRadioStack::set_adf_ident_btn);
+    fgSetArchivable("/radios/adf/ident");
 
     fgTie("/radios/marker-beacon/inner", this,
          &FGRadioStack::get_inner_blink);
@@ -209,7 +232,7 @@ void
 FGRadioStack::unbind ()
 {
     fgUntie("/radios/nav[0]/frequencies/selected-mhz");
-    fgUntie("/radios/nav[0]/standby-mhz");
+    fgUntie("/radios/nav[0]/frequencies/standby-mhz");
     fgUntie("/radios/nav[0]/radials/actual-deg");
     fgUntie("/radios/nav[0]/radials/selected-deg");
     fgUntie("/radios/nav[0]/on");
@@ -223,8 +246,8 @@ FGRadioStack::unbind ()
     fgUntie("/radios/nav[0]/gs-needle-deflection");
 
     fgUntie("/radios/nav[1]/frequencies/selected-mhz");
-    fgUntie("/radios/nav[1]/standby-mhz");
-    fgUntie("/radios/nav[1]//radials/actual-deg");
+    fgUntie("/radios/nav[1]/frequencies/standby-mhz");
+    fgUntie("/radios/nav[1]/radials/actual-deg");
     fgUntie("/radios/nav[1]/radials/selected-deg");
     fgUntie("/radios/nav[1]/on");
     fgUntie("/radios/nav[1]/ident");