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

Show Pace in Summary as mm:ss

Browse Source 
Fixes #423
This commit is contained in:
Mark Liversedge
2013-01-05 15:00:06 +00:00
parent c9439b5ffd
commit acae351030
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/IntervalSummaryWindow.cpp
View File

@@ -106,7 +106,9 @@ void IntervalSummaryWindow::calcInterval(IntervalItem* interval, QString& html)
if (m->units(metricUnits) == "seconds" ||
m->units(metricUnits) == tr("seconds"))
html += s.arg(time_to_string(m->value(metricUnits)));
else
else if (m->internalName() == "Pace") {
html += s.arg(QTime(0,0,0,0).addSecs(m->value(metricUnits)*60).toString("mm:ss"));
} else
html += s.arg(m->value(metricUnits), 0, 'f', m->precision());
html += "<td align=\"left\" valign=\"bottom\">";

14
src/RideSummaryWindow.cpp
View File

@@ -319,14 +319,24 @@ RideSummaryWindow::htmlSummary() const
// temperature is a special case, if it is not present fall back to metadata tag
// if that is not present then just display '-'
if ((symbol == "average_temp" || symbol == "max_temp") && metrics.getForSymbol(symbol) == RideFile::noTemp)
s = s.arg(ride->getTag("Temperature", "-"));
else {
else if (m->internalName() == "Pace") { // pace is mm:ss
double pace;
if (ridesummary) pace = metrics.getForSymbol(symbol) * (useMetricUnits ? 1 : m->conversion()) + (useMetricUnits ? 0 : m->conversionSum());
else pace = SummaryMetrics::getAggregated(symbol, data, useMetricUnits).toDouble();
s = s.arg(QTime(0,0,0,0).addSecs(pace*60).toString("mm:ss"));
} else {
// get the value - from metrics or from data array
if (ridesummary) s = s.arg(metrics.getForSymbol(symbol) * (useMetricUnits ? 1 : m->conversion())
+ (useMetricUnits ? 0 : m->conversionSum()), 0, 'f', m->precision());
else s = s.arg(SummaryMetrics::getAggregated(symbol, data, useMetricUnits));
}
}
}
summary += s;