Merge branch 'forlinus' of git://git.hohndel.org/subsurface

* 'forlinus' of git://git.hohndel.org/subsurface:
  Small improvement to plot info debugging code
  Add three more trimix test dives
  Make test dive 15 a bit more useful
  Two test dives I added a couple of months ago
  Add libxslt to Windows packaging file

diff --git a/divelist.c b/divelist.c
index 5b6c7e3e159268deca5fa7afdc660e3808ca651d..f664cde49cf6f0c8f725a8d3f681402a277a7abc 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -230,16 +230,23 @@ static void temperature_data_func(GtkTreeViewColumn *col,
  *  - Nitrox trumps air (even if hypoxic)
  * These are the same rules as the inter-dive sorting rules.
  */
-static void get_dive_gas(struct dive *dive, int *o2, int *he)
+static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
 {
        int i;
-       int maxo2 = -1, maxhe = -1;
+       int maxo2 = -1, maxhe = -1, mino2 = 1000;
 
        for (i = 0; i < MAX_CYLINDERS; i++) {
-               struct gasmix *mix = &dive->cylinder[i].gasmix;
+               cylinder_t *cyl = dive->cylinder + i;
+               struct gasmix *mix = &cyl->gasmix;
                int o2 = mix->o2.permille;
                int he = mix->he.permille;
 
+               if (cylinder_none(cyl))
+                       continue;
+               if (!o2)
+                       o2 = 209;
+               if (o2 < mino2)
+                       mino2 = o2;
                if (he > maxhe)
                        goto newmax;
                if (he < maxhe)
@@ -250,8 +257,12 @@ newmax:
                maxhe = he;
                maxo2 = o2;
        }
+       /* All air? Show/sort as "air"/zero */
+       if (!maxhe && maxo2 == 209 && mino2 == maxo2)
+               maxo2 = mino2 = 0;
        *o2 = maxo2;
        *he = maxhe;
+       *o2low = mino2;
 }
 
 static gint nitrox_sort_func(GtkTreeModel *model,
@@ -263,17 +274,21 @@ static gint nitrox_sort_func(GtkTreeModel *model,
        struct dive *a, *b;
        int a_o2, b_o2;
        int a_he, b_he;
+       int a_o2low, b_o2low;
 
        gtk_tree_model_get(model, iter_a, DIVE_INDEX, &index_a, -1);
        gtk_tree_model_get(model, iter_b, DIVE_INDEX, &index_b, -1);
        a = get_dive(index_a);
        b = get_dive(index_b);
-       get_dive_gas(a, &a_o2, &a_he);
-       get_dive_gas(b, &b_o2, &b_he);
+       get_dive_gas(a, &a_o2, &a_he, &a_o2low);
+       get_dive_gas(b, &b_o2, &b_he, &b_o2low);
 
        /* Sort by Helium first, O2 second */
-       if (a_he == b_he)
+       if (a_he == b_he) {
+               if (a_o2 == b_o2)
+                       return a_o2low - b_o2low;
                return a_o2 - b_o2;
+       }
        return a_he - b_he;
 }
 
@@ -283,20 +298,24 @@ static void nitrox_data_func(GtkTreeViewColumn *col,
                             GtkTreeIter *iter,
                             gpointer data)
 {
-       int index, o2, he;
+       int index, o2, he, o2low;
        char buffer[80];
        struct dive *dive;
 
        gtk_tree_model_get(model, iter, DIVE_INDEX, &index, -1);
        dive = get_dive(index);
-       get_dive_gas(dive, &o2, &he);
+       get_dive_gas(dive, &o2, &he, &o2low);
        o2 = (o2 + 5) / 10;
        he = (he + 5) / 10;
+       o2low = (o2low + 5) / 10;
 
        if (he)
                snprintf(buffer, sizeof(buffer), "%d/%d", o2, he);
        else if (o2)
-               snprintf(buffer, sizeof(buffer), "%d", o2);
+               if (o2 == o2low)
+                       snprintf(buffer, sizeof(buffer), "%d", o2);
+               else
+                       snprintf(buffer, sizeof(buffer), "%d-%d", o2low, o2);
        else
                strcpy(buffer, "air");
 

diff --git a/info.c b/info.c
index 377f33caa7071f4011f507077d4f7b75c9fea1f4..38087c6e662bdc4d6a3a8ac40630a88c4f5fdfbc 100644 (file)
--- a/info.c
+++ b/info.c
@@ -333,6 +333,10 @@ static void dive_info_widget(GtkWidget *box, struct dive *dive, struct dive_info
 
        info->divemaster = text_entry(hbox, "Dive master", people_list, dive->divemaster);
        info->buddy = text_entry(hbox, "Buddy", people_list, dive->buddy);
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, TRUE, 0);
+
        info->rating = text_entry(hbox, "Rating", star_list, star_strings[dive->rating]);
 
        info->notes = text_view(box, "Notes", READ_WRITE);
@@ -400,6 +404,10 @@ GtkWidget *extended_dive_info_widget(void)
 
        divemaster = text_value(hbox, "Divemaster");
        buddy = text_value(hbox, "Buddy");
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
        rating = text_value(hbox, "Rating");
 
        notes = text_view(vbox, "Notes", READ_ONLY);