]> git.mxchange.org Git - flightgear.git/blobdiff - src/Instrumentation/KLN89/kln89_page_apt.cxx
fix NAV receiver vs GPS bugs
[flightgear.git] / src / Instrumentation / KLN89 / kln89_page_apt.cxx
index a4ed0a6dc6717ec54451bfd7db566bd1e2ebff86..67a4c8ddcb03dfbed2ab8e2ca051ed038c3dcc33 100644 (file)
@@ -3,7 +3,7 @@
 //
 // Written by David Luff, started 2005.
 //
-// Copyright (C) 2005 - David C Luff - david.luff@nottingham.ac.uk
+// Copyright (C) 2005 - David C Luff - daveluff AT ntlworld.com
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
 #endif
 
 #include "kln89_page_apt.hxx"
-#include <ATCDCL/commlist.hxx>
+
+#include <cassert>
+
+#if ENABLE_ATCDCL
+#    include <ATCDCL/commlist.hxx>
+#else
+  #include <ATC/atcutils.hxx>
+#endif
 #include <Main/globals.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
@@ -353,9 +360,9 @@ void KLN89AptPage::Update(double dt) {
                                _kln89->DrawText("For This Airport", 2, 0, 0);
                        } else {
                                if(_iafDialog) {
-                                       _kln89->DrawText(_iaps[_curIap]->_abbrev, 2, 1, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_ident, 2, 1, 3);
                                        _kln89->DrawText(_iaps[_curIap]->_rwyStr, 2, 7, 3);
-                                       _kln89->DrawText(_iaps[_curIap]->_id, 2, 12, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_aptIdent, 2, 12, 3);
                                        _kln89->DrawText("IAF", 2, 2, 2);
                                        unsigned int line = 0;
                                        for(unsigned int i=_iafStart; i<_approachRoutes.size(); ++i) {
@@ -376,9 +383,9 @@ void KLN89AptPage::Update(double dt) {
                                                _kln89->DrawEnt();
                                        }
                                } else if(_addDialog) {
-                                       _kln89->DrawText(_iaps[_curIap]->_abbrev, 2, 1, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_ident, 2, 1, 3);
                                        _kln89->DrawText(_iaps[_curIap]->_rwyStr, 2, 7, 3);
-                                       _kln89->DrawText(_iaps[_curIap]->_id, 2, 12, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_aptIdent, 2, 12, 3);
                                        string s = GPSitoa(_fStart + 1);
                                        _kln89->DrawText(s, 2, 2-s.size(), 2);
                                        s = GPSitoa(_kln89->_approachFP->waypoints.size());
@@ -399,9 +406,9 @@ void KLN89AptPage::Update(double dt) {
                                                }
                                        }
                                } else if(_replaceDialog) {
-                                       _kln89->DrawText(_iaps[_curIap]->_abbrev, 2, 1, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_ident, 2, 1, 3);
                                        _kln89->DrawText(_iaps[_curIap]->_rwyStr, 2, 7, 3);
-                                       _kln89->DrawText(_iaps[_curIap]->_id, 2, 12, 3);
+                                       _kln89->DrawText(_iaps[_curIap]->_aptIdent, 2, 12, 3);
                                        _kln89->DrawText("Replace Existing", 2, 0, 2);
                                        _kln89->DrawText("Approach", 2, 4, 1);
                                        if(_uLinePos > 0 && !(_kln89->_blink)) {
@@ -411,24 +418,35 @@ void KLN89AptPage::Update(double dt) {
                                        }
                                } else {
                                        _kln89->DrawText("IAP", 2, 11, 3);
-                                       int check = 0;
                                        bool selApp = false;
                                        if(_kln89->_mode == KLN89_MODE_CRSR && _uLinePos > 4) {
                                                selApp = true;
                                                if(!_kln89->_blink) _kln89->DrawEnt();
                                        }
-                                       for(unsigned int i=0; i<_iaps.size(); ++i) {    // TODO - do this properly when > 3 IAPs
-                                               string s = GPSitoa(i+1);
-                                               _kln89->DrawText(s, 2, 2 - s.size(), 2-i);
-                                               if(!(selApp && _uLinePos == 5+i && _kln89->_blink)) {
-                                                       _kln89->DrawText(_iaps[i]->_abbrev, 2, 3, 2-i);
-                                                       _kln89->DrawText(_iaps[i]->_rwyStr, 2, 9, 2-i);
-                                               }
-                                               if(selApp && _uLinePos == 5+i && !_kln89->_blink) {
-                                                       _kln89->Underline(2, 3, 2-i, 9);
+                                       // _maxULine pos should be 4 + iaps.size() at this point.
+                                       // Draw a maximum of 3 IAPs.
+                                       // If there are more than 3 IAPs for this airport, then we need to offset the start
+                                       // of the list if _uLinePos is pointing at the 4th or later IAP.
+                                       unsigned int offset = 0;
+                                       unsigned int index;
+                                       if(_uLinePos > 7) {
+                                               offset = _uLinePos - 7;
+                                       }
+                                       for(unsigned int i=0; i<3; ++i) {
+                                               index = offset + i;
+                                               if(index < _iaps.size()) {
+                                                       string s = GPSitoa(index+1);
+                                                       _kln89->DrawText(s, 2, 2 - s.size(), 2-i);
+                                                       if(!(selApp && _uLinePos == index+5 && _kln89->_blink)) {
+                                                               _kln89->DrawText(_iaps[index]->_ident, 2, 3, 2-i);
+                                                               _kln89->DrawText(_iaps[index]->_rwyStr, 2, 9, 2-i);
+                                                       }
+                                                       if(selApp && _uLinePos == index+5 && !_kln89->_blink) {
+                                                               _kln89->Underline(2, 3, 2-i, 9);
+                                                       }
+                                               } else {
+                                                       break;
                                                }
-                                               check++;
-                                               if(check > 2) break;
                                        }
                                }
                        }
@@ -632,8 +650,12 @@ void KLN89AptPage::ClrPressed() {
 void KLN89AptPage::EntPressed() {
        if(_entInvert) {
                _entInvert = false;
-               _last_apt_id = _apt_id;
-               _apt_id = _save_apt_id;
+               if(_kln89->_dtoReview) {
+                       _kln89->DtoInitiate(_apt_id);
+               } else {
+                       _last_apt_id = _apt_id;
+                       _apt_id = _save_apt_id;
+               }
        } else if(_subPage == 7 && _kln89->_mode == KLN89_MODE_CRSR && _uLinePos > 0) {
                // We are selecting an approach
                if(_iafDialog) {
@@ -650,7 +672,6 @@ void KLN89AptPage::EntPressed() {
                                GPSWaypoint* wp = new GPSWaypoint;
                                *wp = *(_approachRoutes[_curIaf]->waypoints[0]);        // Need to make copies here since we're going to alter ID and type sometimes
                                string iafid = wp->id;
-                               //wp->id += 'i';
                                _kln89->_approachFP->waypoints.push_back(wp);
                                for(unsigned int i=0; i<_IAP.size(); ++i) {
                                        if(_IAP[i]->id != iafid) {      // Don't duplicate waypoints that are part of the initial fix list and the approach procedure list.
@@ -666,11 +687,6 @@ void KLN89AptPage::EntPressed() {
                                                _kln89->_approachFP->waypoints.push_back(wp);
                                        }
                                }
-                               // Only add 1 missed approach procedure waypoint for now.  I think this might be standard always anyway.
-                               wp = new GPSWaypoint;
-                               *wp = *_MAP[0];
-                               //wp->id += 'h';
-                               _kln89->_approachFP->waypoints.push_back(wp);
                                _iafDialog = false;
                                _addDialog = true;
                                _maxULinePos = _kln89->_approachFP->waypoints.size() + 1;
@@ -702,7 +718,7 @@ void KLN89AptPage::EntPressed() {
                         _kln89->_activeFP->waypoints.insert(_kln89->_activeFP->waypoints.end(), _kln89->_approachFP->waypoints.begin(), _kln89->_approachFP->waypoints.end());
                     }
                                        _kln89->_approachID = _apt_id;
-                                       _kln89->_approachAbbrev = _iaps[_curIap]->_abbrev;
+                                       _kln89->_approachAbbrev = _iaps[_curIap]->_ident;
                                        _kln89->_approachRwyStr = _iaps[_curIap]->_rwyStr;
                                        _kln89->_approachLoaded = true;
                                        //_kln89->_messageStack.push_back("*Press ALT To Set Baro");
@@ -719,11 +735,9 @@ void KLN89AptPage::EntPressed() {
                } else if(_uLinePos > 4) {
                        _approachRoutes.clear();
                        _IAP.clear();
-                       _MAP.clear();
                        _curIaf = 0;
                        _approachRoutes = ((FGNPIAP*)(_iaps[_uLinePos-5]))->_approachRoutes;
                        _IAP = ((FGNPIAP*)(_iaps[_uLinePos-5]))->_IAP;
-                       _MAP = ((FGNPIAP*)(_iaps[_uLinePos-5]))->_MAP;
                        _curIap = _uLinePos - 5;        // TODO - handle the start of list ! no. 1, and the end of list not sequential!
                        _uLinePos = 1;
                        if(_approachRoutes.size() > 1) {
@@ -749,12 +763,6 @@ void KLN89AptPage::EntPressed() {
                                                _kln89->_approachFP->waypoints.push_back(wp);
                                        }
                                }
-                               // Only add 1 missed approach procedure waypoint for now.  I think this might be standard always anyway.
-                               wp = new GPSWaypoint;
-                               *wp = *_MAP[0];
-                               //wp->id += 'h';
-                               _kln89->_approachFP->waypoints.push_back(wp);
-                               
                                _addDialog = true;
                                _maxULinePos = 1;
                        }
@@ -826,6 +834,15 @@ void KLN89AptPage::Knob2Left1() {
                        } else {
                                _curRwyPage--;
                        }
+               } else if(_subPage == 0) {
+                       _subPage = 7;
+                       // We have to set _uLinePos here even though the cursor isn't pressed, to
+                       // ensure that the list displays properly.
+                       if(_iaps.empty()) {
+                               _uLinePos = 1;
+                       } else {
+                               _uLinePos = 5;
+                       }
                } else {
                        KLN89Page::Knob2Left1();
                }
@@ -869,6 +886,15 @@ void KLN89AptPage::Knob2Right1() {
                        } else {
                                _curFreqPage++;
                        }
+               } else if(_subPage == 6) {
+                       _subPage = 7;
+                       // We have to set _uLinePos here even though the cursor isn't pressed, to
+                       // ensure that the list displays properly.
+                       if(_iaps.empty()) {
+                               _uLinePos = 1;
+                       } else {
+                               _uLinePos = 5;
+                       }
                } else {
                        KLN89Page::Knob2Right1();
                }