*/
static void update_depth(depth_t *depth, int new)
{
- int old = depth->mm;
+ if (new) {
+ int old = depth->mm;
- if (abs(old - new) > 1000)
- depth->mm = new;
+ if (abs(old - new) > 1000)
+ depth->mm = 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;
+ }
+}
+
+static void fixup_pressure(struct dive *dive, struct sample *sample)
+{
+ unsigned int pressure, index;
+ cylinder_t *cyl;
+
+ pressure = sample->cylinderpressure.mbar;
+ if (!pressure)
+ return;
+ index = sample->cylinderindex;
+ if (index >= MAX_CYLINDERS)
+ return;
+ cyl = dive->cylinder + index;
+ if (!cyl->start.mbar)
+ cyl->start.mbar = pressure;
+ if (!cyl->end.mbar || pressure < cyl->end.mbar)
+ cyl->end.mbar = pressure;
}
struct dive *fixup_dive(struct dive *dive)
double depthtime = 0;
int lasttime = 0;
int start = -1, end = -1;
- int startpress = 0, endpress = 0;
int maxdepth = 0, mintemp = 0;
int lastdepth = 0;
int lasttemp = 0;
struct sample *sample = dive->sample + i;
int time = sample->time.seconds;
int depth = sample->depth.mm;
- int press = sample->cylinderpressure.mbar;
int temp = sample->temperature.mkelvin;
if (lastdepth)
if (depth > maxdepth)
maxdepth = depth;
}
- if (press) {
- endpress = press;
- if (!startpress)
- startpress = press;
- }
+
+ fixup_pressure(dive, sample);
+
if (temp) {
/*
* If we have consecutive identical
}
if (end < 0)
return dive;
- dive->duration.seconds = end - start;
+
+ update_duration(&dive->duration, 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;
+ depthtime /= (end - start);
- if (maxdepth)
- update_depth(&dive->maxdepth, maxdepth);
+ update_depth(&dive->meandepth, depthtime);
+ update_temperature(&dive->watertemp, mintemp);
+ update_depth(&dive->maxdepth, maxdepth);
return dive;
}
{
merge_cylinder_type(&res->type, &a->type, &b->type);
merge_cylinder_mix(&res->gasmix, &a->gasmix, &b->gasmix);
+ MERGE_MAX(res, a, b, start.mbar);
+ MERGE_MIN(res, a, b, end.mbar);
}
/*
memset(res, 0, dive_size(alloc_samples));
res->when = a->when;
- res->name = merge_text(a->name, b->name);
res->location = merge_text(a->location, b->location);
res->notes = merge_text(a->notes, b->notes);
MERGE_MAX(res, a, b, maxdepth.mm);
MERGE_MAX(res, a, b, surfacetime.seconds);
MERGE_MAX(res, a, b, airtemp.mkelvin);
MERGE_MIN(res, a, b, watertemp.mkelvin);
- MERGE_MAX(res, a, b, beginning_pressure.mbar);
- MERGE_MAX(res, a, b, end_pressure.mbar);
for (i = 0; i < MAX_CYLINDERS; i++)
merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);