diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-13 13:18:31 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-09-13 14:05:26 -0700 |
| commit | 6769e21441e73c0a5687afeeed5bdd6d0bbf3e89 (patch) | |
| tree | 4fcb2cbac1b0ca6f31d2de10f985b620e311f573 /core | |
| parent | baa60e1077a517504516c576988b60595d70dd03 (diff) | |
| download | subsurface-6769e21441e73c0a5687afeeed5bdd6d0bbf3e89.tar.gz | |
Make the info window show all the pressures we have
We used to only show the first pressure we had, from back when we only
supported a single sensor.
Reported-by: Stefan Fuchs <sfuchs@gmx.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/profile.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/profile.c b/core/profile.c index c63ea8294..af9ebff28 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1309,14 +1309,19 @@ static void plot_string(struct plot_info *pi, struct plot_data *entry, struct me int pressurevalue, mod, ead, end, eadd; const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit; double depthvalue, tempvalue, speedvalue, sacvalue; - int decimals; + int decimals, cyl; const char *unit; depthvalue = get_depth_units(entry->depth, NULL, &depth_unit); put_format(b, translate("gettextFromC", "@: %d:%02d\nD: %.1f%s\n"), FRACTION(entry->sec, 60), depthvalue, depth_unit); - if (GET_PRESSURE(entry, 0)) { - pressurevalue = get_pressure_units(GET_PRESSURE(entry, 0), &pressure_unit); - put_format(b, translate("gettextFromC", "P: %d%s\n"), pressurevalue, pressure_unit); + for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) { + struct gasmix *mix; + int mbar = GET_PRESSURE(entry, cyl); + if (!mbar) + continue; + mix = &displayed_dive.cylinder[cyl].gasmix; + pressurevalue = get_pressure_units(mbar, &pressure_unit); + put_format(b, translate("gettextFromC", "P: %d%s (%s)\n"), pressurevalue, pressure_unit, gasname(mix)); } if (entry->temperature) { tempvalue = get_temp_units(entry->temperature, &temp_unit); |