while (*p)
p = &(*p)->next;
*p = ev;
+ remember_event(name);
}
double get_depth_units(unsigned int mm, int *frac, const char **units)
}
}
-static void fixup_pressure(struct dive *dive, struct sample *sample)
+/*
+ * If you have more than 32 cylinders, you'd better have a 64-bit build.
+ * And if you have more than 64 cylinders, you need to use another tool,
+ * or fix this up to do something odd.
+ */
+static unsigned long fixup_pressure(struct dive *dive, struct sample *sample, unsigned long flags)
{
+ unsigned long mask;
unsigned int pressure, index;
cylinder_t *cyl;
pressure = sample->cylinderpressure.mbar;
if (!pressure)
- return;
+ return flags;
index = sample->cylinderindex;
if (index >= MAX_CYLINDERS)
- return;
+ return flags;
cyl = dive->cylinder + index;
if (!cyl->start.mbar)
cyl->start.mbar = pressure;
- if (!cyl->end.mbar || pressure < cyl->end.mbar)
- cyl->end.mbar = pressure;
+ /*
+ * If we already have an end pressure, without
+ * ever having seen a sample for this cylinder,
+ * that means that somebody set the end pressure
+ * by hand
+ */
+ mask = 1ul << index;
+ if (cyl->end.mbar) {
+ if (!(flags & mask))
+ return flags;
+ }
+ flags |= mask;
+
+ /* we need to handle the user entering beginning and end tank pressures
+ * - maybe even IF we have samples. But for now if we have air pressure
+ * data in the samples, we use that instead of the minimum
+ * if (!cyl->end.mbar || pressure < cyl->end.mbar)
+ */
+ cyl->end.mbar = pressure;
+ return flags;
}
struct dive *fixup_dive(struct dive *dive)
int maxdepth = 0, mintemp = 0;
int lastdepth = 0;
int lasttemp = 0;
+ unsigned long flags = 0;
for (i = 0; i < dive->samples; i++) {
struct sample *sample = dive->sample + i;
maxdepth = depth;
}
- fixup_pressure(dive, sample);
+ flags = fixup_pressure(dive, sample, flags);
if (temp) {
/*
update_temperature(&dive->watertemp, mintemp);
update_depth(&dive->maxdepth, maxdepth);
+ add_people(dive->buddy);
+ add_people(dive->divemaster);
+ add_location(dive->location);
+ for (i = 0; i < MAX_CYLINDERS; i++) {
+ cylinder_type_t *type = &dive->cylinder[i].type;
+ add_cylinder_description(type);
+ }
+
return dive;
}
#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
#define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
#define MERGE_TXT(res, a, b, n) res->n = merge_text(a->n, b->n)
+#define MERGE_NONZERO(res, a, b, n) res->n = a->n ? a->n : b->n
static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
{
int i;
struct dive *res;
- if (a->when != b->when)
+ if ((a->when >= b->when + 60) || (a->when <= b->when - 60))
return NULL;
res = alloc_dive();
res->when = a->when;
+ MERGE_NONZERO(res, a, b, latitude);
+ MERGE_NONZERO(res, a, b, longitude);
MERGE_TXT(res, a, b, location);
MERGE_TXT(res, a, b, notes);
MERGE_TXT(res, a, b, buddy);