fly/flightgear
1
0
Fork 0
Code Activity

- set target altitude if a new WP becomes active through deleting/inserting

Browse source 
- cosmetics
This commit is contained in:
mfranz 2006-05-10 09:40:08 +00:00
parent 43dce6a2be
commit 2ff16ca93f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Autopilot/route_mgr.cxx
View file

@ -229,6 +229,9 @@ void FGRouteMgr::update( double dt ) {
void FGRouteMgr::add_waypoint( const SGWayPoint& wp, int n ) { void FGRouteMgr::add_waypoint( const SGWayPoint& wp, int n ) {
if ( n == 0 )
altitude_set = false;
route->add_waypoint( wp, n ); route->add_waypoint( wp, n );
update_mirror(); update_mirror();
} }
@ -262,6 +265,9 @@ SGWayPoint FGRouteMgr::pop_waypoint( int n ) {
wp0_eta->setStringValue( "" ); wp0_eta->setStringValue( "" );
} }
if ( n == 0 && route->size() )
altitude_set = false;
update_mirror(); update_mirror();
return wp; return wp;
} }
@ -285,8 +291,8 @@ int FGRouteMgr::new_waypoint( const string& Tgt_Alt, int n ) {
int type = make_waypoint( &wp, target ); int type = make_waypoint( &wp, target );
if (wp) { if (wp) {
fgSetString( "/autopilot/locks/heading", "true-heading-hold" );
add_waypoint( *wp, n ); add_waypoint( *wp, n );
fgSetString( "/autopilot/locks/heading", "true-heading-hold" );
delete wp; delete wp;
} }
return type; return type;
@ -307,7 +313,7 @@ int FGRouteMgr::make_waypoint(SGWayPoint **wp, string& target) {
} }
// check for lon,lat // check for lon,lat
pos = target.find(','); pos = target.find( ',' );
if ( pos != string::npos ) { if ( pos != string::npos ) {
double lon = atof( target.substr(0, pos).c_str()); double lon = atof( target.substr(0, pos).c_str());
double lat = atof( target.c_str() + pos + 1); double lat = atof( target.c_str() + pos + 1);
@ -359,7 +365,7 @@ int FGRouteMgr::make_waypoint(SGWayPoint **wp, string& target) {
return 4; return 4;
} }
// target not identified // unknown target
return 0; return 0;
} }