diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-20 21:01:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 10:01:22 +1200 |
| commit | b28e0bf0b9bf9ae0613aec25440eff2e2a7e85c3 (patch) | |
| tree | bd26af8d5394a2154f614229c318286c79b338df /qt-models/filtermodels.cpp | |
| parent | e8b0d165a78e802c09edc7dd0ea4ae5bed1d46d6 (diff) | |
| download | subsurface-b28e0bf0b9bf9ae0613aec25440eff2e2a7e85c3.tar.gz | |
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>
Diffstat (limited to 'qt-models/filtermodels.cpp')
| -rw-r--r-- | qt-models/filtermodels.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index 6efac8348..53149eba2 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -104,14 +104,13 @@ bool MultiFilterSortModel::showDive(const struct dive *d) const if (d->rating < filterData.minRating || d->rating > filterData.maxRating) return false; - // TODO: get the preferences for the imperial vs metric data. - // ignore the check if it doesn't makes sense. + auto temp_comp = prefs.units.temperature == units::CELSIUS ? C_to_mkelvin : F_to_mkelvin; if (d->watertemp.mkelvin && - (d->watertemp.mkelvin < C_to_mkelvin(filterData.minWaterTemp) || d->watertemp.mkelvin > C_to_mkelvin((filterData.maxWaterTemp)))) + (d->watertemp.mkelvin < (*temp_comp)(filterData.minWaterTemp) || d->watertemp.mkelvin > (*temp_comp)(filterData.maxWaterTemp))) return false; if (d->airtemp.mkelvin && - (d->airtemp.mkelvin < C_to_mkelvin(filterData.minAirTemp) || d->airtemp.mkelvin > C_to_mkelvin(filterData.maxAirTemp))) + (d->airtemp.mkelvin < (*temp_comp)(filterData.minAirTemp) || d->airtemp.mkelvin > (*temp_comp)(filterData.maxAirTemp))) return false; QDateTime t = filterData.fromDate; |