root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Fixed broken graphs when data contains empty segments

Browse Source 
fixes #490
This commit is contained in:
Martin Tůma 2023-04-10 10:00:30 +02:00
parent b6ca28e159
commit 52ea52ff4e
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/data/track.cpp
View File

@ -88,6 +88,24 @@ static GraphSegment filter(const GraphSegment &g, int window)
} }
qreal Track::lastDistance(int seg)
{
for (int i = seg - 1; i >= 0; i--)
if (!_segments.at(i).distance.isEmpty())
return _segments.at(i).distance.last();
return 0;
}
qreal Track::lastTime(int seg)
{
for (int i = seg - 1; i >= 0; i--)
if (!_segments.at(i).time.isEmpty())
return _segments.at(i).time.last();
return 0;
}
Track::Track(const TrackData &data) : _pause(0) Track::Track(const TrackData &data) : _pause(0)
{ {
qreal ds, dt; qreal ds, dt;
@ -113,11 +131,8 @@ Track::Track(const TrackData &data) : _pause(0)
Segment &seg = _segments.last(); Segment &seg = _segments.last();
seg.distance.append(i && !_segments.at(i-1).distance.isEmpty() seg.distance.append(lastDistance(i));
? _segments.at(i-1).distance.last() : 0); seg.time.append(sd.first().hasTimestamp() ? lastTime(i) : NAN);
seg.time.append(i && !_segments.at(i-1).time.isEmpty()
? _segments.at(i-1).time.last() :
sd.first().hasTimestamp() ? 0 : NAN);
seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN); seg.speed.append(sd.first().hasTimestamp() ? 0 : NAN);
acceleration.append(sd.first().hasTimestamp() ? 0 : NAN); acceleration.append(sd.first().hasTimestamp() ? 0 : NAN);
bool hasTime = !std::isnan(seg.time.first()); bool hasTime = !std::isnan(seg.time.first());

2
src/data/track.h
View File

@ -63,6 +63,8 @@ private:
QSet<int> stop; QSet<int> stop;
}; };
qreal lastDistance(int seg);
qreal lastTime(int seg);
bool discardStopPoint(const Segment &seg, int i) const; bool discardStopPoint(const Segment &seg, int i) const;
Graph demElevation() const; Graph demElevation() const;