fly/flightgear
1
0
Fork 0
Code Activity

Avoid excessive load when no navaids are in range

Browse source 
When no navaid is found, '_ref_navaid_id_node->setStringValue("")' results
in a listener firing, which requests another navaid update when no navaid
is available.
=> Resulted in FGPositioned::findClosest being called in every update loop,
when no navaid was within range.
This commit is contained in:
ThorstenB 2011-08-24 23:17:05 +02:00
parent 557c95a5ec
commit cc020fe9df
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Instrumentation/gps.cxx
View file

@ -611,12 +611,11 @@ void GPS::updateReferenceNavaid(double dt)
if (!_ref_navaid_set) {
_ref_navaid_elapsed += dt;
if (_ref_navaid_elapsed > 5.0) {
_ref_navaid_elapsed = 0.0;
FGPositioned::TypeFilter vorFilter(FGPositioned::VOR);
FGPositionedRef nav = FGPositioned::findClosest(_indicated_pos, 400.0, &vorFilter);
if (!nav) {
SG_LOG(SG_INSTR, SG_INFO, "GPS couldn't find a reference navid");
SG_LOG(SG_INSTR, SG_INFO, "GPS couldn't find a reference navaid");
_ref_navaid_id_node->setStringValue("");
_ref_navaid_name_node->setStringValue("");
_ref_navaid_bearing_node->setDoubleValue(0.0);
@ -636,6 +635,10 @@ void GPS::updateReferenceNavaid(double dt)
}
_ref_navaid = nav;
// reset elapsed time (do not do that before updating the properties above, since their
// listeners may request another update (_ref_navaid_elapsed = 9999), which results in
// excessive load (FGPositioned::findClosest called in every update loop...)
_ref_navaid_elapsed = 0.0;
}
}