diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-20 21:15:46 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 10:01:22 +1200 |
commit | 14700487730f3d5863ea810452c540d1bb4b9ca8 (patch) | |
tree | 49b48757dc517965354d3d43e2104c0e166aa5c9 | |
parent | b28e0bf0b9bf9ae0613aec25440eff2e2a7e85c3 (diff) | |
download | subsurface-14700487730f3d5863ea810452c540d1bb4b9ca8.tar.gz |
Filter: extend range of allowed temperatures
The temperature range 0-100 was inadequate in both supported
scales (Celsius and Fahrenheit). Extend the range to encompass
all physically meaningful values in both scales.
Use the default-values to set the minimum and maximum of the
UI-fields. Thus, these values are configurable in a single place.
In the future we should use a scale-independent representation
(e.g. mkelvin as in the rest of the code base). But this would
mean implementing a custom widget with a conversion function.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r-- | desktop-widgets/filterwidget2.cpp | 7 | ||||
-rw-r--r-- | qt-models/filtermodels.h | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/desktop-widgets/filterwidget2.cpp b/desktop-widgets/filterwidget2.cpp index f1898ca38..66080cfca 100644 --- a/desktop-widgets/filterwidget2.cpp +++ b/desktop-widgets/filterwidget2.cpp @@ -10,6 +10,13 @@ FilterWidget2::FilterWidget2(QWidget* parent) : QWidget(parent) ui.setupUi(this); FilterData data; + + // Use default values to set minimum and maximum air and water temperature. + ui.minAirTemp->setRange(data.minAirTemp, data.maxAirTemp); + ui.maxAirTemp->setRange(data.minAirTemp, data.maxAirTemp); + ui.minWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp); + ui.maxWaterTemp->setRange(data.minWaterTemp, data.maxWaterTemp); + ui.minRating->setCurrentStars(data.minRating); ui.maxRating->setCurrentStars(data.maxRating); ui.minVisibility->setCurrentStars(data.minVisibility); diff --git a/qt-models/filtermodels.h b/qt-models/filtermodels.h index f9be3a2ad..1925bc422 100644 --- a/qt-models/filtermodels.h +++ b/qt-models/filtermodels.h @@ -20,10 +20,13 @@ struct FilterData { int maxVisibility = 5; int minRating = 0; int maxRating = 5; - double minWaterTemp = 0; - double maxWaterTemp = 100; - double minAirTemp = 0; - double maxAirTemp = 100; + // The default minimum and maximum temperatures are set such that all + // physically reasonable dives are shown. Note that these values should + // work for both Celcius and Fahrenheit scales. + double minWaterTemp = -10; + double maxWaterTemp = 200; + double minAirTemp = -50; + double maxAirTemp = 200; QDateTime fromDate; QTime fromTime; QDateTime toDate = QDateTime::currentDateTime(); |