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

Add some gas mix validation to the planner

Browse source 
A few basic rules for gas validation:
	We can't have <0%, or >100% of either O2 or He
	O2 + He must not be >100%
	Switch depth can't be <0%

This places limits on user-input values

Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Rick Walsh 2016-05-22 11:00:22 +10:00 • committed by Dirk Hohndel
parent 47a2e8b1d9
commit 8acbeed555
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/qthelper.cpp
View file

@ -1253,6 +1253,8 @@ depth_t string_to_depth(const char *str)
QString local_m = QObject::tr("m"); QString local_m = QObject::tr("m");
depth_t depth; depth_t depth;
if (value < 0)
value = 0;
if (rest.startsWith("m") || rest.startsWith(local_m)) if (rest.startsWith("m") || rest.startsWith(local_m))
goto m; goto m;
if (rest.startsWith("ft") || rest.startsWith(local_ft)) if (rest.startsWith("ft") || rest.startsWith(local_ft))
@ -1328,6 +1330,13 @@ fraction_t string_to_fraction(const char *str)
fraction_t fraction; fraction_t fraction;
fraction.permille = rint(value * 10); fraction.permille = rint(value * 10);
/*
* Don't permit values less than zero or greater than 100%
*/
if (fraction.permille < 0)
fraction.permille = 0;
else if (fraction.permille > 1000)
fraction.permille = 1000;
return fraction; return fraction;
} }

6
qt-models/cylindermodel.cpp
View file

@ -249,6 +249,9 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
case O2: case O2:
if (CHANGED()) { if (CHANGED()) {
cyl->gasmix.o2 = string_to_fraction(vString.toUtf8().data()); cyl->gasmix.o2 = string_to_fraction(vString.toUtf8().data());
// fO2 + fHe must not be greater than 1
if (((cyl->gasmix.o2.permille == 0) ? O2_IN_AIR : cyl->gasmix.o2.permille) + cyl->gasmix.he.permille > 1000)
cyl->gasmix.he.permille = 1000 - ((cyl->gasmix.o2.permille == 0) ? O2_IN_AIR : cyl->gasmix.o2.permille);
pressure_t modpO2; pressure_t modpO2;
if (displayed_dive.dc.divemode == PSCR) if (displayed_dive.dc.divemode == PSCR)
modpO2.mbar = prefs.decopo2 + (1000 - get_o2(&cyl->gasmix)) * SURFACE_PRESSURE * modpO2.mbar = prefs.decopo2 + (1000 - get_o2(&cyl->gasmix)) * SURFACE_PRESSURE *
@ -262,6 +265,9 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
case HE: case HE:
if (CHANGED()) { if (CHANGED()) {
cyl->gasmix.he = string_to_fraction(vString.toUtf8().data()); cyl->gasmix.he = string_to_fraction(vString.toUtf8().data());
// fO2 + fHe must not be greater than 1
if (((cyl->gasmix.o2.permille == 0) ? O2_IN_AIR : cyl->gasmix.o2.permille) + cyl->gasmix.he.permille > 1000)
cyl->gasmix.o2.permille = 1000 - cyl->gasmix.he.permille;
changed = true; changed = true;
} }
break; break;