diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-03-10 07:22:31 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-03-11 08:03:25 -0800 |
| commit | 295b1b78d888b528f7a5a23411b1a82d4b39eed1 (patch) | |
| tree | e41ef5bb9fcfbdec3c536be1cb653faac047d81e /desktop-widgets | |
| parent | af96ec5d04b09a87696b3f292bc5ad5378d26f75 (diff) | |
| download | subsurface-295b1b78d888b528f7a5a23411b1a82d4b39eed1.tar.gz | |
Make depth conversion work for negative depths
This is needed in the altitude pressure conversion as there
negative altitudes are possible (for diving in the netherlands
or the Dead Sea).
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/diveplanner.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index 8b3a9a5e9..f322ccdde 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -750,7 +750,7 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsSuuntoVyper() deviceDetails->lightEnabled = ui.lightCheckBox->isChecked(); deviceDetails->light = ui.lightSpinBox->value(); deviceDetails->alarmDepthEnabled = ui.alarmDepthCheckBox->isChecked(); - deviceDetails->alarmDepth = units_to_depth(ui.alarmDepthDoubleSpinBox->value()); + deviceDetails->alarmDepth = units_to_depth(ui.alarmDepthDoubleSpinBox->value()).mm; deviceDetails->alarmTimeEnabled = ui.alarmTimeCheckBox->isChecked(); deviceDetails->alarmTime = ui.alarmTimeSpinBox->value(); } diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index 82b83c3ad..207d1208a 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -217,7 +217,7 @@ void DivePlannerWidget::atmPressureChanged(const int pressure) void DivePlannerWidget::heightChanged(const int height) { - int pressure = (int) (1013.0 * exp(- (double) units_to_depth((double) height) / 7800000.0)); + int pressure = (int) (1013.0 * exp(- (double) units_to_depth((double) height).mm / 7800000.0)); ui.ATMPressure->blockSignals(true); ui.ATMPressure->setValue(pressure); ui.ATMPressure->blockSignals(false); @@ -525,7 +525,7 @@ void PlannerSettingsWidget::setDecoPo2(double po2) void PlannerSettingsWidget::setBestmixEND(int depth) { - SettingsObjectWrapper::instance()->planner_settings->setBestmixend(units_to_depth(depth)); + SettingsObjectWrapper::instance()->planner_settings->setBestmixend(units_to_depth(depth).mm); } void PlannerSettingsWidget::setBackgasBreaks(bool dobreaks) |