James Turner: Improved runway management code:

[flightgear.git] / src / Instrumentation / KLN89 / kln89_page_apt.cxx

diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx
index 7bf0b93f611a59b0087ffff414979d5669ab55cd..0be5c4acd185075a1fd1a2d91e00c990096a0eae 100644 (file)
--- a/src/Instrumentation/KLN89/kln89_page_apt.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx
@@ -26,7 +26,7 @@
 #endif
 
 #include "kln89_page_apt.hxx"
-#include <ATC/commlist.hxx>
+#include <ATCDCL/commlist.hxx>
 #include <Main/globals.hxx>
 
 // This function is copied from Airports/runways.cxx
@@ -468,10 +468,17 @@ void KLN89AptPage::Update(double dt) {
 }
 
 void KLN89AptPage::SetId(const string& s) {
+       if(s != _apt_id || s != _last_apt_id) {
+               UpdateAirport(s);       // If we don't do this here we break things if s is the same as the current ID since the update wouldn't get called then.
+               /*
+                       DCL: Hmmm - I wrote the comment above, but I don't quite understand it!
+                       I'm not quite sure why I don't simply set _apt_id here (and NOT _last_apt_id)
+                       and let the logic in Update(...) handle the airport details cache update.
+               */
+       }
        _last_apt_id = _apt_id;
        _save_apt_id = _apt_id;
        _apt_id = s;
-       UpdateAirport(s);       // If we don't do this here we break things if s is the same as the current ID since the update wouldn't get called then.
 }
 
 // Update the cached airport details
@@ -507,23 +514,19 @@ void KLN89AptPage::UpdateAirport(const string& id) {
        
        // Runways
        _aptRwys.clear();
-       FGRunway r;
-       bool haveRwy = globals->get_runways()->search(id, &r);
-       while(haveRwy && r._id == id) {
-               // Insert the runway with longest at the start of the array
-               for(unsigned int i = 0; i <= _aptRwys.size(); ++i) {
-                       if(i == _aptRwys.size()) {
-                               _aptRwys.push_back(r);
-                               break;
-                       } else {
-                               if(r._length > _aptRwys[i]._length) {
-                                       _aptRwys.insert(_aptRwys.begin() + i, r);
-                                       break;
-                               }
-                       }
-               }
-               haveRwy = globals->get_runways()->next(&r);
-       }
+  const FGAirport* apt = fgFindAirportID(id);
+  assert(apt);
+  
+  // build local array, longest runway first
+  for (unsigned int r=0; r<apt->numRunways(); ++r) {
+    FGRunway rwy(apt->getRunwayByIndex(r));
+    if ((r > 0) && (rwy._length > _aptRwys.front()._length)) {
+      _aptRwys.insert(_aptRwys.begin(), rwy);
+    } else {
+      _aptRwys.push_back(rwy);
+    }
+  }
+  
        _nRwyPages = (_aptRwys.size() + 1) / 2; // 2 runways per page.
        if(_nFreqPages < 1) _nFreqPages = 1;
        if(_nRwyPages < 1) _nRwyPages = 1;
@@ -535,7 +538,16 @@ void KLN89AptPage::UpdateAirport(const string& id) {
        if(itr != _kln89->_np_iap.end()) {
                _iaps = itr->second;
        }
-       if(_subPage == 7) _maxULinePos = 4 + _iaps.size();      // We shouldn't need to check the crsr for out-of-bounds here since we only update the airport details when the airport code is changed - ie. _uLinePos <= 4!
+       if(_subPage == 7) { 
+               if(_iafDialog || _addDialog || _replaceDialog) {
+                       // Eek - major logic error if an airport details cache update occurs
+                       // with one of these dialogs active.
+                       // TODO - output a warning.
+                       //cout << "HELP!!!!!!!!!!\n";
+               } else {
+                       _maxULinePos = 4 + _iaps.size();        // We shouldn't need to check the crsr for out-of-bounds here since we only update the airport details when the airport code is changed - ie. _uLinePos <= 4!
+               }
+       }
 }
 
 void KLN89AptPage::CrsrPressed() {
@@ -617,16 +629,13 @@ void KLN89AptPage::ClrPressed() {
 }
 
 void KLN89AptPage::EntPressed() {
-       //cout << "A\n"
        if(_entInvert) {
                _entInvert = false;
                _last_apt_id = _apt_id;
                _apt_id = _save_apt_id;
        } else if(_subPage == 7 && _kln89->_mode == KLN89_MODE_CRSR && _uLinePos > 0) {
-               //cout << "B\n";
                // We are selecting an approach
                if(_iafDialog) {
-                       //cout << "C\n";
                        if(_uLinePos > 0) {
                                // Record the IAF that was picked
                                if(_uLinePos == 3) {