fly/flightgear
1
0
Fork 0
Code Activity

When clearing the route, skip generated waypoints.

Browse source
This commit is contained in:
James Turner 2012-01-08 19:31:07 +00:00
parent db241f3e10
commit fdbdbfe93d
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Autopilot/route_mgr.cxx
View file

@ -539,9 +539,22 @@ flightgear::WayptRef FGRouteMgr::removeWayptAtIndex(int aIndex)
return w; return w;
} }
struct NotGeneratedWayptPredicate : public std::unary_function<const Waypt*, bool>
{
bool operator() (const Waypt* w) const
{
return (w->flag(WPT_GENERATED) == false);
}
};
void FGRouteMgr::clearRoute() void FGRouteMgr::clearRoute()
{ {
_route.clear(); // erase all non-generated waypoints
WayptVec::iterator r =
std::remove_if(_route.begin(), _route.end(), NotGeneratedWayptPredicate());
_route.erase(r, _route.end());
_currentIndex = -1; _currentIndex = -1;
update_mirror(); update_mirror();
@ -1135,15 +1148,7 @@ void FGRouteMgr::initAtPosition()
bool FGRouteMgr::haveUserWaypoints() const bool FGRouteMgr::haveUserWaypoints() const
{ {
for (int i = 0; i < numWaypts(); i++) { return std::find_if(_route.begin(), _route.end(), NotGeneratedWayptPredicate()) != _route.end();
if (!_route[i]->flag(WPT_GENERATED)) {
// have a non-generated waypoint, we're done
return true;
}
}
// all waypoints are generated
return false;
} }
bool FGRouteMgr::activate() bool FGRouteMgr::activate()