Make pressure plot shading by sac rate consistent

[ext/subsurface.git] / divelist.c

diff --git a/divelist.c b/divelist.c
index acaf08d38a8e5ce29e26d95c932b7d9b43bd182d..60ad16a7fe541ced018f03010e732957b6974024 100644 (file)
--- 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);
@@ -300,6 +299,7 @@ static double calculate_airuse(struct dive *dive)
        int i;
 
        for (i = 0; i < MAX_CYLINDERS; i++) {
+               pressure_t start, end;
                cylinder_t *cyl = dive->cylinder + i;
                int size = cyl->type.size.mliter;
                double kilo_atm;
@@ -307,7 +307,9 @@ static double calculate_airuse(struct dive *dive)
                if (!size)
                        continue;
 
-               kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+               start = cyl->start.mbar ? cyl->start : cyl->sample_start;
+               end = cyl->end.mbar ? cyl->end : cyl->sample_end;
+               kilo_atm = (to_ATM(start) - to_ATM(end)) / 1000.0;
 
                /* Liters of air at 1 atm == milliliters at 1k atm*/
                airuse += kilo_atm * size;
@@ -333,6 +335,14 @@ static int calculate_sac(struct dive *dive)
        return sac * 1000;
 }
 
+void update_cylinder_related_info(struct dive *dive)
+{
+       if (dive != NULL) {
+               dive->sac = calculate_sac(dive);
+               dive->otu = calculate_otu(dive);
+       }
+}
+
 static void get_string(char **str, const char *s)
 {
        int len;
@@ -341,8 +351,8 @@ static void get_string(char **str, const char *s)
        if (!s)
                s = "";
        len = strlen(s);
-       if (len > 40)
-               len = 40;
+       if (len > 60)
+               len = 60;
        n = malloc(len+1);
        memcpy(n, s, len);
        n[len] = 0;
@@ -447,11 +457,11 @@ static void fill_dive_list(void)
 
        store = GTK_LIST_STORE(dive_list.model);
 
-       for (i = 0; i < dive_table.nr; i++) {
+       i = dive_table.nr;
+       while (--i >= 0) {
                struct dive *dive = dive_table.dives[i];
 
-               dive->otu = calculate_otu(dive);
-               dive->sac = calculate_sac(dive);
+               update_cylinder_related_info(dive);
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter,
                        DIVE_INDEX, i,