fly/flightgear
1
0
Fork 0
Code Activity

MapWidget: make use of the new POI system and display cities on the map.

Browse source 
This is meant as a preview.
This commit is contained in:
Christian Schmitt 2013-03-04 00:27:12 +01:00
parent 664cb474e1
commit 6bf47cd248
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/GUI/MapWidget.cxx
View file

@ -607,6 +607,7 @@ void MapWidget::draw(int dx, int dy)
drawAirports();
drawNavaids();
drawPOIs();
drawTraffic();
drawGPSData();
drawNavRadio(fgGetNode("/instrumentation/nav[0]", false));
@ -995,6 +996,20 @@ void MapWidget::drawNavaids()
} // of navaids || fixes are drawn test
}
void MapWidget::drawPOIs()
{
FGPositioned::TypeFilter f(FGPositioned::CITY);
FGPositioned::List poi = FGPositioned::findWithinRange(_projectionCenter, _drawRangeNm, &f);
glLineWidth(1.0);
for (unsigned int i=0; i<poi.size(); ++i) {
FGPositioned::Type ty = poi[i]->type();
if (ty == FGPositioned::CITY) {
drawCities((FGNavRecord*) poi[i].get());
}
} // of navaid iteration
}
void MapWidget::drawNDB(bool tuned, FGNavRecord* ndb)
{
SGVec2d pos = project(ndb->geod());
@ -1149,6 +1164,31 @@ void MapWidget::drawTunedLocalizer(SGPropertyNode_ptr radio)
}
}
void MapWidget::drawCities(FGNavRecord* rec)
{
SGVec2d pos = project(rec->geod());
glColor3f(1.0, 1.0, 1.0);
circleAt(pos, 4, 8);
if (validDataForKey(rec)) {
setAnchorForKey(rec, pos);
return;
}
char buffer[1024];
::snprintf(buffer, 1024, "%s",
rec->name().c_str());
MapData* d = createDataForKey(rec);
d->setPriority(40);
d->setLabel(rec->ident());
d->setText(buffer);
d->setOffset(MapData::HALIGN_CENTER | MapData::VALIGN_BOTTOM, 10);
d->setAnchor(pos);
}
/*
void MapWidget::drawObstacle(FGPositioned* obs)
{

3
src/GUI/MapWidget.hxx
View file

@ -63,9 +63,12 @@ private:
void drawILS(bool tuned, FGRunway* rwy);
void drawNavaids();
void drawPOIs();
void drawNDB(bool tuned, FGNavRecord* nav);
void drawVOR(bool tuned, FGNavRecord* nav);
void drawFix(FGFix* fix);
void drawCities(FGNavRecord* rec);
void drawTraffic();
void drawAIAircraft(const SGPropertyNode* model, const SGGeod& pos, double hdg);