nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Spline resampling

Browse Source 
.. should be periodic not natural

.. should apply to sub-second samples too !
This commit is contained in:
Mark Liversedge
2014-11-09 09:48:59 +00:00
parent 693da5fadd
commit da73b072ed
1 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/WPrime.cpp
View File

@@ -110,58 +110,42 @@ WPrime::setRide(RideFile *input)
last=0;
double offset = 0; // always start from zero seconds (e.g. intervals start at and offset in ride)
bool first = true;
if (input->recIntSecs() >= 1) {
RideFilePoint *lp=NULL;
foreach(RideFilePoint *p, input->dataPoints()) {
// yuck! nasty data
if (p->secs > (25*60*60)) return;
RideFilePoint *lp=NULL;
foreach(RideFilePoint *p, input->dataPoints()) {
if (first) {
offset = p->secs;
first = false;
}
// yuck! nasty data
if (p->secs > (25*60*60)) return;
// fill gaps in recording with zeroes
if (lp)
for(int t=lp->secs+input->recIntSecs();
(t + input->recIntSecs()) < p->secs;
t += input->recIntSecs()) {
points << QPointF(t-offset, 0);
pointsd << QPointF(t-offset, p->km * convert); // not zero !!!! this is a map from secs -> km not a series
}
// lets not go backwards -- or two sampls at the same time
if ((lp && p->secs > lp->secs) || !lp) {
points << QPointF(p->secs - offset, p->watts);
pointsd << QPointF(p->secs - offset, p->km * convert);
}
// update state
last = p->secs - offset;
lp = p;
if (first) {
offset = p->secs;
first = false;
}
} else {
foreach(RideFilePoint *p, input->dataPoints()) {
// yuck! nasty data
if (p->secs > (25*60*60)) return;
if (first) {
offset = p->secs;
first = false;
// fill gaps in recording with zeroes
if (lp)
for(double t=lp->secs+input->recIntSecs();
(t + input->recIntSecs()) < p->secs;
t += input->recIntSecs()) {
points << QPointF(t-offset, 0);
pointsd << QPointF(t-offset, p->km * convert); // not zero !!!! this is a map from secs -> km not a series
}
// lets not go backwards -- or two sampls at the same time
if ((lp && p->secs > lp->secs) || !lp) {
points << QPointF(p->secs - offset, p->watts);
pointsd << QPointF(p->secs - offset, p->km * convert);
last = p->secs - offset;
}
// update state
last = p->secs - offset;
lp = p;
}
// Create a spline
distance.setSplineType(QwtSpline::Natural);
distance.setSplineType(QwtSpline::Periodic);
distance.setPoints(QPolygonF(pointsd));
smoothed.setSplineType(QwtSpline::Natural);
smoothed.setSplineType(QwtSpline::Periodic);
smoothed.setPoints(QPolygonF(points));
// Get CP