diff options
| author |  Jeremie Guichard <djebrest@gmail.com> | 2017-03-23 08:13:49 +0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-24 09:39:25 -0700 |
| commit | 597539ce39ab1054851f5aa96daa0fff29699e8f (patch) | |
| tree | 281045e31b92d9952055c954a45883dcb8e02ca3 /desktop-widgets/diveplanner.cpp | |
| parent | d83449f3b56c5dbdfbe0f8e5ae908179ba1d6419 (diff) | |
| download | subsurface-597539ce39ab1054851f5aa96daa0fff29699e8f.tar.gz | |
Fix double to int truncation in C++ code
Wfloat-conversion enabled for C++ part of the code
Fix warnings raised by the flag using lrint
Original issue reported on the mailing list:
The ascent/descent rates are sometimes not what is expected.
E.g. setting the ascent rate to 10m/min results in an actual
ascent rate of 9m/min.
This is due to truncating the ascent rate preference,
then effectively rounding up the time to reach each stop to 2s intervals.
The result being that setting the ascent rate to 10m/min
results in 20s to ascend 3m (9m/min), when it should be exactly 18s.
Reported-by: John Smith <noseygit@hotmail.com>
Reported-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
Diffstat (limited to 'desktop-widgets/diveplanner.cpp')
| -rw-r--r-- | desktop-widgets/diveplanner.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index 4fc38cd2a..9dce53da8 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -228,7 +228,7 @@ void DivePlannerWidget::heightChanged(const int height) void DivePlannerWidget::salinityChanged(const double salinity) { /* Salinity is expressed in weight in grams per 10l */ - plannerModel->setSalinity(10000 * salinity); + plannerModel->setSalinity(lrint(10000 * salinity)); } void PlannerSettingsWidget::bottomSacChanged(const double bottomSac) @@ -478,27 +478,27 @@ void PlannerSettingsWidget::printDecoPlan() void PlannerSettingsWidget::setAscRate75(int rate) { - SettingsObjectWrapper::instance()->planner_settings->setAscrate75(rate * UNIT_FACTOR); + SettingsObjectWrapper::instance()->planner_settings->setAscrate75(lrint(rate * UNIT_FACTOR)); } void PlannerSettingsWidget::setAscRate50(int rate) { - SettingsObjectWrapper::instance()->planner_settings->setAscrate50(rate * UNIT_FACTOR); + SettingsObjectWrapper::instance()->planner_settings->setAscrate50(lrint(rate * UNIT_FACTOR)); } void PlannerSettingsWidget::setAscRateStops(int rate) { - SettingsObjectWrapper::instance()->planner_settings->setAscratestops(rate * UNIT_FACTOR); + SettingsObjectWrapper::instance()->planner_settings->setAscratestops(lrint(rate * UNIT_FACTOR)); } void PlannerSettingsWidget::setAscRateLast6m(int rate) { - SettingsObjectWrapper::instance()->planner_settings->setAscratelast6m(rate * UNIT_FACTOR); + SettingsObjectWrapper::instance()->planner_settings->setAscratelast6m(lrint(rate * UNIT_FACTOR)); } void PlannerSettingsWidget::setDescRate(int rate) { - SettingsObjectWrapper::instance()->planner_settings->setDescrate(rate * UNIT_FACTOR); + SettingsObjectWrapper::instance()->planner_settings->setDescrate(lrint(rate * UNIT_FACTOR)); } void PlannerSettingsWidget::sacFactorChanged(const double factor) |