fly/flightgear
1
0
Fork 0
Code Activity

Route-manager waypoint-list lat-lon formatting

Browse source 
Use the new Simgear helpers to make the lat-lon formatting the 
waypoint list dialog nicer.
This commit is contained in:
James Turner 2018-06-27 11:46:32 +01:00
parent c86ed96433
commit e49b1328c8
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/GUI/WaypointList.cxx
View file

@ -382,6 +382,7 @@ void WaypointList::draw( int dx, int dy )
y -= (_scrollPx % rowHeight); // partially draw the first row
_arrowWidth = legendFont.getStringWidth(">");
_latLonFormat = static_cast<simgear::strutils::LatLonFormat>(fgGetInt("/sim/lon-lat-format"));
RoutePath path(_model->flightplan());
@ -502,12 +503,10 @@ void WaypointList::drawRowText(int x, int baseline, int rowIndex, const RoutePat
if (_showLatLon) {
// only show for non-dynamic waypoints
if (!wp->flag(WPT_DYNAMIC)) {
SGGeod p(wp->position());
char ns = (p.getLatitudeDeg() > 0.0) ? 'N' : 'S';
char ew = (p.getLongitudeDeg() > 0.0) ? 'E' : 'W';
::snprintf(buffer, 128 - count, "%4.2f%c %4.2f%c",
fabs(p.getLongitudeDeg()), ew, fabs(p.getLatitudeDeg()), ns);
const auto s = simgear::strutils::formatGeodAsString(wp->position(),
_latLonFormat);
const auto bytesToCopy = std::min((size_t) 128 - count, s.size() + 1);
::memcpy(buffer, s.c_str(), bytesToCopy);
} else {
buffer[0] = 0;
}

4
src/GUI/WaypointList.hxx
View file

@ -7,6 +7,7 @@
#include <simgear/compiler.h>
#include <simgear/timing/timestamp.hxx>
#include <simgear/misc/strutils.hxx>
#include <plib/pu.h>
@ -150,6 +151,9 @@ private:
SGTimeStamp _blinkTimer;
bool _blink;
int _arrowWidth;
// cached value from /sim/lon-lat-format
simgear::strutils::LatLonFormat _latLonFormat = simgear::strutils::LatLonFormat::DECIMAL_DEGREES;
};
class ScrolledWaypointList : public puGroup