nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1739 from amtriathlon/stryd

Browse Source 
Add support for running power zones (Stryd) part 3
This commit is contained in:
Mark Liversedge
2015-12-21 15:51:50 +00:00
parent 5f696809a8 2ee0b93e84
commit 1fc1aaaa65
32 changed files with 196 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/DataFilter.cpp
View File

@@ -1543,13 +1543,13 @@ Result Leaf::eval(DataFilterRuntime *df, Leaf *leaf, float x, RideItem *m, RideF
double PMAX = 0;
int zoneRange;
if (m->context->athlete->zones()) {
if (m->context->athlete->zones(m->isRun)) {
// if range is -1 we need to fall back to a default value
zoneRange = m->context->athlete->zones()->whichRange(m->dateTime.date());
CP = zoneRange >= 0 ? m->context->athlete->zones()->getCP(zoneRange) : 0;
WPRIME = zoneRange >= 0 ? m->context->athlete->zones()->getWprime(zoneRange) : 0;
PMAX = zoneRange >= 0 ? m->context->athlete->zones()->getPmax(zoneRange) : 0;
zoneRange = m->context->athlete->zones(m->isRun)->whichRange(m->dateTime.date());
CP = zoneRange >= 0 ? m->context->athlete->zones(m->isRun)->getCP(zoneRange) : 0;
WPRIME = zoneRange >= 0 ? m->context->athlete->zones(m->isRun)->getWprime(zoneRange) : 0;
PMAX = zoneRange >= 0 ? m->context->athlete->zones(m->isRun)->getPmax(zoneRange) : 0;
// did we override CP in metadata ?
int oCP = m->getText("CP","0").toInt();