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

Added speed data source setting

Browse Source
This commit is contained in:
Martin Tůma
2018-06-21 20:54:24 +02:00
parent 1cd726691e
commit fc18283172
6 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/track.cpp
View File

@ -10,6 +10,7 @@ qreal Track::_pauseSpeed = 0.5;
int Track::_pauseInterval = 10;
bool Track::_outlierEliminate = true;
bool Track::_useReportedSpeed = false;
static qreal median(QVector<qreal> &v)
@ -91,12 +92,11 @@ Track::Track(const TrackData &data) : _data(data)
if (dt < 1e-3) {
_speed.append(_speed.at(i-1));
acceleration.append(acceleration.at(i-1));
continue;
} else {
_speed.append(ds / dt);
qreal dv = _speed.at(i) - _speed.at(i-1);
acceleration.append(dv / dt);
}
_speed.append(ds / dt);
qreal dv = _speed.at(i) - _speed.at(i-1);
acceleration.append(dv / dt);
}
_pause = 0;
@ -166,7 +166,8 @@ Graph Track::speed() const
|| _data.at(i).hasSpeed())) {
v = 0;
stop.append(raw.size());
} else if (_data.at(i).hasSpeed() && !_outliers.contains(i))
} else if (_useReportedSpeed && _data.at(i).hasSpeed()
&& !_outliers.contains(i))
v = _data.at(i).speed();
else if (!std::isnan(_speed.at(i)) && !_outliers.contains(i))
v = _speed.at(i);

4
src/data/track.h
View File

@ -42,6 +42,7 @@ public:
static void setPauseInterval(int interval) {_pauseInterval = interval;}
static void setOutlierElimination(bool eliminate)
{_outlierEliminate = eliminate;}
static void useReportedSpeed(bool use) {_useReportedSpeed = use;}
private:
bool discardStopPoint(int i) const;
@ -58,15 +59,14 @@ private:
qreal _pause;
static bool _outlierEliminate;
static int _elevationWindow;
static int _speedWindow;
static int _heartRateWindow;
static int _cadenceWindow;
static int _powerWindow;
static qreal _pauseSpeed;
static int _pauseInterval;
static bool _useReportedSpeed;
};
#endif // TRACK_H