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

Make pO2 settings functional in planner

Browse source 
Spin boxes for pO2 are now hooked up to preference values. Adding new
cylinders (or changing their fo2) computes the MOD accordin to the current
value of decopo2. Note that chaning the limits for deco pO2 does _not_
automatically update the switch depth of all cylinders as those might have
been manually entered.

Furthermore, MOD has now to option of rounding to multiples of a given
depth. That is used for the automatic switch depth which are now always
multiples of 3m (so that EAN50 is switched to at 21m rather than 22m).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2014-06-25 14:00:03 +02:00 • committed by Dirk Hohndel
parent c7231adde1
commit 65c5d6815c
8 changed files with 58 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
qt-ui/diveplanner.cpp
View file

@ -347,6 +347,8 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
ui.ascRateStops->setValue(prefs.ascratestops / UNIT_FACTOR);
ui.ascRateLast6m->setValue(prefs.ascratelast6m / UNIT_FACTOR);
ui.descRate->setValue(prefs.descrate / UNIT_FACTOR);
ui.bottompo2->setValue(prefs.bottompo2 / 1000.0);
ui.decopo2->setValue(prefs.decopo2 / 1000.0);
connect(ui.lastStop, SIGNAL(toggled(bool)), plannerModel, SLOT(setLastStop6m(bool)));
connect(ui.verbatim_plan, SIGNAL(toggled(bool)), plannerModel, SLOT(setVerbatim(bool)));
@ -363,6 +365,8 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
connect(ui.ascRateLast6m, SIGNAL(valueChanged(int)), plannerModel, SLOT(emitDataChanged()));
connect(ui.descRate, SIGNAL(valueChanged(int)), this, SLOT(setDescRate(int)));
connect(ui.descRate, SIGNAL(valueChanged(int)), plannerModel, SLOT(emitDataChanged()));
connect(ui.bottompo2, SIGNAL(valueChanged(double)), this, SLOT(setBottomPo2(double)));
connect(ui.decopo2, SIGNAL(valueChanged(double)), this, SLOT(setDecoPo2(double)));
setMinimumWidth(0);
setMinimumHeight(0);
@ -413,6 +417,17 @@ void PlannerSettingsWidget::setDescRate(int rate)
prefs.descrate = rate * UNIT_FACTOR;
}
void PlannerSettingsWidget::setBottomPo2(double po2)
{
prefs.bottompo2 = (int) (po2 * 1000.0);
}
void PlannerSettingsWidget::setDecoPo2(double po2)
{
prefs.decopo2 = (int) (po2 * 1000.0);
}
void DivePlannerPointsModel::setPlanMode(Mode m)
{
mode = m;
@ -678,8 +693,9 @@ bool DivePlannerPointsModel::addGas(struct gasmix mix)
/* The depth to change to that gas is given by the depth where its pO₂ is 1.6 bar.
* The user should be able to change this depth manually. */
pressure_t modpO2;
modpO2.mbar = 1600;
cyl->depth = gas_mod(&mix, modpO2);
modpO2.mbar = prefs.decopo2;
cyl->depth = gas_mod(&mix, modpO2, 3000);
CylindersModel::instance()->setDive(stagingDive);
return true;
}