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 b7eadf9fb1 faff84a552
commit c6d2fef46c
32 changed files with 196 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/RideFileCache.cpp
View File

@@ -1428,14 +1428,14 @@ RideFileCache::computeDistribution(QVector<float> &array, RideFile::SeriesType s
if (ride->isDataPresent(needSeries) == false) return;
// get zones that apply, if any
int zoneRange = context->athlete->zones() ? context->athlete->zones()->whichRange(ride->startTime().date()) : -1;
int zoneRange = context->athlete->zones(ride->isRun()) ? context->athlete->zones(ride->isRun())->whichRange(ride->startTime().date()) : -1;
int hrZoneRange = context->athlete->hrZones() ? context->athlete->hrZones()->whichRange(ride->startTime().date()) : -1;
int paceZoneRange = context->athlete->paceZones(ride->isSwim()) ? context->athlete->paceZones(ride->isSwim())->whichRange(ride->startTime().date()) : -1;
if (zoneRange != -1) CP=context->athlete->zones()->getCP(zoneRange);
if (zoneRange != -1) CP=context->athlete->zones(ride->isRun())->getCP(zoneRange);
else CP=0;
if (zoneRange != -1) WPRIME=context->athlete->zones()->getWprime(zoneRange);
if (zoneRange != -1) WPRIME=context->athlete->zones(ride->isRun())->getWprime(zoneRange);
else WPRIME=0;
if (hrZoneRange != -1) LTHR=context->athlete->hrZones()->getLT(hrZoneRange);
@@ -1494,7 +1494,7 @@ RideFileCache::computeDistribution(QVector<float> &array, RideFile::SeriesType s
// watts time in zone
if (series == RideFile::watts && zoneRange != -1) {
int index = context->athlete->zones()->whichZone(zoneRange, dp->value(series));
int index = context->athlete->zones(ride->isRun())->whichZone(zoneRange, dp->value(series));
if (index >=0) wattsTimeInZone[index] += ride->recIntSecs();
}