nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Datafilter samples() honor interval specification

Browse Source 
.. the data filter is passed a spec to use for iterating over
   ride samples, but it was being ignored.

[publish binaries]
This commit is contained in:
Mark Liversedge
2020-06-24 20:35:50 +01:00
parent a27065673c
commit 9bdbf22f7c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/DataFilter.cpp
View File

@@ -3551,10 +3551,16 @@ Result Leaf::eval(DataFilterRuntime *df, Leaf *leaf, float x, long it, RideItem
} else {
// usual activity samples; HR, Power etc
foreach(RideFilePoint *p, m->ride()->dataPoints()) {
double value=p->value(leaf->seriesType);
returning.number += value;
returning.vector.append(value);
if (!s.isEmpty(m->ride())) {
// spec may limit to an interval
RideFileIterator it(m->ride(), s);
while(it.hasNext()) {
struct RideFilePoint *p = it.next();
double value=p->value(leaf->seriesType);
returning.number += value;
returning.vector.append(value);
}
}
}
return returning;