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

Clean up 'fixup_dive()' a bit

Browse source 
We don't want to override potentially more exact values for water
temperature etc either.  The sample save interval may be longer than
some internally kept state of key per-dive values like that.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-04 13:06:47 -07:00
parent aab4d593bd
commit f448b68de0
1 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

54
dive.c
View file

@ -21,10 +21,38 @@
*/ */
static void update_depth(depth_t *depth, int new) static void update_depth(depth_t *depth, int new)
{ {
int old = depth->mm; if (new) {
int old = depth->mm;
if (abs(old - new) > 1000) if (abs(old - new) > 1000)
depth->mm = new; depth->mm = new;
}
}
static void update_pressure(pressure_t *pressure, int new)
{
if (new) {
int old = pressure->mbar;
if (abs(old - new) > 1000)
pressure->mbar = new;
}
}
static void update_duration(duration_t *duration, int new)
{
if (new)
duration->seconds = new;
}
static void update_temperature(temperature_t *temperature, int new)
{
if (new) {
int old = temperature->mkelvin;
if (abs(old - new) > 1000)
temperature->mkelvin = new;
}
} }
struct dive *fixup_dive(struct dive *dive) struct dive *fixup_dive(struct dive *dive)
@ -85,18 +113,16 @@ struct dive *fixup_dive(struct dive *dive)
} }
if (end < 0) if (end < 0)
return dive; return dive;
dive->duration.seconds = end - start;
if (start != end)
update_depth(&dive->meandepth, depthtime / (end - start));
if (startpress)
dive->beginning_pressure.mbar = startpress;
if (endpress)
dive->end_pressure.mbar = endpress;
if (mintemp)
dive->watertemp.mkelvin = mintemp;
if (maxdepth) update_duration(&dive->duration, end - start);
update_depth(&dive->maxdepth, maxdepth); if (start != end)
depthtime /= (end - start);
update_depth(&dive->meandepth, depthtime);
update_pressure(&dive->beginning_pressure, startpress);
update_pressure(&dive->end_pressure, endpress);
update_temperature(&dive->watertemp, mintemp);
update_depth(&dive->maxdepth, maxdepth);
return dive; return dive;
} }