mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

smtk-import fix is_same_cylinder()

Browse source 
Add return value to the gasmix condition, and fix the rest of the
conditions.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2017-03-17 23:10:36 +01:00 • committed by Dirk Hohndel
parent 5c757d5c38
commit e2fe196d82
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
smtk-import/smartrak.c
View file

@ -424,14 +424,15 @@ static void smtk_build_tank_info(MdbHandle *mdb, cylinder_t *tank, char *idx)
bool is_same_cylinder(cylinder_t *cyl_a, cylinder_t *cyl_b) bool is_same_cylinder(cylinder_t *cyl_a, cylinder_t *cyl_b)
{ {
// different gasmixes (non zero) // different gasmixes (non zero)
if (gasmix_distance(&cyl_a->gasmix, &cyl_b->gasmix) != 0 && if (cyl_a->gasmix.o2.permille - cyl_b->gasmix.o2.permille != 0 &&
cyl_a->gasmix.o2.permille != 0 && cyl_a->gasmix.o2.permille != 0 &&
cyl_b->gasmix.o2.permille != 0) cyl_b->gasmix.o2.permille != 0)
return false;
// different start pressures (possible error 0.1 bar) // different start pressures (possible error 0.1 bar)
if (!abs(cyl_a->start.mbar - cyl_b->start.mbar) <= 100) if (!(abs(cyl_a->start.mbar - cyl_b->start.mbar) <= 100))
return false; return false;
// different end pressures (possible error 0.1 bar) // different end pressures (possible error 0.1 bar)
if (!abs(cyl_a->end.mbar - cyl_b->end.mbar) <= 100) if (!(abs(cyl_a->end.mbar - cyl_b->end.mbar) <= 100))
return false; return false;
// different names (none of them null) // different names (none of them null)
if (!same_string(cyl_a->type.description, "---") && if (!same_string(cyl_a->type.description, "---") &&