X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=dad0e237bc8726f0c983ef73fdfa1d47fd8540c4;hb=97a1dd68306de17aa73be092d2bcf174e8158f62;hp=deb72fc804225712edf164d52ab1a4fca5ba1d93;hpb=0e29df87f43365309f89d6dbd5b4a3acd8ea5054;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index deb72fc..dad0e23 100644
--- a/dive.c
+++ b/dive.c
@@ -26,6 +26,73 @@ 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);
+}
+
+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)
@@ -152,14 +219,19 @@ static void fixup_pressure(struct dive *dive, struct sample *sample)
 	if (index >= MAX_CYLINDERS)
 		return;
 	cyl = dive->cylinder + index;
-	if (!cyl->start.mbar)
-		cyl->start.mbar = pressure;
-	/* 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;
+	if (!cyl->sample_start.mbar)
+		cyl->sample_start.mbar = pressure;
+	cyl->sample_end.mbar = pressure;
+}
+
+/*
+ * If the cylinder tank pressures are within half a bar
+ * (about 8 PSI) of the sample pressures, we consider it
+ * to be a rounding error, and throw them away as redundant.
+ */
+static int same_rounded_pressure(pressure_t a, pressure_t b)
+{
+	return abs(a.mbar - b.mbar) <= 500;
 }
 
 struct dive *fixup_dive(struct dive *dive)
@@ -219,6 +291,18 @@ 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_t *cyl = dive->cylinder + i;
+		add_cylinder_description(&cyl->type);
+		if (same_rounded_pressure(cyl->sample_start, cyl->start))
+			cyl->start.mbar = 0;
+		if (same_rounded_pressure(cyl->sample_end, cyl->end))
+			cyl->end.mbar = 0;
+	}
+
 	return dive;
 }