X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=2d04eb5b09e4469f13ad5029b6838294497a6d2a;hb=c52b95d502fb79e52d5927b7c59addef984d23e2;hp=ca984b4eb169ed90b520ce0541ae3670c3765daf;hpb=a487f6c9314f0fe5e4173b670d9653067285da21;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index ca984b4..2d04eb5 100644
--- a/divelist.c
+++ b/divelist.c
@@ -223,7 +223,6 @@ static void sac_data_func(GtkTreeViewColumn *col,
 			  gpointer data)
 {
 	int value;
-	const double liters_per_cuft = 28.317;
 	const char *fmt;
 	char buffer[16];
 	double sac;
@@ -242,7 +241,7 @@ static void sac_data_func(GtkTreeViewColumn *col,
 		break;
 	case CUFT:
 		fmt = "%4.2f";
-		sac /= liters_per_cuft;
+		sac = ml_to_cuft(sac * 1000);
 		break;
 	}
 	snprintf(buffer, sizeof(buffer), fmt, sac);
@@ -307,7 +306,7 @@ static double calculate_airuse(struct dive *dive)
 		if (!size)
 			continue;
 
-		kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+		kilo_atm = (to_ATM(cyl->start) - to_ATM(cyl->end)) / 1000.0;
 
 		/* Liters of air at 1 atm == milliliters at 1k atm*/
 		airuse += kilo_atm * size;
@@ -420,27 +419,10 @@ void update_dive_list_units(void)
 	const char *unit;
 	GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
 
-	switch (output_units.length) {
-	case METERS:
-		unit = "m";
-		break;
-	case FEET:
-		unit = "ft";
-		break;
-	}
+	(void) get_depth_units(0, NULL, &unit);
 	gtk_tree_view_column_set_title(dive_list.depth, unit);
 
-	switch (output_units.temperature) {
-	case CELSIUS:
-		unit = UTF8_DEGREE "C";
-		break;
-	case FAHRENHEIT:
-		unit = UTF8_DEGREE "F";
-		break;
-	case KELVIN:
-		unit = "Kelvin";
-		break;
-	}
+	(void) get_temp_units(0, &unit);
 	gtk_tree_view_column_set_title(dive_list.temperature, unit);
 
 	gtk_tree_model_foreach(model, set_one_dive, NULL);