Filter: support imperial units

1) Choose the correct conversion function for comparison.
2) Add a unit suffix to the fields.
3) Update the suffixes on change of preferences.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 18 insertions, 0 deletions

diff --git a/desktop-widgets/filterwidget2.cpp b/desktop-widgets/filterwidget2.cpp
index d6a8acad5..f1898ca38 100644
--- a/desktop-widgets/filterwidget2.cpp
+++ b/desktop-widgets/filterwidget2.cpp
@@ -1,5 +1,7 @@
 #include "desktop-widgets/filterwidget2.h"
 #include "desktop-widgets/simplewidgets.h"
+#include "core/qthelper.h"
+#include "core/settings/qPrefUnit.h"
 
 #include <QDoubleSpinBox>
 
@@ -32,6 +34,9 @@ FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent)
 	ui.toDate->setDate(data.toDate.date());
 	ui.toTime->setTime(data.toTime);
 
+	// Initialize temperature fields to display correct unit.
+	temperatureChanged();
+
 	connect(ui.maxRating, &StarWidget::valueChanged,
 		this, &FilterWidget2::updateFilter);
 
@@ -80,6 +85,19 @@ FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent)
 	connect(ui.logged, SIGNAL(stateChanged(int)), this, SLOT(updateLogged(int)));
 
 	connect(ui.planned, SIGNAL(stateChanged(int)), this, SLOT(updatePlanned(int)));
+
+	// Update temperature fields if user changes temperature-units in preferences.
+	connect(qPrefUnits::instance(), &qPrefUnits::temperatureChanged, this, &FilterWidget2::temperatureChanged);
+	connect(qPrefUnits::instance(), &qPrefUnits::unit_systemChanged, this, &FilterWidget2::temperatureChanged);
+}
+
+void FilterWidget2::temperatureChanged()
+{
+	QString temp = get_temp_unit();
+	ui.minAirTemp->setSuffix(temp);
+	ui.maxAirTemp->setSuffix(temp);
+	ui.minWaterTemp->setSuffix(temp);
+	ui.maxWaterTemp->setSuffix(temp);
 }
 
 void FilterWidget2::updateFilter()