#include "dive.h"
+void add_event(struct dive *dive, int time, int type, int flags, int value, const char *name)
+{
+ struct event *ev, **p;
+ unsigned int size, len = strlen(name);
+
+ size = sizeof(*ev) + len + 1;
+ ev = malloc(size);
+ if (!ev)
+ return;
+ memset(ev, 0, size);
+ memcpy(ev->name, name, len);
+ ev->time.seconds = time;
+ ev->type = type;
+ ev->flags = flags;
+ ev->value = value;
+ ev->next = NULL;
+
+ p = &dive->events;
+ while (*p)
+ p = &(*p)->next;
+ *p = ev;
+ remember_event(name);
+}
+
+int get_pressure_units(unsigned int mb, const char **units)
+{
+ int pressure;
+ const char* unit;
+
+ switch (output_units.pressure) {
+ case PASCAL:
+ pressure = mb * 100;
+ unit = "pascal";
+ break;
+ case BAR:
+ pressure = (mb + 500) / 1000;
+ unit = "bar";
+ break;
+ case PSI:
+ pressure = mbar_to_PSI(mb);
+ unit = "psi";
+ break;
+ }
+ if (units)
+ *units = unit;
+ return pressure;
+}
+
+double get_temp_units(unsigned int mk, const char **units)
+{
+ double deg;
+ const char *unit;
+
+ if (output_units.temperature == FAHRENHEIT) {
+ deg = mkelvin_to_F(mk);
+ unit = UTF8_DEGREE "F";
+ } else {
+ deg = mkelvin_to_C(mk);
+ unit = UTF8_DEGREE "C";
+ }
+ if (units)
+ *units = unit;
+ return deg;
+}
+
+double get_volume_units(unsigned int ml, int *frac, const char **units)
+{
+ int decimals;
+ double vol;
+ const char *unit;
+
+ switch (output_units.volume) {
+ case LITER:
+ vol = ml / 1000.0;
+ unit = "l";
+ decimals = 1;
+ break;
+ case CUFT:
+ vol = ml_to_cuft(ml);
+ unit = "cuft";
+ decimals = 2;
+ break;
+ }
+ if (frac)
+ *frac = decimals;
+ if (units)
+ *units = unit;
+ return vol;
+}
+
double get_depth_units(unsigned int mm, int *frac, const char **units)
{
int decimals;
}
}
-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;
}
/* Don't pick a zero for MERGE_MIN() */
#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)
{
return res;
}
+#define SORT(a,b,field) \
+ if (a->field != b->field) return a->field < b->field ? -1 : 1
+
+static int sort_event(struct event *a, struct event *b)
+{
+ SORT(a,b,time.seconds);
+ SORT(a,b,type);
+ SORT(a,b,flags);
+ SORT(a,b,value);
+ return strcmp(a->name, b->name);
+}
+
+static void merge_events(struct dive *res, struct dive *src1, struct dive *src2, int offset)
+{
+ struct event *a, *b;
+ struct event **p = &res->events;
+
+ a = src1->events;
+ b = src2->events;
+ while (b) {
+ b->time.seconds += offset;
+ b = b->next;
+ }
+ b = src2->events;
+
+ while (a || b) {
+ int s;
+ if (!b) {
+ *p = a;
+ break;
+ }
+ if (!a) {
+ *p = b;
+ break;
+ }
+ s = sort_event(a, b);
+ /* Pick b */
+ if (s > 0) {
+ *p = b;
+ p = &b->next;
+ b = b->next;
+ continue;
+ }
+ /* Pick 'a' or neither */
+ if (s < 0) {
+ *p = a;
+ p = &a->next;
+ }
+ a = a->next;
+ continue;
+ }
+}
+
/* Pick whichever has any info (if either). Prefer 'a' */
static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylinder_type_t *b)
{
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;
- res->location = merge_text(a->location, b->location);
- res->notes = merge_text(a->notes, b->notes);
+ 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);
+ MERGE_TXT(res, a, b, divemaster);
MERGE_MAX(res, a, b, number);
MERGE_MAX(res, a, b, maxdepth.mm);
res->meandepth.mm = 0;
MERGE_MIN(res, a, b, watertemp.mkelvin);
for (i = 0; i < MAX_CYLINDERS; i++)
merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);
-
+ merge_events(res, a, b, 0);
return merge_samples(res, a, b, 0);
}
projects / ext / subsurface.git / blobdiff