1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-12-05 00:39:09 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
9b3c11cc68 Version++ 2023-05-07 21:19:55 +02:00
e6fdd0f53d Fixed crash on empty routes 2023-05-07 21:15:44 +02:00
4 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,4 @@
version: 13.1.{build} version: 13.2.{build}
configuration: configuration:
- Release - Release

View File

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

View File

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

View File

@ -33,13 +33,16 @@ Path Route::path() const
Graph Route::gpsElevation() const Graph Route::gpsElevation() const
{ {
Graph graph; Graph graph;
graph.append(GraphSegment(QDateTime())); QDateTime date;
GraphSegment &gs = graph.last(); GraphSegment gs(date);
for (int i = 0; i < _data.size(); i++) for (int i = 0; i < _data.size(); i++)
if (_data.at(i).hasElevation()) if (_data.at(i).hasElevation())
gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation())); gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation()));
if (gs.size() >= 2)
graph.append(gs);
if (_data.style().color().isValid()) if (_data.style().color().isValid())
graph.setColor(_data.style().color()); graph.setColor(_data.style().color());
@ -49,8 +52,8 @@ Graph Route::gpsElevation() const
Graph Route::demElevation() const Graph Route::demElevation() const
{ {
Graph graph; Graph graph;
graph.append(GraphSegment(QDateTime())); QDateTime date;
GraphSegment &gs = graph.last(); GraphSegment gs(date);
for (int i = 0; i < _data.size(); i++) { for (int i = 0; i < _data.size(); i++) {
qreal dem = DEM::elevation(_data.at(i).coordinates()); qreal dem = DEM::elevation(_data.at(i).coordinates());
@ -58,6 +61,9 @@ Graph Route::demElevation() const
gs.append(GraphPoint(_distance.at(i), NAN, dem)); gs.append(GraphPoint(_distance.at(i), NAN, dem));
} }
if (gs.size() >= 2)
graph.append(gs);
if (_data.style().color().isValid()) if (_data.style().color().isValid())
graph.setColor(_data.style().color()); graph.setColor(_data.style().color());