From 7a0c2c2e8a1ddff0a5d1c7971b3e7b1395c8d2e6 Mon Sep 17 00:00:00 2001 From: Dave Luff Date: Sun, 5 Dec 2010 17:36:32 +0000 Subject: [PATCH] KLN89: Move some KLN89 specific configuration from dclgps to kln89 --- src/Instrumentation/KLN89/kln89.cxx | 4 ++++ src/Instrumentation/KLN89/kln89.hxx | 4 ++++ src/Instrumentation/dclgps.cxx | 2 -- src/Instrumentation/dclgps.hxx | 4 ---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx index aa7b734e4..0778cea26 100644 --- a/src/Instrumentation/KLN89/kln89.cxx +++ b/src/Instrumentation/KLN89/kln89.cxx @@ -224,6 +224,10 @@ KLN89::KLN89(RenderArea2D* instrument) _mapScaleIndex = 7; // I think that the above is more accurate for no-flightplan default, but this is more sane for initial testing! _mapScaleAuto = true; + // Configuration. Eventually this may be user-achivable in order that settings can be persistent between sessions. + _suaAlertEnabled = false; + _altAlertEnabled = false; + // Mega-hack - hardwire airport town and state names for the FG base area since we don't have any data for these at the moment // TODO - do this better one day! _airportTowns["KSFO"] = "San Francisco"; diff --git a/src/Instrumentation/KLN89/kln89.hxx b/src/Instrumentation/KLN89/kln89.hxx index c3542f4cb..d66cc8cc6 100644 --- a/src/Instrumentation/KLN89/kln89.hxx +++ b/src/Instrumentation/KLN89/kln89.hxx @@ -292,6 +292,10 @@ private: // Sometimes the datapages can be used to review a waypoint whilst the user makes a decision, // and we need to remember why. bool _dtoReview; // Set true when we a reviewing a waypoint for DTO operation. + + // Configuration settings that the user can set via. the KLN89 SET pages. + bool _suaAlertEnabled; // Alert user to potential SUA entry + bool _altAlertEnabled; // Alert user to min safe alt violation }; #endif // _KLN89_HXX diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx index 00e447cee..f9b4610f5 100644 --- a/src/Instrumentation/dclgps.cxx +++ b/src/Instrumentation/dclgps.cxx @@ -211,8 +211,6 @@ DCLGPS::DCLGPS(RenderArea2D* instrument) { // Configuration Initialisation // Should this be in kln89.cxx ? _turnAnticipationEnabled = false; - _suaAlertEnabled = false; - _altAlertEnabled = false; _time = new SGTime; diff --git a/src/Instrumentation/dclgps.hxx b/src/Instrumentation/dclgps.hxx index 9164dbad2..226271d1d 100644 --- a/src/Instrumentation/dclgps.hxx +++ b/src/Instrumentation/dclgps.hxx @@ -473,10 +473,6 @@ protected: // Configuration that affects flightplan operation bool _turnAnticipationEnabled; - - // Configuration that affects general operation - bool _suaAlertEnabled; // Alert user to potential SUA entry - bool _altAlertEnabled; // Alert user to min safe alt violation // Magvar stuff. Might get some of this stuff (such as time) from FG in future. SGTime* _time; -- 2.39.5