1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-04-21 12:49:10 +02:00

Compare commits

..

No commits in common. "9b3c11cc68541ce912ab6c70dd81f46a30191925" and "d9c0770b5150557823d826fdb4ed660eb973898e" have entirely different histories.

4 changed files with 7 additions and 13 deletions

View File

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

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 13.2 VERSION = 13.1
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.2" !define VERSION "13.1"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -33,16 +33,13 @@ Path Route::path() const
Graph Route::gpsElevation() const Graph Route::gpsElevation() const
{ {
Graph graph; Graph graph;
QDateTime date; graph.append(GraphSegment(QDateTime()));
GraphSegment gs(date); GraphSegment &gs = graph.last();
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());
@ -52,8 +49,8 @@ Graph Route::gpsElevation() const
Graph Route::demElevation() const Graph Route::demElevation() const
{ {
Graph graph; Graph graph;
QDateTime date; graph.append(GraphSegment(QDateTime()));
GraphSegment gs(date); GraphSegment &gs = graph.last();
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());
@ -61,9 +58,6 @@ 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());