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

Fix metric/imperial in LTMSidebar

Browse Source 
The code uses the old global metric/imperial selector rather than the
new athlete specific setting.

Fixes #483.
This commit is contained in:
Mark Liversedge
2013-02-13 11:01:14 +00:00
parent 626b4243cc
commit a40389fbc0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/LTMSidebar.cpp
View File

@@ -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("<tr><td>%1:</td><td align=\"right\"> %2</td>")
.arg(s)
@@ -613,7 +610,7 @@ LTMSidebar::setSummary(DateRange dateRange)
} else {
summaryText += QString("<tr><td>%1(%2):</td><td align=\"right\"> %3</td>")
.arg(s)
.arg(metric ? metric->units(useMetricUnits) : "unknown")
.arg(metric ? metric->units(main->useMetricUnits) : "unknown")
.arg(value);
}
}