root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 03:29:16 +02:00
Code Issues Projects Releases Activity

Unified path -> name conversion

Browse Source
This commit is contained in:
Martin Tůma
2021-01-17 19:33:06 +01:00
parent 3033bc680d
commit 6d8ccd2216
18 changed files with 65 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/exifparser.cpp
View File

@ -2,6 +2,7 @@
#include <QFileInfo>
#include <QImageReader>
#include "common/tifffile.h"
#include "common/util.h"
#include "exifparser.h"
@ -211,7 +212,7 @@ bool EXIFParser::parseTIFF(QFile *file, QVector<Waypoint> &waypoints)
ImageInfo img(file->fileName(), QImageReader(file).size());
Waypoint wp(c);
wp.setName(QFileInfo(file->fileName()).baseName());
wp.setName(Util::file2name(file->fileName()));
wp.addImage(img);
wp.setElevation(altitude(tiff, GPSIFD.value(GPSAltitude),
GPSIFD.value(GPSAltitudeRef)));

28
src/data/igcparser.cpp
View File

@ -5,9 +5,9 @@
static bool readLat(const char *data, qreal &lat)
{
int d = str2int(data, 2);
int mi = str2int(data + 2, 2);
int mf = str2int(data + 4, 3);
int d = Util::str2int(data, 2);
int mi = Util::str2int(data + 2, 2);
int mf = Util::str2int(data + 4, 3);
if (d < 0 || mi < 0 || mf < 0)
return false;
@ -26,9 +26,9 @@ static bool readLat(const char *data, qreal &lat)
static bool readLon(const char *data, qreal &lon)
{
int d = str2int(data, 3);
int mi = str2int(data + 3, 2);
int mf = str2int(data + 5, 3);
int d = Util::str2int(data, 3);
int mi = Util::str2int(data + 3, 2);
int mf = Util::str2int(data + 5, 3);
if (d < 0 || mi < 0 || mf < 0)
return false;
@ -53,11 +53,11 @@ static bool readAltitude(const char *data, qreal &ele)
return false;
if (data[6] == '-') {
if ((ga = str2int(data + 7, 4)) < 0)
if ((ga = Util::str2int(data + 7, 4)) < 0)
return false;
ga = -ga;
} else {
if ((ga = str2int(data + 6, 5)) < 0)
if ((ga = Util::str2int(data + 6, 5)) < 0)
return false;
}
@ -71,9 +71,9 @@ static bool readAltitude(const char *data, qreal &ele)
static bool readTimestamp(const char *data, QTime &time)
{
int h = str2int(data, 2);
int m = str2int(data + 2, 2);
int s = str2int(data + 4, 2);
int h = Util::str2int(data, 2);
int m = Util::str2int(data + 2, 2);
int s = Util::str2int(data + 4, 2);
if (h < 0 || m < 0 || s < 0)
return false;
@ -105,9 +105,9 @@ bool IGCParser::readHRecord(CTX &ctx, const char *line, int len)
int offset = (len < 16 || ::strncmp(line + 5, "DATE:", 5)) ? 5 : 10;
int d = str2int(line + offset, 2);
int m = str2int(line + offset + 2, 2);
int y = str2int(line + offset + 4, 2);
int d = Util::str2int(line + offset, 2);
int m = Util::str2int(line + offset + 2, 2);
int y = Util::str2int(line + offset + 4, 2);
if (y < 0 || m < 0 || d < 0) {
_errorString = "Invalid date header format";

28
src/data/nmeaparser.cpp
View File

@ -71,14 +71,14 @@ bool NMEAParser::readTime(const char *data, int len, QTime &time)
if (len < 6)
goto error;
h = str2int(data, 2);
m = str2int(data + 2, 2);
s = str2int(data + 4, 2);
h = Util::str2int(data, 2);
m = Util::str2int(data + 2, 2);
s = Util::str2int(data + 4, 2);
if (h < 0 || m < 0 || s < 0)
goto error;
if (len > 7 && data[6] == '.') {
if ((ms = str2int(data + 7, len - 7)) < 0)
if ((ms = Util::str2int(data + 7, len - 7)) < 0)
goto error;
}
@ -106,9 +106,9 @@ bool NMEAParser::readDate(const char *data, int len, QDate &date)
if (len < 6)
goto error;
d = str2int(data, 2);
m = str2int(data + 2, 2);
y = str2int(data + 4, len - 4);
d = Util::str2int(data, 2);
m = Util::str2int(data + 2, 2);
y = Util::str2int(data + 4, len - 4);
if (d < 0 || m < 0 || y < 0)
goto error;
@ -142,8 +142,8 @@ bool NMEAParser::readLat(const char *data, int len, qreal &lat)
if (len < 7 || data[4] != '.')
goto error;
d = str2int(data, 2);
mi = str2int(data + 2, 2);
d = Util::str2int(data, 2);
mi = Util::str2int(data + 2, 2);
mf = QString(QByteArray::fromRawData(data + 4, len - 4)).toFloat(&ok);
if (d < 0 || mi < 0 || !ok)
goto error;
@ -192,8 +192,8 @@ bool NMEAParser::readLon(const char *data, int len, qreal &lon)
if (len < 8 || data[5] != '.')
goto error;
d = str2int(data, 3);
mi = str2int(data + 3, 2);
d = Util::str2int(data, 3);
mi = Util::str2int(data + 3, 2);
mf = QString(QByteArray::fromRawData(data + 5, len - 5)).toFloat(&ok);
if (d < 0 || mi < 0 || !ok)
goto error;
@ -437,7 +437,7 @@ bool NMEAParser::readZDA(CTX &ctx, const char *line, int len)
case 2:
if (!(lp - vp))
return true;
if ((d = str2int(vp, lp - vp)) < 0) {
if ((d = Util::str2int(vp, lp - vp)) < 0) {
_errorString = "Invalid day";
return false;
}
@ -445,7 +445,7 @@ bool NMEAParser::readZDA(CTX &ctx, const char *line, int len)
case 3:
if (!(lp - vp))
return true;
if ((m = str2int(vp, lp - vp)) < 0) {
if ((m = Util::str2int(vp, lp - vp)) < 0) {
_errorString = "Invalid month";
return false;
}
@ -453,7 +453,7 @@ bool NMEAParser::readZDA(CTX &ctx, const char *line, int len)
case 4:
if (!(lp - vp))
return true;
if ((y = str2int(vp, lp - vp)) < 0) {
if ((y = Util::str2int(vp, lp - vp)) < 0) {
_errorString = "Invalid year";
return false;
}