mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/dje29/subsurface

Browse source
This commit is contained in:
Dirk Hohndel 2017-03-11 08:41:41 -08:00
commit 08284275e7
31 changed files with 210 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/preferences/preferences_graph.cpp
View file

@ -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());