mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use C API for printGPSCoords

Browse source 
This way we can call this helper from both C and C++ code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-14 17:50:48 -08:00
parent 12f422a1a3
commit 06bbf9f4c8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qthelper.cpp
View file

@ -31,7 +31,7 @@ QString weight_string(int weight_in_grams)
return (str); return (str);
} }
QString printGPSCoords(int lat, int lon) extern "C" const char *printGPSCoords(int lat, int lon)
{ {
unsigned int latdeg, londeg; unsigned int latdeg, londeg;
unsigned int latmin, lonmin; unsigned int latmin, lonmin;
@ -39,7 +39,7 @@ QString printGPSCoords(int lat, int lon)
QString lath, lonh, result; QString lath, lonh, result;
if (!lat && !lon) if (!lat && !lon)
return QString(); return strdup("");
lath = lat >= 0 ? translate("gettextFromC", "N") : translate("gettextFromC", "S"); lath = lat >= 0 ? translate("gettextFromC", "N") : translate("gettextFromC", "S");
lonh = lon >= 0 ? translate("gettextFromC", "E") : translate("gettextFromC", "W"); lonh = lon >= 0 ? translate("gettextFromC", "E") : translate("gettextFromC", "W");
@ -54,7 +54,7 @@ QString printGPSCoords(int lat, int lon)
result.sprintf("%u%s%02d\'%06.3f\"%s %u%s%02d\'%06.3f\"%s", result.sprintf("%u%s%02d\'%06.3f\"%s %u%s%02d\'%06.3f\"%s",
latdeg, UTF8_DEGREE, latmin / 1000000, latsec / 1000000, lath.toUtf8().data(), latdeg, UTF8_DEGREE, latmin / 1000000, latsec / 1000000, lath.toUtf8().data(),
londeg, UTF8_DEGREE, lonmin / 1000000, lonsec / 1000000, lonh.toUtf8().data()); londeg, UTF8_DEGREE, lonmin / 1000000, lonsec / 1000000, lonh.toUtf8().data());
return result; return strdup(result.toUtf8().data());
} }
static bool parseCoord(const QString& txt, int& pos, const QString& positives, static bool parseCoord(const QString& txt, int& pos, const QString& positives,

2
qthelper.h
View file

@ -13,7 +13,7 @@ extern QTranslator *qtTranslator, *ssrfTranslator;
QString weight_string(int weight_in_grams); QString weight_string(int weight_in_grams);
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0); bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);
QString printGPSCoords(int lat, int lon); extern "C" const char *printGPSCoords(int lat, int lon);
QList<int> getDivesInTrip(dive_trip_t *trip); QList<int> getDivesInTrip(dive_trip_t *trip);
QString gasToStr(struct gasmix gas); QString gasToStr(struct gasmix gas);