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

Don't summarise power zones on runs

Browse Source 
.. will need to show pace when its ready
This commit is contained in:
Mark Liversedge
2014-09-26 14:45:20 +01:00
parent 27f23fe4f9
commit 454e8c2cc5
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/RideSummaryWindow.cpp
View File

@@ -722,44 +722,52 @@ RideSummaryWindow::htmlSummary()
int numzones = 0;
int range = -1;
// get zones to use via ride for ridesummary
if (ridesummary && rideItem) {
if (ridesummary && rideItem && rideItem->ride() && rideItem->ride()->isRun()) {
numzones = rideItem->numZones();
range = rideItem->zoneRange();
// no power zones on a run, should show pace here ...
// ... when we have pace zones implemented
// or for end of daterange plotted for daterange summary
} else if (context->athlete->zones()) {
} else {
// get from end if period
range = context->athlete->zones()->whichRange(myDateRange.to);
if (range > -1) numzones = context->athlete->zones()->numZones(range);
if (ridesummary && rideItem) {
// get zones to use via ride for ridesummary
}
numzones = rideItem->numZones();
range = rideItem->zoneRange();
if (range > -1 && numzones > 0) {
QVector<double> time_in_zone(numzones);
for (int i = 0; i < numzones; ++i) {
// or for end of daterange plotted for daterange summary
} else if (context->athlete->zones()) {
// get from end if period
range = context->athlete->zones()->whichRange(myDateRange.to);
if (range > -1) numzones = context->athlete->zones()->numZones(range);
// if using metrics or data
if (ridesummary) time_in_zone[i] = metrics.getForSymbol(timeInZones[i]);
else {
QStringList filterList = filters;
if (context->ishomefiltered) {
if (filtered) {
foreach (QString file, filters) {
if (context->homeFilters.contains(file))
filterList << file;
}
} else {
filterList = context->homeFilters;
}
}
time_in_zone[i] = SummaryMetrics::getAggregated(context, timeInZones[i], data, filterList, context->ishomefiltered || filtered, useMetricUnits, true).toDouble();
}
}
summary += tr("<h3>Power Zones</h3>");
summary += context->athlete->zones()->summarize(range, time_in_zone, altColor); //aggregating
if (range > -1 && numzones > 0) {
QVector<double> time_in_zone(numzones);
for (int i = 0; i < numzones; ++i) {
// if using metrics or data
if (ridesummary) time_in_zone[i] = metrics.getForSymbol(timeInZones[i]);
else {
QStringList filterList = filters;
if (context->ishomefiltered) {
if (filtered) {
foreach (QString file, filters) {
if (context->homeFilters.contains(file))
filterList << file;
}
} else {
filterList = context->homeFilters;
}
}
time_in_zone[i] = SummaryMetrics::getAggregated(context, timeInZones[i], data, filterList, context->ishomefiltered || filtered, useMetricUnits, true).toDouble();
}
}
summary += tr("<h3>Power Zones</h3>");
summary += context->athlete->zones()->summarize(range, time_in_zone, altColor); //aggregating
}
}
//