From 65eb86f85456a4b296dc3fabeb1d1af03b26c8d2 Mon Sep 17 00:00:00 2001 From: Tim Wootton Date: Tue, 31 Dec 2013 22:14:55 +0000 Subject: MainTab location coordinates displayed in ISO6709 format changes the location coordinates display in the main tab to use ISO6709(2008) Annex D suggested format. Signed-off-by: Tim Wootton Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 4fc543fc0..07c21b2b5 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -974,7 +974,8 @@ void MainTab::editWeightWidget(const QModelIndex& index) QString MainTab::printGPSCoords(int lat, int lon) { unsigned int latdeg, londeg; - unsigned int ilatmin, ilonmin; + unsigned int latmin, lonmin; + double latsec, lonsec; QString lath, lonh, result; if (!lat && !lon) @@ -986,11 +987,13 @@ QString MainTab::printGPSCoords(int lat, int lon) lon = abs(lon); latdeg = lat / 1000000; londeg = lon / 1000000; - ilatmin = (lat % 1000000) * 60; - ilonmin = (lon % 1000000) * 60; - result.sprintf("%s%u%s %2d.%05d\' , %s%u%s %2d.%05d\'", - lath.toUtf8().data(), latdeg, UTF8_DEGREE, ilatmin / 1000000, (ilatmin % 1000000) / 10, - lonh.toUtf8().data(), londeg, UTF8_DEGREE, ilonmin / 1000000, (ilonmin % 1000000) / 10); + latmin = (lat % 1000000) * 60; + lonmin = (lon % 1000000) * 60; + latsec = (latmin % 1000000) * 60; + lonsec = (lonmin % 1000000) * 60; + result.sprintf("%u%s%02d\'%06.3f\"%s %u%s%02d\'%06.3f\"%s", + latdeg, UTF8_DEGREE, latmin / 1000000, latsec / 1000000, lath.toUtf8().data(), + londeg, UTF8_DEGREE, lonmin / 1000000, lonsec / 1000000, lonh.toUtf8().data()); return result; } -- cgit v1.2.3-70-g09d2