X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=9edf36c9183998d9eef986598ec6bb5fa845cfd8;hb=f9cb526c969488e6a12d7fe2baf4a71417521460;hp=67a78cc8ad309189dc14419501e1209b1997e637;hpb=3a77eb85101a5fb1dc186b88a3a02d2ae27690c7;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 67a78cc..9edf36c 100644
--- a/dive.c
+++ b/dive.c
@@ -140,22 +140,46 @@ static void update_temperature(temperature_t *temperature, int new)
 	}
 }
 
-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)
@@ -167,6 +191,7 @@ 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;
@@ -184,7 +209,7 @@ struct dive *fixup_dive(struct dive *dive)
 				maxdepth = depth;
 		}
 
-		fixup_pressure(dive, sample);
+		flags = fixup_pressure(dive, sample, flags);
 
 		if (temp) {
 			/*
@@ -215,6 +240,11 @@ struct dive *fixup_dive(struct dive *dive)
 	update_temperature(&dive->watertemp, mintemp);
 	update_depth(&dive->maxdepth, maxdepth);
 
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_type_t *type = &dive->cylinder[i].type;
+		add_cylinder_description(type);
+	}
+
 	return dive;
 }
 
@@ -222,6 +252,7 @@ struct dive *fixup_dive(struct dive *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)
 {
@@ -319,6 +350,59 @@ static char *merge_text(const char *a, const char *b)
 	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)
 {
@@ -352,12 +436,14 @@ struct dive *try_to_merge(struct dive *a, struct dive *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;
+	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);
@@ -371,6 +457,6 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	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);
 }