summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/preferences
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-03-11 08:41:41 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-03-11 08:41:41 -0800
commit08284275e733fcea8b909b86fda503d4b24e0b84 (patch)
treeb2092172f09044d58efdae479447bae9b6c824ad /desktop-widgets/preferences
parentb8b858a9d299877969527ef5b3c4bde97bb86d05 (diff)
parent2b06a0b2234cf2779f80e87038011067be282bcb (diff)
downloadsubsurface-08284275e733fcea8b909b86fda503d4b24e0b84.tar.gz
Merge branch 'master' of https://github.com/dje29/subsurface
Diffstat (limited to 'desktop-widgets/preferences')
-rw-r--r--desktop-widgets/preferences/preferences_graph.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index 062f30a6f..8245e59a6 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -41,7 +41,7 @@ void PreferencesGraph::refreshSettings()
ui->show_ccr_sensors->setChecked(prefs.show_ccr_sensors);
ui->defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0);
ui->psro2rate->setValue(prefs.o2consumption / 1000.0);
- ui->pscrfactor->setValue(rint(1000.0 / prefs.pscr_ratio));
+ ui->pscrfactor->setValue(lrint(1000.0 / prefs.pscr_ratio));
ui->display_unused_tanks->setChecked(prefs.display_unused_tanks);
ui->show_average_depth->setChecked(prefs.show_average_depth);
@@ -50,9 +50,9 @@ void PreferencesGraph::refreshSettings()
void PreferencesGraph::syncSettings()
{
auto general = SettingsObjectWrapper::instance()->general_settings;
- general->setDefaultSetPoint(rint(ui->defaultSetpoint->value() * 1000.0));
- general->setO2Consumption(rint(ui->psro2rate->value() *1000.0));
- general->setPscrRatio(rint(1000.0 / ui->pscrfactor->value()));
+ general->setDefaultSetPoint(lrint(ui->defaultSetpoint->value() * 1000.0));
+ general->setO2Consumption(lrint(ui->psro2rate->value() *1000.0));
+ general->setPscrRatio(lrint(1000.0 / ui->pscrfactor->value()));
auto pp_gas = SettingsObjectWrapper::instance()->pp_gas;
pp_gas->setPheThreshold(ui->pheThreshold->value());