X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=ed3908928a97c3c7ddfabb7c12d003de4b6f2349;hb=e4bfb6597279ca3d9aa3678a617f5f0aef298278;hp=d934d14384f8010a8a9ee22801d06e4f86798a82;hpb=30ee87be92f0a0fffc98106852d9623a65dfe4ed;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index d934d14..ed39089 100644
--- a/dive.c
+++ b/dive.c
@@ -26,6 +26,7 @@ void add_event(struct dive *dive, int time, int type, int flags, int value, cons
 	while (*p)
 		p = &(*p)->next;
 	*p = ev;
+	remember_event(name);
 }
 
 double get_depth_units(unsigned int mm, int *frac, const char **units)
@@ -140,22 +141,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 +192,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 +210,7 @@ struct dive *fixup_dive(struct dive *dive)
 				maxdepth = depth;
 		}
 
-		fixup_pressure(dive, sample);
+		flags = fixup_pressure(dive, sample, flags);
 
 		if (temp) {
 			/*
@@ -215,6 +241,14 @@ struct dive *fixup_dive(struct dive *dive)
 	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;
 }
 
@@ -406,7 +440,7 @@ 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();