X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=cb94e7925ce01695659ac1c5de33da192e77ef30;hb=d906c82f31c5406b6debe0df88cb49b916cd6ced;hp=0341d09928cd4ef9ad9a974858a17c037db55a4c;hpb=9dce78c89fe77a107af7a8c962da19780485c3e2;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 0341d09..cb94e79 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)
@@ -240,6 +307,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;
 }