fly/flightgear
1
0
Fork 0
Code Activity

GPS: enable switching to OBS/DTO mode with no valid scratch - use active waypoint.

Browse source
This commit is contained in:
jmt 2010-03-27 11:37:25 +00:00 • committed by Tim Moore
parent 40e383451b
commit 4e24fbbb91
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Instrumentation/gps.cxx
View file

@ -1325,21 +1325,18 @@ bool GPS::isScratchPositionValid() const
void GPS::directTo()
{
if (!isScratchPositionValid()) {
SG_LOG(SG_INSTR, SG_WARN, "invalid DTO lat/lon");
return;
_wp0_position = _indicated_pos;
if (isScratchPositionValid()) {
_wp1Ident = _scratchNode->getStringValue("ident");
_wp1Name = _scratchNode->getStringValue("name");
_wp1_position = _scratchPos;
}
_wp0_position = _indicated_pos;
_wp1Ident = _scratchNode->getStringValue("ident");
_wp1Name = _scratchNode->getStringValue("name");
_wp1_position = _scratchPos;
_mode = "dto";
_desiredCourse = getLegMagCourse();
_desiredCourseNode->fireValueChanged();
clearScratch();
wp1Changed();
}
@ -1609,17 +1606,14 @@ void GPS::addAirportToScratch(FGAirport* aAirport)
void GPS::selectOBSMode()
{
if (!isScratchPositionValid()) {
SG_LOG(SG_INSTR, SG_WARN, "invalid OBS lat/lon");
return;
if (isScratchPositionValid()) {
_wp1Ident = _scratchNode->getStringValue("ident");
_wp1Name = _scratchNode->getStringValue("name");
_wp1_position = _scratchPos;
}
SG_LOG(SG_INSTR, SG_INFO, "GPS switching to OBS mode");
_mode = "obs";
_wp1Ident = _scratchNode->getStringValue("ident");
_wp1Name = _scratchNode->getStringValue("name");
_wp1_position = _scratchPos;
_wp0_position = _indicated_pos;
wp1Changed();
}