From a40389fbc058a6607cd56a1703ce35a740f2cda2 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Wed, 13 Feb 2013 11:01:14 +0000 Subject: [PATCH] Fix metric/imperial in LTMSidebar The code uses the old global metric/imperial selector rather than the new athlete specific setting. Fixes #483. --- src/LTMSidebar.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/LTMSidebar.cpp b/src/LTMSidebar.cpp index 65fa44c1d..10f82b4f2 100644 --- a/src/LTMSidebar.cpp +++ b/src/LTMSidebar.cpp @@ -500,9 +500,6 @@ LTMSidebar::editEvent() void LTMSidebar::setSummary(DateRange dateRange) { - // are we metric? - bool useMetricUnits = (appsettings->value(this, GC_UNIT).toString() == "Metric"); - // where we construct the text QString summaryText(""); @@ -596,15 +593,15 @@ LTMSidebar::setSummary(DateRange dateRange) const RideMetric *metric = RideMetricFactory::instance().rideMetric(metricname); - QString value = SummaryMetrics::getAggregated(metricname, results, useMetricUnits); + QString value = SummaryMetrics::getAggregated(metricname, results, main->useMetricUnits); // Maximum Max and Average Average looks nasty, remove from name for display QString s = metric ? metric->name().replace(QRegExp(tr("^(Average|Max) ")), "") : "unknown"; // don't show units for time values - if (metric && (metric->units(useMetricUnits) == "seconds" || - metric->units(useMetricUnits) == tr("seconds") || - metric->units(useMetricUnits) == "")) { + if (metric && (metric->units(main->useMetricUnits) == "seconds" || + metric->units(main->useMetricUnits) == tr("seconds") || + metric->units(main->useMetricUnits) == "")) { summaryText += QString("%1: %2") .arg(s) @@ -613,7 +610,7 @@ LTMSidebar::setSummary(DateRange dateRange) } else { summaryText += QString("%1(%2): %3") .arg(s) - .arg(metric ? metric->units(useMetricUnits) : "unknown") + .arg(metric ? metric->units(main->useMetricUnits) : "unknown") .arg(value); } }