From 56a8d4247d86ede882b40eb7a33ed2d30aecac24 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 14 May 2000 01:41:11 +0000 Subject: [PATCH] Fixed a typo rich messed up vor range calculations. --- src/Autopilot/newauto.cxx | 8 ++++---- src/Cockpit/hud.cxx | 2 +- src/Cockpit/radiostack.cxx | 2 +- src/Navaids/navlist.cxx | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx index e46eb4c40..b969427f8 100644 --- a/src/Autopilot/newauto.cxx +++ b/src/Autopilot/newauto.cxx @@ -311,9 +311,9 @@ int FGAutopilot::run() { + FGBFI::getMagVar(); } cur_radial = current_radiostack->get_nav1_heading(); - cout << "target rad (true) = " << tgt_radial - << " current rad (true) = " << cur_radial - << endl; + // cout << "target rad (true) = " << tgt_radial + // << " current rad (true) = " << cur_radial + // << endl; double diff = (tgt_radial - cur_radial); while ( diff < -180.0 ) { diff += 360.0; } @@ -326,7 +326,7 @@ int FGAutopilot::run() { TargetHeading = cur_radial - diff; while ( TargetHeading < 0.0 ) { TargetHeading += 360.0; } while ( TargetHeading > 360.0 ) { TargetHeading -= 360.0; } - cout << "target course (true) = " << TargetHeading << endl; + // cout << "target course (true) = " << TargetHeading << endl; } else if ( heading_mode == FG_HEADING_WAYPOINT ) { // update target heading to waypoint diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index 803a0905d..bf731e42c 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -1151,7 +1151,7 @@ void fgHUDReshape(void) { delete HUDtext; HUD_TextSize = current_options.get_xsize() / 60; -// HUD_TextSize = 10; + HUD_TextSize = 10; HUDtext = new fntRenderer(); HUDtext -> setFont ( guiFntHandle ) ; HUDtext -> setPointSize ( HUD_TextSize ) ; diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx index 92d2ef0ff..097b57aec 100644 --- a/src/Cockpit/radiostack.cxx +++ b/src/Cockpit/radiostack.cxx @@ -210,7 +210,7 @@ void FGRadioStack::search( double lon, double lat, double elev ) { nav1_radial = nav1_sel_radial; nav1_x = nav1_dme_x = nav.get_x(); nav1_y = nav1_dme_y = nav.get_y(); - nav1_z = nav1_dme_y = nav.get_z(); + nav1_z = nav1_dme_z = nav.get_z(); // cout << "Found a vor station in range" << endl; // cout << " id = " << nav.get_ident() << endl; } else { diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx index 06dd29051..432d23c67 100644 --- a/src/Navaids/navlist.cxx +++ b/src/Navaids/navlist.cxx @@ -128,9 +128,11 @@ bool FGNavList::query( double lon, double lat, double elev, double freq, d = aircraft.distance3Dsquared( station ); - // cout << " dist = " << s << endl; + // cout << " dist = " << sqrt(d) + // << " range = " << current->get_range() * NM_TO_METER << endl; if ( d < (current->get_range() * NM_TO_METER * current->get_range() * NM_TO_METER) ) { + // cout << "matched = " << current->get_ident() << endl; *n = *current; return true; } -- 2.39.5