From 3d544fbc1f9e50e96da349788d2fe802115e6072 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 12 Oct 2011 22:33:56 +0100 Subject: [PATCH] Tweak map-widget data boxes for AI objects, so speed/altitude update in real-time. --- src/GUI/MapWidget.cxx | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/GUI/MapWidget.cxx b/src/GUI/MapWidget.cxx index f5d2cbd71..390668510 100644 --- a/src/GUI/MapWidget.cxx +++ b/src/GUI/MapWidget.cxx @@ -1388,21 +1388,15 @@ void MapWidget::drawAIAircraft(const SGPropertyNode* model, const SGGeod& pos, d drawLine(p, project(advance)); } - if (validDataForKey((void*) model)) { - setAnchorForKey((void*) model, p); - return; - } // draw callsign / altitude / speed - - char buffer[1024]; ::snprintf(buffer, 1024, "%s\n%d'\n%dkts", model->getStringValue("callsign", "<>"), static_cast(pos.getElevationFt() / 50.0) * 50, speedKts); - MapData* d = createDataForKey((void*) model); + MapData* d = getOrCreateDataForKey((void*) model); d->setText(buffer); d->setLabel(model->getStringValue("callsign", "<>")); d->setPriority(speedKts > 5 ? 60 : 10); // low priority for parked aircraft @@ -1434,18 +1428,13 @@ void MapWidget::drawAIShip(const SGPropertyNode* model, const SGGeod& pos, doubl drawLine(p, project(advance)); } - if (validDataForKey((void*) model)) { - setAnchorForKey((void*) model, p); - return; - } - // draw callsign / speed char buffer[1024]; ::snprintf(buffer, 1024, "%s\n%dkts", model->getStringValue("name", "<>"), speedKts); - MapData* d = createDataForKey((void*) model); + MapData* d = getOrCreateDataForKey((void*) model); d->setText(buffer); d->setLabel(model->getStringValue("name", "<>")); d->setPriority(speedKts > 2 ? 30 : 10); // low priority for slow moving ships -- 2.39.5