KLN89: Move some KLN89 specific configuration from dclgps to kln89

diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index aa7b734e4356429be2e6b837613b365fa478bf31..0778cea26e0b00ff15c94c3d02a0dc4c3b37e6a5 100644 (file)
--- 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 c3542f4cbe3b08a0a2f2b714c9143b19a69a30e5..d66cc8cc666e12ffd0df56daba165fdefb19ddb5 100644 (file)
--- 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 00e447cee3d507592155ca138d3f129a2a4e3a7d..f9b4610f5e87dc43348c82684237246efae178fc 100644 (file)
--- 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 9164dbad2665360be6c1172fb4cf30bacf4c7938..226271d1d0ea1633e2d13e9ebaedd82cb7d975f3 100644 (file)
--- 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;