X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=dad0e237bc8726f0c983ef73fdfa1d47fd8540c4;hb=4891fa812f04da1f46075433d28fa0f33145e125;hp=ed3908928a97c3c7ddfabb7c12d003de4b6f2349;hpb=5ca49b0460f36ac969b7ef388f586782d584b36d;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index ed39089..dad0e23 100644
--- a/dive.c
+++ b/dive.c
@@ -29,6 +29,72 @@ void add_event(struct dive *dive, int time, int type, int flags, int value, cons
 	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;
@@ -141,46 +207,31 @@ static void update_temperature(temperature_t *temperature, int new)
 	}
 }
 
-/*
- * 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)
+static void fixup_pressure(struct dive *dive, struct sample *sample)
 {
-	unsigned long mask;
 	unsigned int pressure, index;
 	cylinder_t *cyl;
 
 	pressure = sample->cylinderpressure.mbar;
 	if (!pressure)
-		return flags;
+		return;
 	index = sample->cylinderindex;
 	if (index >= MAX_CYLINDERS)
-		return flags;
+		return;
 	cyl = dive->cylinder + index;
-	if (!cyl->start.mbar)
-		cyl->start.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;
+	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)
@@ -192,7 +243,6 @@ 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;
@@ -210,7 +260,7 @@ struct dive *fixup_dive(struct dive *dive)
 				maxdepth = depth;
 		}
 
-		flags = fixup_pressure(dive, sample, flags);
+		fixup_pressure(dive, sample);
 
 		if (temp) {
 			/*
@@ -245,8 +295,12 @@ struct dive *fixup_dive(struct dive *dive)
 	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);
+		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;