*/
enum {
DIVE_INDEX = 0,
- DIVE_DATESTR, /* "Thu Jun 17th, 2011" or whatever */
DIVE_DATE, /* time_t: dive->when */
- DIVE_DEPTHSTR, /* "67" in ft or whatever */
DIVE_DEPTH, /* int: dive->maxdepth in mm */
- DIVE_DURATIONSTR, /* "47" in minutes */
DIVE_DURATION, /* int: in seconds */
- DIVE_TEMPSTR, /* "78" in fahrenheit or whatever */
- DIVE_TEMP, /* int: in mkelvin */
- DIVE_NITROXSTR, /* "32.5" in percent */
+ DIVE_LOCATION, /* "2nd Cathedral, Lanai" */
+ DIVE_TEMPERATURE, /* int: in mkelvin */
+ DIVE_CYLINDER,
DIVE_NITROX, /* int: in permille */
- DIVE_SACSTR, /* "0.49" in cuft/min */
- DIVE_SAC, /* int: in ml/min or something */
+ DIVE_SAC, /* int: in ml/min */
DIVELIST_COLUMNS
};
repaint_dive();
}
-static void get_temp(struct dive *dive, int *val, char **str)
+static const char *weekday(int wday)
{
- int value = dive->watertemp.mkelvin;
+ static const char wday_array[7][4] = {
+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+ };
+ return wday_array[wday];
+}
+
+static 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;
+ time_t when;
+ char buffer[40];
+
+ gtk_tree_model_get(model, iter, DIVE_DATE, &val, -1);
+
+ /* 2038 problem */
+ when = val;
+
+ 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);
+ 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) {
+ case METERS:
+ /* To tenths of meters */
+ depth = (depth + 49) / 100;
+ integer = depth / 10;
+ frac = depth % 10;
+ if (integer < 20)
+ break;
+ frac = -1;
+ /* Rounding? */
+ break;
+ case FEET:
+ integer = mm_to_feet(depth) + 0.5;
+ frac = -1;
+ break;
+ default:
+ return;
+ }
+ len = snprintf(buffer, sizeof(buffer), "%d", integer);
+ if (frac >= 0)
+ 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];
- *val = value;
- *str = "";
+ gtk_tree_model_get(model, iter, DIVE_TEMPERATURE, &value, -1);
+
+ *buffer = 0;
if (value) {
double deg;
switch (output_units.temperature) {
return;
}
snprintf(buffer, sizeof(buffer), "%.1f", deg);
- *str = strdup(buffer);
}
+
+ g_object_set(renderer, "text", buffer, NULL);
}
-static void get_nitrox(struct dive *dive, int *val, char **str)
+static void nitrox_data_func(GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
{
- int value = dive->cylinder[0].gasmix.o2.permille;
+ int value;
char buffer[80];
- *val = value;
- *str = "";
- if (value) {
+ gtk_tree_model_get(model, iter, DIVE_NITROX, &value, -1);
+
+ if (value)
snprintf(buffer, sizeof(buffer), "%.1f", value/10.0);
- *str = strdup(buffer);
+ 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.0f";
+ 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;
+
+ 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, char **str)
+static void get_sac(struct dive *dive, int *val)
{
+ double airuse, pressure, sac;
+
*val = 0;
- *str = "";
+ 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 > 16)
+ len = 16;
+ 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,
+ DIVE_LOCATION, location,
+ DIVE_CYLINDER, cylinder,
+ DIVE_SAC, sac,
+ -1);
}
static gboolean set_one_dive(GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- int len;
GValue value = {0, };
struct dive *dive;
- char buffer[256], *datestr, *depth, *duration;
- struct tm *tm;
- int integer, frac;
- int temp, nitrox, sac;
- char *tempstr, *nitroxstr, *sacstr;
/* 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;
- 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);
-
- switch (output_units.length) {
- unsigned int depth;
- case METERS:
- depth = (dive->maxdepth.mm + 49) / 100;
- integer = depth / 10;
- frac = depth % 10;
- if (integer < 20)
- break;
- frac = -1;
- /* Rounding? */
- break;
- case FEET:
- integer = to_feet(dive->maxdepth);
- frac = -1;
- }
- 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, sizeof(buffer),
- "%d", dive->duration.seconds / 60);
- duration = malloc(len + 1);
- memcpy(duration, buffer, len+1);
-
- get_temp(dive, &temp, &tempstr);
- get_nitrox(dive, &nitrox, &nitroxstr);
- get_sac(dive, &sac, &sacstr);
+ fill_one_dive(dive, model, iter);
+ return dive == data;
+}
- /*
- * 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,
- DIVE_DATESTR, datestr,
- DIVE_DEPTHSTR, depth,
- DIVE_DURATIONSTR, duration,
- DIVE_TEMPSTR, tempstr,
- DIVE_TEMP, temp,
- DIVE_NITROXSTR, nitroxstr,
- DIVE_NITROX, nitrox,
- DIVE_SACSTR, sacstr,
- DIVE_NITROX, sac,
- -1);
+void flush_divelist(struct DiveList *dive_list, struct dive *dive)
+{
+ GtkTreeModel *model = GTK_TREE_MODEL(dive_list->model);
- return FALSE;
+ gtk_tree_model_foreach(model, set_one_dive, dive);
}
void update_dive_list_units(struct DiveList *dive_list)
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
DIVE_INDEX, i,
- DIVE_DATESTR, "date",
DIVE_DATE, dive->when,
- DIVE_DEPTHSTR, "depth",
DIVE_DEPTH, dive->maxdepth,
- DIVE_DURATIONSTR, "duration",
DIVE_DURATION, dive->duration.seconds,
- DIVE_TEMPSTR, "temp",
- DIVE_TEMP, dive->watertemp.mkelvin,
- DIVE_NITROXSTR, "21.0",
+ DIVE_LOCATION, "location",
+ DIVE_TEMPERATURE, dive->watertemp.mkelvin,
DIVE_NITROX, dive->cylinder[0].gasmix.o2,
- DIVE_SACSTR, "sac",
DIVE_SAC, 0,
-1);
}
repaint_dive();
}
+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)
+{
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *col;
+
+ 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_append_column(GTK_TREE_VIEW(dl->tree_view), col);
+ return col;
+}
+
struct DiveList dive_list_create(void)
{
struct DiveList dive_list;
GtkTreeSelection *selection;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *col;
dive_list.model = gtk_list_store_new(DIVELIST_COLUMNS,
G_TYPE_INT, /* index */
- G_TYPE_STRING, G_TYPE_INT, /* Date */
- G_TYPE_STRING, G_TYPE_INT, /* Depth */
- G_TYPE_STRING, G_TYPE_INT, /* Duration */
- G_TYPE_STRING, G_TYPE_INT, /* Temperature */
- G_TYPE_STRING, G_TYPE_INT, /* Nitrox */
- G_TYPE_STRING, G_TYPE_INT /* SAC */
+ 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));
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, DIVE_DATE);
- 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", DIVE_DATESTR);
- gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
+ gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
- 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, DIVE_DEPTH);
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DEPTHSTR);
- 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);
-
- 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, DIVE_DURATION);
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_DURATIONSTR);
- 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);
-
- renderer = gtk_cell_renderer_text_new();
- dive_list.temperature = col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(col, "deg");
- gtk_tree_view_column_set_sort_column_id(col, DIVE_TEMP);
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_TEMPSTR);
- 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);
-
- renderer = gtk_cell_renderer_text_new();
- dive_list.nitrox = col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(col, "EAD");
- gtk_tree_view_column_set_sort_column_id(col, DIVE_NITROX);
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_NITROXSTR);
- 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);
-
- renderer = gtk_cell_renderer_text_new();
- dive_list.sac = col = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(col, "SAC");
- gtk_tree_view_column_set_sort_column_id(col, DIVE_SAC);
- gtk_tree_view_column_pack_start(col, renderer, FALSE);
- gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_SACSTR);
- 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);
+ dive_list.depth = divelist_column(&dive_list, DIVE_DEPTH, "ft", depth_data_func, 1);
+ dive_list.duration = divelist_column(&dive_list, DIVE_DURATION, "min", duration_data_func, 1);
+ dive_list.location = divelist_column(&dive_list, DIVE_LOCATION, "Location", NULL, 0);
+ dive_list.temperature = divelist_column(&dive_list, DIVE_TEMPERATURE, "deg", temperature_data_func, 1);
+ dive_list.cylinder = divelist_column(&dive_list, DIVE_CYLINDER, "Cyl", NULL, 0);
+ dive_list.nitrox = divelist_column(&dive_list, DIVE_NITROX, "O2%", nitrox_data_func, 1);
+ dive_list.sac = divelist_column(&dive_list, DIVE_NITROX, "SAC", sac_data_func, 1);
fill_dive_list(&dive_list);
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_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(dive_list.container_widget), dive_list.tree_view);
return dive_list;