Make a guess at the cylinder description from the size and pressure

[ext/subsurface.git] / divelist.c

diff --git a/divelist.c b/divelist.c
index d92cd6deeecb156b370532c70f2d3ee217665af2..1970b38ab4d0044bd601a80b49b0337a29e50dba 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 #include "dive.h"
@@ -13,8 +14,9 @@ static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
        if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
                return;
 
-       gtk_tree_model_get_value(model, &iter, 0, &value);
-       printf("'%s' selected\n", g_value_get_string(&value));
+       gtk_tree_model_get_value(model, &iter, 6, &value);
+       selected_dive = g_value_get_int(&value);
+       repaint_dive();
 }
 
 static void fill_dive_list(GtkListStore *store)
@@ -25,9 +27,37 @@ static void fill_dive_list(GtkListStore *store)
        for (i = 0; i < dive_table.nr; i++) {
                struct dive *dive = dive_table.dives[i];
 
+               int len;
+               char buffer[256], *datestr, *depth, *duration;
+               struct tm *tm;
+               
+               tm = gmtime(&dive->when);
+               len = snprintf(buffer, sizeof(buffer),
+                       "%02d.%02d.%02d %02d:%02d",
+                       tm->tm_mday, tm->tm_mon+1, tm->tm_year % 100,
+                       tm->tm_hour, tm->tm_min);
+               datestr = malloc(len+1);
+               memcpy(datestr, buffer, len+1);
+
+               len = snprintf(buffer, sizeof(buffer),
+                              "%d", to_feet(dive->maxdepth));
+               depth = malloc(len + 1);
+               memcpy(depth, buffer, len+1);
+               
+               len = snprintf(buffer, sizeof(buffer),
+                              "%d", dive->duration.seconds / 60);
+               duration = malloc(len + 1);
+               memcpy(duration, buffer, len+1);
+
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter,
-                       0, dive->name,
+                       0, datestr,
+                       1, dive->when,
+                       2, depth,
+                       3, dive->maxdepth,
+                       4, duration,
+                       5, dive->duration.seconds,
+                       6, i,
                        -1);
        }
 }
@@ -41,22 +71,45 @@ GtkWidget *create_dive_list(void)
        GtkTreeViewColumn *col;
        GtkWidget         *scroll_window;
 
-       model = gtk_list_store_new(1, G_TYPE_STRING);
+       model = gtk_list_store_new(7,
+                                  G_TYPE_STRING, G_TYPE_INT,
+                                  G_TYPE_STRING, G_TYPE_INT, 
+                                  G_TYPE_STRING, G_TYPE_INT,
+                                  G_TYPE_INT);
        tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
 
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-       gtk_widget_set_size_request(tree_view, 200, -1);
+       gtk_widget_set_size_request(tree_view, 200, 100);
 
        fill_dive_list(model);
 
        renderer = gtk_cell_renderer_text_new();
        col = gtk_tree_view_column_new();
+       gtk_tree_view_column_set_title(col, "Date");
+       gtk_tree_view_column_set_sort_column_id(col, 1);
+       gtk_tree_view_column_set_resizable (col, TRUE);
        gtk_tree_view_column_pack_start(col, renderer, TRUE);
        gtk_tree_view_column_add_attribute(col, renderer, "text", 0);
        gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col);
+       
+       renderer = gtk_cell_renderer_text_new();
+       col = gtk_tree_view_column_new();
+       gtk_tree_view_column_set_title(col, "ft");
+       gtk_tree_view_column_set_sort_column_id(col, 3);
+       gtk_tree_view_column_pack_start(col, renderer, TRUE);
+       gtk_tree_view_column_add_attribute(col, renderer, "text", 2);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col);
+       
+       renderer = gtk_cell_renderer_text_new();
+       col = gtk_tree_view_column_new();
+       gtk_tree_view_column_set_title(col, "min");
+       gtk_tree_view_column_set_sort_column_id(col, 5);
+       gtk_tree_view_column_pack_start(col, renderer, TRUE);
+       gtk_tree_view_column_add_attribute(col, renderer, "text", 4);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col);
 
-       g_object_set(G_OBJECT(tree_view), "headers-visible", FALSE,
+       g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
                                          "search-column", 0,
                                          "rules-hint", FALSE,
                                          NULL);