From bfcedf6caeff2b11e232ee0cb0ee527235e00e6a Mon Sep 17 00:00:00 2001 From: Tom Weichmann Date: Sat, 3 Mar 2012 15:27:10 -0500 Subject: [PATCH] Honour units in Realtime Plots --- src/DialWindow.cpp | 4 ++-- src/RealtimePlotWindow.cpp | 1 + src/RealtimePlotWindow.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/DialWindow.cpp b/src/DialWindow.cpp index 23f4a9c51..bd453197e 100644 --- a/src/DialWindow.cpp +++ b/src/DialWindow.cpp @@ -204,12 +204,12 @@ DialWindow::telemetryUpdate(const RealtimeData &rtData) case RealtimeData::Speed: case RealtimeData::VirtualSpeed: - if (!mainWindow->useMetricUnits) displayValue *= MILES_PER_KM; + if (!mainWindow->useMetricUnits) value *= MILES_PER_KM; valueLabel->setText(QString("%1").arg(value, 0, 'f', 1)); break; case RealtimeData::Distance: - if (!mainWindow->useMetricUnits) displayValue *= MILES_PER_KM; + if (!mainWindow->useMetricUnits) value *= MILES_PER_KM; valueLabel->setText(QString("%1").arg(value, 0, 'f', 3)); break; diff --git a/src/RealtimePlotWindow.cpp b/src/RealtimePlotWindow.cpp index b535f1e1e..cbe02f313 100644 --- a/src/RealtimePlotWindow.cpp +++ b/src/RealtimePlotWindow.cpp @@ -142,6 +142,7 @@ RealtimePlotWindow::telemetryUpdate(RealtimeData rtData) spdtot += spd; spdtot -= spdHist[spdindex]; spdHist[spdindex] = spd; spdindex++; if (spdindex >= rtPlot->smooth) spdindex = 0; spd = spdtot / rtPlot->smooth; + if (!mainWindow->useMetricUnits) spd *= MILES_PER_KM; rtPlot->spdData->addData(spd); // Power diff --git a/src/RealtimePlotWindow.h b/src/RealtimePlotWindow.h index d49bf7610..59590f97f 100644 --- a/src/RealtimePlotWindow.h +++ b/src/RealtimePlotWindow.h @@ -30,6 +30,7 @@ #include "RealtimeData.h" // for realtimedata structure #include "Settings.h" +#include "Units.h" #include "Colors.h" class RealtimePlotWindow : public GcWindow