Add support for running power zones (Stryd) part 3

Final part: use the zones according to sport in metrics and charts
This commit is contained in:
Alejandro Martinez
2015-12-18 12:04:40 -03:00
parent 95479401d9
commit 078d4ac5ad
31 changed files with 195 additions and 189 deletions

View File

@@ -1552,13 +1552,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();