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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-02-08 20:10:47 -08:00
parent 51f97a97ce
commit b8c7992bbf
2 changed files with 10 additions and 17 deletions

View file

@ -105,19 +105,11 @@ static void process_temperatures(struct dive *dp, stats_t *stats)
{
int min_temp, mean_temp, max_temp = 0;
if (dp->maxtemp.mkelvin)
max_temp = dp->maxtemp.mkelvin;
else
max_temp = dp->dc.watertemp.mkelvin;
max_temp = dp->maxtemp.mkelvin;
if (max_temp && (!stats->max_temp || max_temp > stats->max_temp))
stats->max_temp = max_temp;
if (dp->mintemp.mkelvin)
min_temp = dp->mintemp.mkelvin;
else
min_temp = dp->dc.watertemp.mkelvin;
min_temp = dp->mintemp.mkelvin;
if (min_temp && (!stats->min_temp || min_temp < stats->min_temp))
stats->min_temp = min_temp;