fly/flightgear
1
0
Fork 0
Code Activity

Remove the GPSPage base class, that only KLN89Page was derived from.

Browse source
This commit is contained in:
daveluff 2009-09-24 20:49:04 +00:00 • committed by Tim Moore
parent 13ff5da4be
commit 57d5e18074
9 changed files with 206 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/Instrumentation/KLN89/kln89.cxx
View file

@ -46,10 +46,90 @@
#include <ATCDCL/ATCProjection.hxx>
#include <Main/fg_props.hxx>
#include <simgear/math/SGMath.hxx>
#include <simgear/structure/commands.hxx>
#include <Airports/simple.hxx>
using std::cout;
// Command callbacks for FlightGear
static bool do_kln89_msg_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_msg_pressed called!\n";
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->MsgPressed();
return(true);
}
static bool do_kln89_obs_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_obs_pressed called!\n";
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->OBSPressed();
return(true);
}
static bool do_kln89_alt_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_alt_pressed called!\n";
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->AltPressed();
return(true);
}
static bool do_kln89_nrst_pressed(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->NrstPressed();
return(true);
}
static bool do_kln89_dto_pressed(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->DtoPressed();
return(true);
}
static bool do_kln89_clr_pressed(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->ClrPressed();
return(true);
}
static bool do_kln89_ent_pressed(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->EntPressed();
return(true);
}
static bool do_kln89_crsr_pressed(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->CrsrPressed();
return(true);
}
static bool do_kln89_knob1left1(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->Knob1Left1();
return(true);
}
static bool do_kln89_knob1right1(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->Knob1Right1();
return(true);
}
static bool do_kln89_knob2left1(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->Knob2Left1();
return(true);
}
static bool do_kln89_knob2right1(const SGPropertyNode* arg) {
KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
gps->Knob2Right1();
return(true);
}
// End command callbacks
KLN89::KLN89(RenderArea2D* instrument)
: DCLGPS(instrument) {
_mode = KLN89_MODE_DISP;
@ -77,27 +157,28 @@ KLN89::KLN89(RenderArea2D* instrument)
_pixelated = false;
// Cyclic pages
GPSPage* apt_page = new KLN89AptPage(this);
_pages.clear();
KLN89Page* apt_page = new KLN89AptPage(this);
_pages.push_back(apt_page);
GPSPage* vor_page = new KLN89VorPage(this);
KLN89Page* vor_page = new KLN89VorPage(this);
_pages.push_back(vor_page);
GPSPage* ndb_page = new KLN89NDBPage(this);
KLN89Page* ndb_page = new KLN89NDBPage(this);
_pages.push_back(ndb_page);
GPSPage* int_page = new KLN89IntPage(this);
KLN89Page* int_page = new KLN89IntPage(this);
_pages.push_back(int_page);
GPSPage* usr_page = new KLN89UsrPage(this);
KLN89Page* usr_page = new KLN89UsrPage(this);
_pages.push_back(usr_page);
GPSPage* act_page = new KLN89ActPage(this);
KLN89Page* act_page = new KLN89ActPage(this);
_pages.push_back(act_page);
GPSPage* nav_page = new KLN89NavPage(this);
KLN89Page* nav_page = new KLN89NavPage(this);
_pages.push_back(nav_page);
GPSPage* fpl_page = new KLN89FplPage(this);
KLN89Page* fpl_page = new KLN89FplPage(this);
_pages.push_back(fpl_page);
GPSPage* cal_page = new KLN89CalPage(this);
KLN89Page* cal_page = new KLN89CalPage(this);
_pages.push_back(cal_page);
GPSPage* set_page = new KLN89SetPage(this);
KLN89Page* set_page = new KLN89SetPage(this);
_pages.push_back(set_page);
GPSPage* oth_page = new KLN89OthPage(this);
KLN89Page* oth_page = new KLN89OthPage(this);
_pages.push_back(oth_page);
_nPages = _pages.size();
_curPage = 0;
@ -196,6 +277,23 @@ void KLN89::unbind() {
DCLGPS::unbind();
}
void KLN89::init() {
globals->get_commands()->addCommand("kln89_msg_pressed", do_kln89_msg_pressed);
globals->get_commands()->addCommand("kln89_obs_pressed", do_kln89_obs_pressed);
globals->get_commands()->addCommand("kln89_alt_pressed", do_kln89_alt_pressed);
globals->get_commands()->addCommand("kln89_nrst_pressed", do_kln89_nrst_pressed);
globals->get_commands()->addCommand("kln89_dto_pressed", do_kln89_dto_pressed);
globals->get_commands()->addCommand("kln89_clr_pressed", do_kln89_clr_pressed);
globals->get_commands()->addCommand("kln89_ent_pressed", do_kln89_ent_pressed);
globals->get_commands()->addCommand("kln89_crsr_pressed", do_kln89_crsr_pressed);
globals->get_commands()->addCommand("kln89_knob1left1", do_kln89_knob1left1);
globals->get_commands()->addCommand("kln89_knob1right1", do_kln89_knob1right1);
globals->get_commands()->addCommand("kln89_knob2left1", do_kln89_knob2left1);
globals->get_commands()->addCommand("kln89_knob2right1", do_kln89_knob2right1);
DCLGPS::init();
}
void KLN89::update(double dt) {
// Run any positional calc's required first
DCLGPS::update(dt);
@ -476,7 +574,7 @@ void KLN89::NrstPressed() {
void KLN89::AltPressed() {}
void KLN89::OBSPressed() {
DCLGPS::OBSPressed();
ToggleOBSMode();
if(_obsMode) {
// if(ORS 02)
_mode = KLN89_MODE_CRSR;
@ -494,6 +592,10 @@ void KLN89::MsgPressed() {
_dispMsg = !_dispMsg;
}
void KLN89::ToggleOBSMode() {
DCLGPS::ToggleOBSMode();
}
void KLN89::DrawBar(int page) {
int px = 1 + (page * 15);
int py = 1;

24
src/Instrumentation/KLN89/kln89.hxx
View file

@ -31,6 +31,8 @@
#include <Instrumentation/dclgps.hxx>
#include "kln89_page.hxx"
class KLN89Page;
const int KLN89MapScales[2][21] = {{1, 2, 3, 5, 7, 10, 12, 15, 17, 20, 25, 30, 40, 60, 80, 100, 120, 160, 240, 320, 500},
{2, 4, 6, 9, 13, 18, 22, 28, 32, 37, 46, 55, 75, 110, 150, 185, 220, 300, 440, 600, 925}};
@ -48,6 +50,9 @@ const char* KLN89TimeCodes[20] = { "UTC", "GST", "GDT", "ATS", "ATD", "EST", "ED
typedef map<string, string> airport_id_str_map_type;
typedef airport_id_str_map_type::iterator airport_id_str_map_iterator;
typedef vector<KLN89Page*> kln89_page_list_type;
typedef kln89_page_list_type::iterator kln89_page_list_itr;
class KLN89 : public DCLGPS {
friend class KLN89Page;
@ -71,6 +76,7 @@ public:
void bind();
void unbind();
void init();
void update(double dt);
inline void SetTurnAnticipation(bool b) { _turnAnticipationEnabled = b; }
@ -100,6 +106,8 @@ public:
void CreateDefaultFlightPlans();
private:
void ToggleOBSMode();
//----------------------- Drawing functions which take CHARACTER units -------------------------
// Render string s in display field field at position x, y
// WHERE POSITION IS IN CHARACTER UNITS!
@ -192,16 +200,26 @@ private:
// Set gap to true to get a space between A and 9 when wrapping, set wrap to false to disable wrap.
char IncChar(char c, bool gap = false, bool wrap = true);
char DecChar(char c, bool gap = false, bool wrap = true);
// ==================== Page organisation stuff =============
// The list of cyclical pages that the user can cycle through
kln89_page_list_type _pages;
// The currently active page
KLN89Page* _activePage;
// And a facility to save the immediately preceeding active page
KLN89Page* _lastActivePage;
// Hackish
int _entJump; // The page to jump back to if ent is pressed. -1 indicates no jump
bool _entRestoreCrsr; // Indicates that pressing ENT at this point should restore cursor mode
// Misc pages
// Misc pages that aren't in the cyclic list.
// Direct To
GPSPage* _dir_page;
KLN89Page* _dir_page;
// Nearest
GPSPage* _nrst_page;
KLN89Page* _nrst_page;
// ====================== end of page stuff ===================
// Moving-map display stuff
int _mapOrientation; // 0 => North (true) up, 1 => DTK up, 2 => TK up, 3 => heading up (only when connected to external heading source).

27
src/Instrumentation/KLN89/kln89_page.cxx
View file

@ -24,11 +24,11 @@
#include "kln89_page.hxx"
#include <Main/fg_props.hxx>
KLN89Page::KLN89Page(KLN89* parent)
: GPSPage(parent) {
_kln89 = (KLN89*)parent;
KLN89Page::KLN89Page(KLN89* parent) {
_kln89 = parent;
_entInvert = false;
_to_flag = true;
_subPage = 0;
}
KLN89Page::~KLN89Page() {
@ -74,14 +74,14 @@ void KLN89Page::Update(double dt) {
}
}
_kln89->DrawText((_kln89->GetDistVelUnitsSI() ? "km" : "nm"), 1, 4, 3);
GPSWaypoint* awp = _parent->GetActiveWaypoint();
GPSWaypoint* awp = _kln89->GetActiveWaypoint();
if(_kln89->_navFlagged) {
_kln89->DrawText("--.-", 1, 0 ,3);
// Only nav1 still gets speed drawn if nav is flagged - not ACT
if(!nav1) _kln89->DrawText("------", 1, 0, 2);
} else {
char buf[8];
float f = _parent->GetDistToActiveWaypoint() * (_kln89->GetDistVelUnitsSI() ? 0.001 : SG_METER_TO_NM);
float f = _kln89->GetDistToActiveWaypoint() * (_kln89->GetDistVelUnitsSI() ? 0.001 : SG_METER_TO_NM);
snprintf(buf, 5, (f >= 100.0 ? "%4.0f" : "%4.1f"), f);
string s = buf;
_kln89->DrawText(s, 1, 4 - s.size(), 3, true);
@ -132,7 +132,9 @@ void KLN89Page::Knob1Right1() {
void KLN89Page::Knob2Left1() {
if(_kln89->_mode != KLN89_MODE_CRSR && !fgGetBool("/instrumentation/kln89/scan-pull")) {
GPSPage::Knob2Left1();
_kln89->_activePage->LooseFocus();
_subPage--;
if(_subPage < 0) _subPage = _nSubPages - 1;
} else {
if(_uLinePos == 0 && _kln89->_obsMode) {
_kln89->_obsHeading--;
@ -146,7 +148,9 @@ void KLN89Page::Knob2Left1() {
void KLN89Page::Knob2Right1() {
if(_kln89->_mode != KLN89_MODE_CRSR && !fgGetBool("/instrumentation/kln89/scan-pull")) {
GPSPage::Knob2Right1();
_kln89->_activePage->LooseFocus();
_subPage++;
if(_subPage >= _nSubPages) _subPage = 0;
} else {
if(_uLinePos == 0 && _kln89->_obsMode) {
_kln89->_obsHeading++;
@ -203,3 +207,12 @@ void KLN89Page::SetId(const string& s) {
const string& KLN89Page::GetId() {
return(_id);
}
// TODO - this function probably shouldn't be here - FG almost certainly has better handling
// of this somewhere already.
string KLN89Page::GPSitoa(int n) {
char buf[6];
snprintf(buf, 6, "%i", n);
string s = buf;
return(s);
}

26
src/Instrumentation/KLN89/kln89_page.hxx
View file

@ -29,7 +29,7 @@
class KLN89;
class KLN89Page : public GPSPage {
class KLN89Page {
public:
KLN89Page(KLN89* parent);
@ -51,10 +51,15 @@ public:
virtual void OBSPressed();
virtual void MsgPressed();
// See base class comments for this.
// Sometimes a page needs to maintain state for some return paths,
// but change it for others. The CleanUp function can be used for
// changing state for non-ENT return paths in conjunction with
// GPS::_cleanUpPage
virtual void CleanUp();
// ditto
// The LooseFocus function is called when a page or subpage looses focus
// and allows pages to clean up state that is maintained whilst focus is
// retained, but lost on return.
virtual void LooseFocus();
inline void SetEntInvert(bool b) { _entInvert = b; }
@ -63,9 +68,21 @@ public:
virtual void SetId(const string& s);
virtual const string& GetId();
inline int GetSubPage() { return(_subPage); }
inline int GetNSubPages() { return(_nSubPages); }
inline const string& GetName() { return(_name); }
protected:
KLN89* _kln89;
string _name; // eg. "APT", "NAV" etc
int _nSubPages;
// _subpage is zero based
int _subPage; // The subpage gets remembered when other pages are displayed
// Underline position in cursor mode is not persistant when subpage is changed - hence we only need one variable per page for it.
// Note that pos 0 is special - this is the leg pos in field 1, so pos will normally be set to 1 when crsr is pressed.
// Also note that in general it doesn't seem to wrap.
@ -88,6 +105,9 @@ protected:
double _scratchpadTimer; // Used for displaying the scratchpad messages for the right amount of time.
string _scratchpadLine1;
string _scratchpadLine2;
// TODO - remove this function from this class and use a built in method instead.
string GPSitoa(int n);
};
#endif // _KLN89_PAGE_HXX

12
src/Instrumentation/KLN89/kln89_page_act.hxx
View file

@ -52,13 +52,13 @@ private:
GPSWaypoint* _actWp;
// The actual ACT page that gets displayed...
GPSPage* _actPage;
KLN89Page* _actPage;
// ...which points to one of the below.
GPSPage* _aptPage;
GPSPage* _vorPage;
GPSPage* _ndbPage;
GPSPage* _intPage;
GPSPage* _usrPage;
KLN89Page* _aptPage;
KLN89Page* _vorPage;
KLN89Page* _ndbPage;
KLN89Page* _intPage;
KLN89Page* _usrPage;
};
#endif // _KLN89_PAGE_ACT_HXX

12
src/Instrumentation/KLN89/kln89_page_fpl.cxx
View file

@ -144,7 +144,7 @@ void KLN89FplPage::Update(double dt) {
//----------------------------------------- end active FP copy ------------------------------------------------
// Recalculate which waypoint is displayed at the top of the list if required (generally if this page has lost focus).
int idx = _parent->GetActiveWaypointIndex();
int idx = _kln89->GetActiveWaypointIndex();
if(_resetFplPos0) {
if(waylist.size() <= 1) {
_fplPos = 0;
@ -679,7 +679,7 @@ void KLN89FplPage::LooseFocus() {
void KLN89FplPage::EntPressed() {
if(_delFP) {
_parent->ClearFlightPlan(_subPage);
_kln89->ClearFlightPlan(_subPage);
CrsrPressed();
} else if(_delWp) {
int pos = _uLinePos - 4 + _fplPos;
@ -750,7 +750,7 @@ void KLN89FplPage::EntPressed() {
}
} else {
// Use
_parent->ClearFlightPlan(0);
_kln89->ClearFlightPlan(0);
for(unsigned int i=0; i<_kln89->_flightPlans[_subPage]->waypoints.size(); ++i) {
GPSWaypoint* wp = new GPSWaypoint;
*wp = *(_kln89->_flightPlans[_subPage]->waypoints[i]);
@ -759,13 +759,13 @@ void KLN89FplPage::EntPressed() {
_kln89->OrientateToActiveFlightPlan();
_subPage = 0;
}
_parent->CrsrPressed();
_kln89->CrsrPressed();
} else if(_uLinePos == 2) {
if(_kln89->_flightPlans[_subPage]->IsEmpty()) {
// ERROR !!!
} else {
// Use Invert
_parent->ClearFlightPlan(0);
_kln89->ClearFlightPlan(0);
for(unsigned int i=0; i<_kln89->_flightPlans[_subPage]->waypoints.size(); ++i) {
GPSWaypoint* wp = new GPSWaypoint;
*wp = *(_kln89->_flightPlans[_subPage]->waypoints[i]);
@ -774,7 +774,7 @@ void KLN89FplPage::EntPressed() {
}
_kln89->OrientateToActiveFlightPlan();
}
_parent->CrsrPressed();
_kln89->CrsrPressed();
_subPage = 0;
}
}

6
src/Instrumentation/KLN89/kln89_page_nav.cxx
View file

@ -41,15 +41,15 @@ KLN89NavPage::KLN89NavPage(KLN89* parent)
_menuPos = 0;
_suspendAVS = false;
_scanWpSet = false;
_scanWpIndex = -1;
_scanWpIndex = -1;
}
KLN89NavPage::~KLN89NavPage() {
}
void KLN89NavPage::Update(double dt) {
GPSFlightPlan* fp = ((KLN89*)_parent)->_activeFP;
GPSWaypoint* awp = _parent->GetActiveWaypoint();
GPSFlightPlan* fp = _kln89->_activeFP;
GPSWaypoint* awp = _kln89->GetActiveWaypoint();
// Scan-pull out on nav4 page switches off the cursor
if(3 == _subPage && fgGetBool("/instrumentation/kln89/scan-pull")) { _kln89->_mode = KLN89_MODE_DISP; }
bool crsr = (_kln89->_mode == KLN89_MODE_CRSR);

162
src/Instrumentation/dclgps.cxx
View file

@ -26,7 +26,6 @@
#include "dclgps.hxx"
#include <simgear/sg_inlines.h>
#include <simgear/structure/commands.hxx>
#include <simgear/timing/sg_time.hxx>
#include <simgear/magvar/magvar.hxx>
@ -39,85 +38,6 @@
using namespace std;
// Command callbacks for FlightGear
static bool do_kln89_msg_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_msg_pressed called!\n";
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->MsgPressed();
return(true);
}
static bool do_kln89_obs_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_obs_pressed called!\n";
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->OBSPressed();
return(true);
}
static bool do_kln89_alt_pressed(const SGPropertyNode* arg) {
//cout << "do_kln89_alt_pressed called!\n";
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->AltPressed();
return(true);
}
static bool do_kln89_nrst_pressed(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->NrstPressed();
return(true);
}
static bool do_kln89_dto_pressed(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->DtoPressed();
return(true);
}
static bool do_kln89_clr_pressed(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->ClrPressed();
return(true);
}
static bool do_kln89_ent_pressed(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->EntPressed();
return(true);
}
static bool do_kln89_crsr_pressed(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->CrsrPressed();
return(true);
}
static bool do_kln89_knob1left1(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->Knob1Left1();
return(true);
}
static bool do_kln89_knob1right1(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->Knob1Right1();
return(true);
}
static bool do_kln89_knob2left1(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->Knob2Left1();
return(true);
}
static bool do_kln89_knob2right1(const SGPropertyNode* arg) {
DCLGPS* gps = (DCLGPS*)globals->get_subsystem("kln89");
gps->Knob2Right1();
return(true);
}
// End command callbacks
GPSWaypoint::GPSWaypoint() {
appType = GPS_APP_NONE;
}
@ -222,58 +142,12 @@ ClockTime::ClockTime(int hr, int min) {
ClockTime::~ClockTime() {
}
GPSPage::GPSPage(DCLGPS* parent) {
_parent = parent;
_subPage = 0;
}
GPSPage::~GPSPage() {
}
void GPSPage::Update(double dt) {}
void GPSPage::Knob1Left1() {}
void GPSPage::Knob1Right1() {}
void GPSPage::Knob2Left1() {
_parent->_activePage->LooseFocus();
_subPage--;
if(_subPage < 0) _subPage = _nSubPages - 1;
}
void GPSPage::Knob2Right1() {
_parent->_activePage->LooseFocus();
_subPage++;
if(_subPage >= _nSubPages) _subPage = 0;
}
void GPSPage::CrsrPressed() {}
void GPSPage::EntPressed() {}
void GPSPage::ClrPressed() {}
void GPSPage::DtoPressed() {}
void GPSPage::NrstPressed() {}
void GPSPage::AltPressed() {}
void GPSPage::OBSPressed() {}
void GPSPage::MsgPressed() {}
string GPSPage::GPSitoa(int n) {
char buf[6];
snprintf(buf, 6, "%i", n);
string s = buf;
return(s);
}
void GPSPage::CleanUp() {}
void GPSPage::LooseFocus() {}
void GPSPage::SetId(const string& s) {}
// ------------------------------------------------------------------------------------- //
DCLGPS::DCLGPS(RenderArea2D* instrument) {
_instrument = instrument;
_nFields = 1;
_maxFields = 2;
_pages.clear();
// Units - lets default to US units - FG can set them to other units from config during startup if desired.
_altUnits = GPS_ALT_UNITS_FT;
@ -361,18 +235,6 @@ void DCLGPS::draw(osg::State& state) {
}
void DCLGPS::init() {
globals->get_commands()->addCommand("kln89_msg_pressed", do_kln89_msg_pressed);
globals->get_commands()->addCommand("kln89_obs_pressed", do_kln89_obs_pressed);
globals->get_commands()->addCommand("kln89_alt_pressed", do_kln89_alt_pressed);
globals->get_commands()->addCommand("kln89_nrst_pressed", do_kln89_nrst_pressed);
globals->get_commands()->addCommand("kln89_dto_pressed", do_kln89_dto_pressed);
globals->get_commands()->addCommand("kln89_clr_pressed", do_kln89_clr_pressed);
globals->get_commands()->addCommand("kln89_ent_pressed", do_kln89_ent_pressed);
globals->get_commands()->addCommand("kln89_crsr_pressed", do_kln89_crsr_pressed);
globals->get_commands()->addCommand("kln89_knob1left1", do_kln89_knob1left1);
globals->get_commands()->addCommand("kln89_knob1right1", do_kln89_knob1right1);
globals->get_commands()->addCommand("kln89_knob2left1", do_kln89_knob2left1);
globals->get_commands()->addCommand("kln89_knob2right1", do_kln89_knob2right1);
// Not sure if this should be here, but OK for now.
CreateDefaultFlightPlans();
@ -659,6 +521,15 @@ void DCLGPS::update(double dt) {
}
}
GPSWaypoint* DCLGPS::GetActiveWaypoint() {
return &_activeWaypoint;
}
// Returns meters
float DCLGPS::GetDistToActiveWaypoint() {
return _dist2Act;
}
// I don't yet fully understand all the gotchas about where to source time from.
// This function sets the initial timer before the clock exports properties
// and the one below uses the clock to be consistent with the rest of the code.
@ -709,18 +580,7 @@ void DCLGPS::DtoCancel() {
_dto = false;
}
void DCLGPS::Knob1Left1() {}
void DCLGPS::Knob1Right1() {}
void DCLGPS::Knob2Left1() {}
void DCLGPS::Knob2Right1() {}
void DCLGPS::CrsrPressed() { _activePage->CrsrPressed(); }
void DCLGPS::EntPressed() { _activePage->EntPressed(); }
void DCLGPS::ClrPressed() { _activePage->ClrPressed(); }
void DCLGPS::DtoPressed() {}
void DCLGPS::NrstPressed() {}
void DCLGPS::AltPressed() {}
void DCLGPS::OBSPressed() {
void DCLGPS::ToggleOBSMode() {
_obsMode = !_obsMode;
if(_obsMode) {
if(!_activeWaypoint.id.empty()) {
@ -742,8 +602,6 @@ void DCLGPS::SetOBSFromWaypoint() {
_fromWaypoint.id = "OBSWP";
}
void DCLGPS::MsgPressed() {}
void DCLGPS::CDIFSDIncrease() {
if(_currentCdiScaleIndex == 0) {
_currentCdiScaleIndex = _cdiScales.size() - 1;

83
src/Instrumentation/dclgps.hxx
View file

@ -186,67 +186,9 @@ private:
// ------------------------------------------------------------------------------
class DCLGPS;
class GPSPage {
public:
GPSPage(DCLGPS* parent);
virtual ~GPSPage() = 0;
virtual void Update(double dt);
virtual void Knob1Left1();
virtual void Knob1Right1();
virtual void Knob2Left1();
virtual void Knob2Right1();
virtual void CrsrPressed();
virtual void EntPressed();
virtual void ClrPressed();
virtual void DtoPressed();
virtual void NrstPressed();
virtual void AltPressed();
virtual void OBSPressed();
virtual void MsgPressed();
// Sometimes a page needs to maintain state for some return paths,
// but change it for others. The CleanUp function can be used for
// changing state for non-ENT return paths in conjunction with
// GPS::_cleanUpPage
virtual void CleanUp();
// The LooseFocus function is called when a page or subpage looses focus
// and allows pages to clean up state that is maintained whilst focus is
// retained, but lost on return.
virtual void LooseFocus();
// Allows pages that display info for a given ID to have it set/get if they implement these functions.
virtual void SetId(const string& s);
virtual const string& GetId()=0;
inline int GetSubPage() { return(_subPage); }
inline int GetNSubPages() { return(_nSubPages); }
inline const string& GetName() { return(_name); }
protected:
DCLGPS* _parent;
string _name; // eg. "APT", "NAV" etc
int _nSubPages;
// _subpage is zero based
int _subPage; // The subpage gets remembered when other pages are displayed
string GPSitoa(int n);
};
/*-----------------------------------------------------------------------*/
typedef vector<GPSPage*> gps_page_list_type;
typedef gps_page_list_type::iterator gps_page_list_itr;
// TODO - merge generic GPS functions instead and split out KLN specific stuff.
class DCLGPS : public SGSubsystem {
friend class GPSPage;
public:
DCLGPS(RenderArea2D* instrument);
virtual ~DCLGPS() = 0;
@ -266,18 +208,7 @@ public:
// Render a char at a given position as above
virtual void DrawChar(char c, int field, int px, int py, bool bold = false);
virtual void Knob1Right1();
virtual void Knob1Left1();
virtual void Knob2Right1();
virtual void Knob2Left1();
virtual void CrsrPressed();
virtual void EntPressed();
virtual void ClrPressed();
virtual void DtoPressed();
virtual void NrstPressed();
virtual void AltPressed();
virtual void OBSPressed();
virtual void MsgPressed();
virtual void ToggleOBSMode();
// Set the number of fields
inline void SetNumFields(int n) { _nFields = (n > _maxFields ? _maxFields : (n < 1 ? 1 : n)); }
@ -309,7 +240,7 @@ public:
void SetOBSFromWaypoint();
inline GPSWaypoint* GetActiveWaypoint() { return &_activeWaypoint; }
GPSWaypoint* GetActiveWaypoint();
// Get the (zero-based) position of the active waypoint in the active flightplan
// Returns -1 if no active waypoint.
int GetActiveWaypointIndex();
@ -317,7 +248,7 @@ public:
int GetWaypointIndex(const string& id);
// Returns meters
inline float GetDistToActiveWaypoint() { return _dist2Act; }
float GetDistToActiveWaypoint();
// Returns degrees (magnetic)
float GetHeadingToActiveWaypoint();
// Returns degrees (magnetic)
@ -383,14 +314,6 @@ protected:
// 2D rendering area
RenderArea2D* _instrument;
// The actual pages
gps_page_list_type _pages;
// The currently active page
GPSPage* _activePage;
// And a facility to save the immediately preceeding active page
GPSPage* _lastActivePage;
// Units
GPSSpeedUnits _velUnits;
GPSDistanceUnits _distUnits;