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

Fix up the statistics page use of pressure data

Browse source 
The statistics page calculates air use separately, and also needs to be
fixed up for the split of the pressures into sample-vs-start/end.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-11-09 08:06:17 -08:00
parent c32cff2c6b
commit 66c04f4f47
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
statistics.c
View file

@ -165,11 +165,14 @@ void show_dive_stats(struct dive *dive)
/* for the O2/He readings just create a list of them */
for (idx = 0; idx < MAX_CYLINDERS; idx++) {
cylinder_t *cyl = &dive->cylinder[idx];
unsigned int start, end;
start = cyl->start.mbar ? : cyl->sample_start.mbar;
end = cyl->end.mbar ? : cyl->sample_end.mbar;
/* we assume that every valid cylinder has either a working pressure
* or a size; but for good measure let's also accept cylinders with
* a starting or ending pressure*/
if (cyl->type.workingpressure.mbar || cyl->type.size.mliter ||
cyl->start.mbar || cyl->end.mbar) {
if (cyl->type.workingpressure.mbar || cyl->type.size.mliter || start || end) {
/* 0% O2 strangely means air, so 21% - I don't like that at all */
int o2 = cyl->gasmix.o2.permille ? : 209;
if (offset > 0) {
@ -182,9 +185,8 @@ void show_dive_stats(struct dive *dive)
}
/* and if we have size, start and end pressure, we can
* calculate the total gas used */
if (cyl->type.size.mliter && cyl->start.mbar && cyl->end.mbar)
gas_used += cyl->type.size.mliter / 1000.0 *
(cyl->start.mbar - cyl->end.mbar);
if (cyl->type.size.mliter && start && end)
gas_used += cyl->type.size.mliter / 1000.0 * (start - end);
}
set_label(info_stat_w.o2he, buf);
if (gas_used) {