1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-04 22:59:29 +02:00

Compare commits

...

3 Commits
8.2 ... 8.3

Author SHA1 Message Date
6ba7493b59 Version++ 2021-01-23 18:30:46 +01:00
2e10c609f4 Fixed crash on empty paths
Fixes #339
2021-01-23 18:24:58 +01:00
cd571f4662 Removed surplus conversions 2021-01-23 15:15:29 +01:00
6 changed files with 9 additions and 7 deletions

View File

@ -1,4 +1,4 @@
version: 8.2.{build} version: 8.3.{build}
configuration: configuration:
- Release - Release

View File

@ -3,7 +3,7 @@ unix:!macx {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 8.2 VERSION = 8.3
QT += core \ QT += core \
gui \ gui \

View File

@ -7,7 +7,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "8.2" !define VERSION "8.3"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}.exe" OutFile "GPXSee-${VERSION}.exe"

View File

@ -7,7 +7,7 @@
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "8.2" !define VERSION "8.3"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -864,6 +864,8 @@ void GUI::loadData(const Data &data)
for (int i = 0; i < paths.count(); i++) { for (int i = 0; i < paths.count(); i++) {
PathItem *pi = paths.at(i); PathItem *pi = paths.at(i);
if (!pi)
continue;
for (int j = 0; j < graphs.count(); j++) for (int j = 0; j < graphs.count(); j++)
pi->addGraph(graphs.at(j).at(i)); pi->addGraph(graphs.at(j).at(i));

View File

@ -23,7 +23,7 @@ static bool readFloat(const char *data, int len, qreal &f)
{ {
bool ok; bool ok;
f = QString(QByteArray::fromRawData(data, len)).toFloat(&ok); f = QByteArray::fromRawData(data, len).toFloat(&ok);
return ok; return ok;
} }
@ -144,7 +144,7 @@ bool NMEAParser::readLat(const char *data, int len, qreal &lat)
d = Util::str2int(data, 2); d = Util::str2int(data, 2);
mi = Util::str2int(data + 2, 2); mi = Util::str2int(data + 2, 2);
mf = QString(QByteArray::fromRawData(data + 4, len - 4)).toFloat(&ok); mf = QByteArray::fromRawData(data + 4, len - 4).toFloat(&ok);
if (d < 0 || mi < 0 || !ok) if (d < 0 || mi < 0 || !ok)
goto error; goto error;
@ -194,7 +194,7 @@ bool NMEAParser::readLon(const char *data, int len, qreal &lon)
d = Util::str2int(data, 3); d = Util::str2int(data, 3);
mi = Util::str2int(data + 3, 2); mi = Util::str2int(data + 3, 2);
mf = QString(QByteArray::fromRawData(data + 5, len - 5)).toFloat(&ok); mf = QByteArray::fromRawData(data + 5, len - 5).toFloat(&ok);
if (d < 0 || mi < 0 || !ok) if (d < 0 || mi < 0 || !ok)
goto error; goto error;