From b8c7992bbfe03dce665cbd5ba6144b0c8b59b6fd Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 8 Feb 2013 20:10:47 -0800 Subject: Improve calculation of maxtemp and mintemp of dive The existing code only populated the maxtemp based on the samples of a dive and then in statistics.c checked if there was no such temperature and replaced it with the water temperature of the first divecomputer. It makes much more sense to add the water temperature information in every divecomputer to the min / max calculation during the dive fixup phase. Signed-off-by: Dirk Hohndel --- dive.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'dive.c') diff --git a/dive.c b/dive.c index 95d946025..bccf753df 100644 --- a/dive.c +++ b/dive.c @@ -259,13 +259,13 @@ static void fixup_pressure(struct dive *dive, struct sample *sample) cyl->sample_end.mbar = pressure; } -static void update_min_max_temperatures(struct dive *dive, struct sample *sample) +static void update_min_max_temperatures(struct dive *dive, temperature_t temperature) { - if (sample->temperature.mkelvin) { - if (!dive->maxtemp.mkelvin || sample->temperature.mkelvin > dive->maxtemp.mkelvin) - dive->maxtemp = sample->temperature; - if (!dive->mintemp.mkelvin || sample->temperature.mkelvin < dive->mintemp.mkelvin) - dive->mintemp = sample->temperature; + if (temperature.mkelvin) { + if (!dive->maxtemp.mkelvin || temperature.mkelvin > dive->maxtemp.mkelvin) + dive->maxtemp = temperature; + if (!dive->mintemp.mkelvin || temperature.mkelvin < dive->mintemp.mkelvin) + dive->mintemp = temperature; } } @@ -510,6 +510,7 @@ static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc) int lasttemp = 0, lastpressure = 0; int pressure_delta[MAX_CYLINDERS] = {INT_MAX, }; + update_min_max_temperatures(dive, dc->watertemp); for (i = 0; i < dc->samples; i++) { struct sample *sample = dc->sample + i; int time = sample->time.seconds; @@ -566,7 +567,7 @@ static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc) if (!mintemp || temp < mintemp) mintemp = temp; } - update_min_max_temperatures(dive, sample); + update_min_max_temperatures(dive, sample->temperature); depthtime += (time - lasttime) * (lastdepth + depth) / 2; lastdepth = depth; -- cgit v1.2.3-70-g09d2