diff options
| -rw-r--r-- | dive.c | 25 | ||||
| -rw-r--r-- | statistics.c | 7 |
2 files changed, 19 insertions, 13 deletions
@@ -232,18 +232,23 @@ int get_duration_in_sec(struct dive *dive) int get_surface_pressure_in_mbar(const struct dive *dive, gboolean non_null) { - int count = 0, pressure = 0; + unsigned int count = 0, sum = 0; const struct divecomputer *dc = &dive->dc; + do { - if (dc->surface_pressure.mbar) { - pressure = (double)(count * pressure + dc->surface_pressure.mbar) / (count + 1) + 0.5; - count++; - } - dc = dc->next; - } while (dc); - if (!pressure && non_null) - pressure = SURFACE_PRESSURE; - return pressure; + if (!dc->surface_pressure.mbar) + continue; + sum += dc->surface_pressure.mbar; + count++; + } while ((dc = dc->next) != NULL); + + /* Did we have any dive computers with surface pressure information */ + if (count) + return (sum + count/2) / count; + + if (non_null) + return SURFACE_PRESSURE; + return 0; } static void update_temperature(temperature_t *temperature, int new) diff --git a/statistics.c b/statistics.c index 82070a937..d7abbc592 100644 --- a/statistics.c +++ b/statistics.c @@ -539,7 +539,7 @@ static void show_single_dive_stats(struct dive *dive) double value; int decimals; const char *unit; - int idx, offset, gas_used; + int idx, offset, gas_used, mbar; struct dive *prev_dive; struct tm tm; @@ -579,8 +579,9 @@ static void show_single_dive_stats(struct dive *dive) } else { set_label(single_w.air_temp, ""); } - if (get_surface_pressure_in_mbar(dive, FALSE)) { - set_label(single_w.air_press, "%d mbar", dive->dc.surface_pressure.mbar); + mbar = get_surface_pressure_in_mbar(dive, FALSE); + if (mbar) { + set_label(single_w.air_press, "%d mbar", mbar); } else { set_label(single_w.air_press, _("unknown")); } |