diff --git a/src/IntervalSummaryWindow.cpp b/src/IntervalSummaryWindow.cpp
index 27b3b55d7..df64d4259 100644
--- a/src/IntervalSummaryWindow.cpp
+++ b/src/IntervalSummaryWindow.cpp
@@ -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 += "
";
diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp
index d463167d4..0ee5c7658 100644
--- a/src/RideSummaryWindow.cpp
+++ b/src/RideSummaryWindow.cpp
@@ -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;
|