]> git.tdb.fi Git - ext/subsurface.git/blobdiff - divelist.c
Merge branch 'for-linus' of git://github.com/dirkhh/subsurface
[ext/subsurface.git] / divelist.c
index f6ee98e21312ee7265f72d9171ab73fecc025843..0a601c511f27e2fab3243e83f6770dfc00ce1093 100644 (file)
@@ -7,6 +7,34 @@
 #include "dive.h"
 #include "display.h"
 
+struct DiveList {
+       GtkWidget    *tree_view;
+       GtkWidget    *container_widget;
+       GtkListStore *model;
+       GtkTreeViewColumn *date, *depth, *duration, *location;
+       GtkTreeViewColumn *temperature, *cylinder, *nitrox, *sac;
+};
+
+static struct DiveList dive_list;
+
+/*
+ * The dive list has the dive data in both string format (for showing)
+ * and in "raw" format (for sorting purposes)
+ */
+enum {
+       DIVE_INDEX = 0,
+       DIVE_DATE,              /* time_t: dive->when */
+       DIVE_DEPTH,             /* int: dive->maxdepth in mm */
+       DIVE_DURATION,          /* int: in seconds */
+       DIVE_LOCATION,          /* "2nd Cathedral, Lanai" */
+       DIVE_TEMPERATURE,       /* int: in mkelvin */
+       DIVE_CYLINDER,
+       DIVE_NITROX,            /* int: in permille */
+       DIVE_SAC,               /* int: in ml/min */
+       DIVELIST_COLUMNS
+};
+
+
 static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model)
 {
        GtkTreeIter iter;
@@ -15,41 +43,69 @@ 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, 6, &value);
+       gtk_tree_model_get_value(model, &iter, DIVE_INDEX, &value);
        selected_dive = g_value_get_int(&value);
        repaint_dive();
 }
 
-static gboolean set_one_dive(GtkTreeModel *model,
-                            GtkTreePath *path,
-                            GtkTreeIter *iter,
-                            gpointer data)
+const char *weekday(int wday)
 {
-       int len;
-       GValue value = {0, };
-       struct dive *dive;
-       char buffer[256], *datestr, *depth, *duration;
+       static const char wday_array[7][4] = {
+               "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+       };
+       return wday_array[wday];
+}
+
+const char *monthname(int mon)
+{
+       static const char month_array[12][4] = {
+               "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+               "Jul", "Aug", "Oct", "Sep", "Nov", "Dec",
+       };
+       return month_array[mon];
+}
+
+static void date_data_func(GtkTreeViewColumn *col,
+                          GtkCellRenderer *renderer,
+                          GtkTreeModel *model,
+                          GtkTreeIter *iter,
+                          gpointer data)
+{
+       int val;
        struct tm *tm;
-       int integer, frac;
+       time_t when;
+       char buffer[40];
 
-       /* Get the dive number */
-       gtk_tree_model_get_value(model, iter, 6, &value);
-       dive = get_dive(g_value_get_int(&value));
-       if (!dive)
-               return TRUE;
+       gtk_tree_model_get(model, iter, DIVE_DATE, &val, -1);
+
+       /* 2038 problem */
+       when = val;
 
-       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 = gmtime(&when);
+       snprintf(buffer, sizeof(buffer),
+               "%s, %s %d, %d %02d:%02d",
+               weekday(tm->tm_wday),
+               monthname(tm->tm_mon),
+               tm->tm_mday, tm->tm_year + 1900,
                tm->tm_hour, tm->tm_min);
-       datestr = malloc(len+1);
-       memcpy(datestr, buffer, len+1);
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void depth_data_func(GtkTreeViewColumn *col,
+                           GtkCellRenderer *renderer,
+                           GtkTreeModel *model,
+                           GtkTreeIter *iter,
+                           gpointer data)
+{
+       int depth, integer, frac, len;
+       char buffer[40];
+
+       gtk_tree_model_get(model, iter, DIVE_DEPTH, &depth, -1);
 
        switch (output_units.length) {
-       unsigned int depth;
        case METERS:
-               depth = (dive->maxdepth.mm + 49) / 100;
+               /* To tenths of meters */
+               depth = (depth + 49) / 100;
                integer = depth / 10;
                frac = depth % 10;
                if (integer < 20)
@@ -58,130 +114,370 @@ static gboolean set_one_dive(GtkTreeModel *model,
                /* Rounding? */
                break;
        case FEET:
-               integer = to_feet(dive->maxdepth);
+               integer = mm_to_feet(depth) + 0.5;
                frac = -1;
+               break;
+       default:
+               return;
        }
-       len = snprintf(buffer, sizeof(buffer),
-                      "%d", integer);
+       len = snprintf(buffer, sizeof(buffer), "%d", integer);
        if (frac >= 0)
-               len += snprintf(buffer+len, sizeof(buffer)-len,
-                       ".%d", frac);
-       depth = malloc(len + 1);
-       memcpy(depth, buffer, len+1);
+               len += snprintf(buffer+len, sizeof(buffer)-len, ".%d", frac);
+
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void duration_data_func(GtkTreeViewColumn *col,
+                              GtkCellRenderer *renderer,
+                              GtkTreeModel *model,
+                              GtkTreeIter *iter,
+                              gpointer data)
+{
+       unsigned int sec;
+       char buffer[16];
+
+       gtk_tree_model_get(model, iter, DIVE_DURATION, &sec, -1);
+       snprintf(buffer, sizeof(buffer), "%d:%02d", sec / 60, sec % 60);
+
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void temperature_data_func(GtkTreeViewColumn *col,
+                                 GtkCellRenderer *renderer,
+                                 GtkTreeModel *model,
+                                 GtkTreeIter *iter,
+                                 gpointer data)
+{
+       int value;
+       char buffer[80];
+
+       gtk_tree_model_get(model, iter, DIVE_TEMPERATURE, &value, -1);
+
+       *buffer = 0;
+       if (value) {
+               double deg;
+               switch (output_units.temperature) {
+               case CELSIUS:
+                       deg = mkelvin_to_C(value);
+                       break;
+               case FAHRENHEIT:
+                       deg = mkelvin_to_F(value);
+                       break;
+               default:
+                       return;
+               }
+               snprintf(buffer, sizeof(buffer), "%.1f", deg);
+       }
+
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void nitrox_data_func(GtkTreeViewColumn *col,
+                            GtkCellRenderer *renderer,
+                            GtkTreeModel *model,
+                            GtkTreeIter *iter,
+                            gpointer data)
+{
+       int value;
+       char buffer[80];
+
+       gtk_tree_model_get(model, iter, DIVE_NITROX, &value, -1);
+
+       if (value)
+               snprintf(buffer, sizeof(buffer), "%.1f", value/10.0);
+       else
+               strcpy(buffer, "air");
+
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+/* Render the SAC data (integer value of "ml / min") */
+static void sac_data_func(GtkTreeViewColumn *col,
+                         GtkCellRenderer *renderer,
+                         GtkTreeModel *model,
+                         GtkTreeIter *iter,
+                         gpointer data)
+{
+       int value;
+       const double liters_per_cuft = 28.317;
+       const char *fmt;
+       char buffer[16];
+       double sac;
+
+       gtk_tree_model_get(model, iter, DIVE_SAC, &value, -1);
+
+       if (!value) {
+               g_object_set(renderer, "text", "", NULL);
+               return;
+       }
+
+       sac = value / 1000.0;
+       switch (output_units.volume) {
+       case LITER:
+               fmt = "%4.1f";
+               break;
+       case CUFT:
+               fmt = "%4.2f";
+               sac /= liters_per_cuft;
+               break;
+       }
+       snprintf(buffer, sizeof(buffer), fmt, sac);
+
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+/*
+ * Return air usage (in liters).
+ */
+static double calculate_airuse(struct dive *dive)
+{
+       double airuse = 0;
+       int i;
+
+       for (i = 0; i < MAX_CYLINDERS; i++) {
+               cylinder_t *cyl = dive->cylinder + i;
+               int size = cyl->type.size.mliter;
+               double kilo_atm;
 
-       len = snprintf(buffer, sizeof(buffer),
-                      "%d", dive->duration.seconds / 60);
-       duration = malloc(len + 1);
-       memcpy(duration, buffer, len+1);
+               if (!size)
+                       continue;
 
+               kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+
+               /* Liters of air at 1 atm == milliliters at 1k atm*/
+               airuse += kilo_atm * size;
+       }
+       return airuse;
+}
+
+static void get_sac(struct dive *dive, int *val)
+{
+       double airuse, pressure, sac;
+
+       *val = 0;
+       airuse = calculate_airuse(dive);
+       if (!airuse)
+               return;
+       if (!dive->duration.seconds)
+               return;
+
+       /* Mean pressure in atm: 1 atm per 10m */
+       pressure = 1 + (dive->meandepth.mm / 10000.0);
+       sac = airuse / pressure * 60 / dive->duration.seconds;
+
+       /* milliliters per minute.. */
+       *val = sac * 1000;
+}
+
+static void get_string(char **str, const char *s)
+{
+       int len;
+       char *n;
+
+       if (!s)
+               s = "";
+       len = strlen(s);
+       if (len > 40)
+               len = 40;
+       n = malloc(len+1);
+       memcpy(n, s, len);
+       n[len] = 0;
+       *str = n;
+}
+
+static void get_location(struct dive *dive, char **str)
+{
+       get_string(str, dive->location);
+}
+
+static void get_cylinder(struct dive *dive, char **str)
+{
+       get_string(str, dive->cylinder[0].type.description);
+}
+
+static void fill_one_dive(struct dive *dive,
+                         GtkTreeModel *model,
+                         GtkTreeIter *iter)
+{
+       int sac;
+       char *location, *cylinder;
+
+       get_cylinder(dive, &cylinder);
+       get_location(dive, &location);
+       get_sac(dive, &sac);
+
+       /*
+        * We only set the fields that changed: the strings.
+        * The core data itself is unaffected by units
+        */
        gtk_list_store_set(GTK_LIST_STORE(model), iter,
-               0, datestr,
-               2, depth,
-               4, duration,
+               DIVE_LOCATION, location,
+               DIVE_CYLINDER, cylinder,
+               DIVE_SAC, sac,
                -1);
+}
 
-       return FALSE;
+static gboolean set_one_dive(GtkTreeModel *model,
+                            GtkTreePath *path,
+                            GtkTreeIter *iter,
+                            gpointer data)
+{
+       GValue value = {0, };
+       struct dive *dive;
+
+       /* Get the dive number */
+       gtk_tree_model_get_value(model, iter, DIVE_INDEX, &value);
+       dive = get_dive(g_value_get_int(&value));
+       if (!dive)
+               return TRUE;
+       if (data && dive != data)
+               return FALSE;
+
+       fill_one_dive(dive, model, iter);
+       return dive == data;
 }
 
-void update_dive_list_units(struct DiveList *dive_list)
+void flush_divelist(struct dive *dive)
+{
+       GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
+
+       gtk_tree_model_foreach(model, set_one_dive, dive);
+}
+
+void update_dive_list_units(void)
 {
        const char *unit;
-       GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
+       GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
 
        switch (output_units.length) {
        case METERS:
-               unit = "m";
+               unit = "max/m";
                break;
        case FEET:
-               unit = "ft";
+               unit = "max/ft";
+               break;
+       }
+       gtk_tree_view_column_set_title(dive_list.depth, unit);
+
+       switch (output_units.temperature) {
+       case CELSIUS:
+               unit = "degC";
+               break;
+       case FAHRENHEIT:
+               unit = "degF";
+               break;
+       case KELVIN:
+               unit = "Kelvin";
                break;
        }
-       gtk_tree_view_column_set_title(dive_list->depth, unit);
+       gtk_tree_view_column_set_title(dive_list.temperature, unit);
 
        gtk_tree_model_foreach(model, set_one_dive, NULL);
 }
 
-static void fill_dive_list(struct DiveList *dive_list)
+static void fill_dive_list(void)
 {
        int i;
        GtkTreeIter iter;
        GtkListStore *store;
 
-       store = GTK_LIST_STORE(dive_list->model);
+       store = GTK_LIST_STORE(dive_list.model);
 
        for (i = 0; i < dive_table.nr; i++) {
                struct dive *dive = dive_table.dives[i];
 
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter,
-                       0, "date",
-                       1, dive->when,
-                       2, "depth",
-                       3, dive->maxdepth,
-                       4, "duration",
-                       5, dive->duration.seconds,
-                       6, i,
+                       DIVE_INDEX, i,
+                       DIVE_DATE, dive->when,
+                       DIVE_DEPTH, dive->maxdepth,
+                       DIVE_DURATION, dive->duration.seconds,
+                       DIVE_LOCATION, "location",
+                       DIVE_TEMPERATURE, dive->watertemp.mkelvin,
+                       DIVE_NITROX, dive->cylinder[0].gasmix.o2,
+                       DIVE_SAC, 0,
                        -1);
        }
 
-       update_dive_list_units(dive_list);
+       update_dive_list_units();
 }
 
-void dive_list_update_dives(struct DiveList dive_list)
+void dive_list_update_dives(void)
 {
        gtk_list_store_clear(GTK_LIST_STORE(dive_list.model));
-       fill_dive_list(&dive_list);
+       fill_dive_list();
        repaint_dive();
 }
 
-struct DiveList dive_list_create(void)
+typedef void (*data_func_t)(GtkTreeViewColumn *col,
+                           GtkCellRenderer *renderer,
+                           GtkTreeModel *model,
+                           GtkTreeIter *iter,
+                           gpointer data);
+
+static GtkTreeViewColumn *divelist_column(struct DiveList *dl, int index, const char *title,
+                                       data_func_t data_func, int align_right, int expand)
 {
-       struct DiveList    dive_list;
-       GtkTreeSelection  *selection;
-       GtkCellRenderer   *renderer;
+       GtkCellRenderer *renderer;
        GtkTreeViewColumn *col;
 
-       dive_list.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);
+       renderer = gtk_cell_renderer_text_new();
+       col = gtk_tree_view_column_new();
+
+       gtk_tree_view_column_set_title(col, title);
+       gtk_tree_view_column_set_sort_column_id(col, DIVE_DATE);
+       gtk_tree_view_column_set_resizable(col, TRUE);
+       gtk_tree_view_column_pack_start(col, renderer, TRUE);
+       if (data_func)
+               gtk_tree_view_column_set_cell_data_func(col, renderer, data_func, NULL, NULL);
+       else
+               gtk_tree_view_column_add_attribute(col, renderer, "text", index);
+       if (align_right) {
+               gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
+               gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+       }
+       gtk_tree_view_column_set_expand(col,expand);
+       if (expand) 
+               gtk_tree_view_column_set_min_width(col,50);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col);
+       return col;
+}
+
+GtkWidget *dive_list_create(void)
+{
+       GtkTreeSelection  *selection;
+       PangoFontDescription *font_desc = pango_font_description_from_string("sans 8");
+
+       dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
+                               G_TYPE_INT,                     /* index */
+                               G_TYPE_INT,                     /* Date */
+                               G_TYPE_INT,                     /* Depth */
+                               G_TYPE_INT,                     /* Duration */
+                               G_TYPE_STRING,                  /* Location */
+                               G_TYPE_INT,                     /* Temperature */
+                               G_TYPE_STRING,                  /* Cylinder */
+                               G_TYPE_INT,                     /* Nitrox */
+                               G_TYPE_INT                      /* SAC */
+                               );
        dive_list.tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dive_list.model));
+       gtk_widget_modify_font(dive_list.tree_view, font_desc);
+       pango_font_description_free(font_desc);
+
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dive_list.tree_view));
 
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-       gtk_widget_set_size_request(dive_list.tree_view, 200, 100);
-
-       renderer = gtk_cell_renderer_text_new();
-       dive_list.date = 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(dive_list.tree_view), col);
-
-       renderer = gtk_cell_renderer_text_new();
-       dive_list.depth = 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, FALSE);
-       gtk_tree_view_column_add_attribute(col, renderer, "text", 2);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-       gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-       gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+       gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
-       renderer = gtk_cell_renderer_text_new();
-       dive_list.duration = 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, FALSE);
-       gtk_tree_view_column_add_attribute(col, renderer, "text", 4);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
-       gtk_object_set(GTK_OBJECT(renderer), "alignment", PANGO_ALIGN_RIGHT, NULL);
-       gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), 1.0, 0.5);
+       dive_list.date = divelist_column(&dive_list, DIVE_DATE, "Date", date_data_func, 0, 0);
+       dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "max/ft", depth_data_func, 1, 0);
+       dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1, 0);
+       dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0, 1);
+       dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "degF", temperature_data_func, 1, 0);
+       dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0, 0);
+       dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1, 0);
+       dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1, 0);
 
-       fill_dive_list(&dive_list);
+       fill_dive_list();
 
        g_object_set(G_OBJECT(dive_list.tree_view), "headers-visible", TRUE,
                                          "search-column", 0,
@@ -192,8 +488,8 @@ struct DiveList dive_list_create(void)
 
        dive_list.container_widget = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dive_list.container_widget),
-                              GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                              GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
        gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
 
-       return dive_list;
+       return dive_list.container_widget;
 }