*/
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_LOCATION, /* "47" in minutes */
DIVE_TEMPSTR, /* "78" in fahrenheit or whatever */
DIVE_TEMP, /* int: in mkelvin */
DIVE_NITROXSTR, /* "32.5" in percent */
repaint_dive();
}
+static const char *weekday(int wday)
+{
+ 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 get_duration(struct dive *dive, int *val, char **str)
+{
+ unsigned int sec = dive->duration.seconds;
+ char buffer[16];
+
+ *val = sec;
+ snprintf(buffer, sizeof(buffer), "%d:%02d", sec / 60, sec % 60);
+ *str = strdup(buffer);
+}
+
+static void get_location(struct dive *dive, char **str)
+{
+ char buffer[16];
+
+ snprintf(buffer, sizeof(buffer), "%s", dive->location);
+ *str = strdup(buffer);
+}
+
static void get_temp(struct dive *dive, int *val, char **str)
{
int value = dive->watertemp.mkelvin;
}
}
-static void get_sac(struct dive *dive, int *val, char **str)
+/*
+ * Return air usage (in liters).
+ */
+static double calculate_airuse(struct dive *dive)
{
- *val = 0;
- *str = "";
+ 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 gboolean set_one_dive(GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data)
+static void get_sac(struct dive *dive, int *val, char **str)
{
- 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;
+ const double liters_per_cuft = 28.317;
+ double airuse, pressure, sac;
+ const char *fmt, *unit;
+ char buffer[20];
- /* 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;
+ *val = 0;
+ *str = "";
+ airuse = calculate_airuse(dive);
+ if (!airuse)
+ return;
+ if (!dive->duration.seconds)
+ return;
- 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);
+ /* Mean pressure in atm: 1 atm per 10m */
+ pressure = 1 + (dive->meandepth.mm / 10000.0);
+ sac = airuse / pressure * 60 / dive->duration.seconds;
- 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? */
+ /* milliliters per minute.. */
+ *val = sac * 1000;
+
+ switch (output_units.volume) {
+ case LITER:
+ unit = "l";
+ fmt = "%4.0f %s";
+ break;
+ case CUFT:
+ unit = "cuft";
+ fmt = "%4.2f %s";
+ airuse /= liters_per_cuft;
+ sac /= liters_per_cuft;
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);
+ snprintf(buffer, sizeof(buffer), fmt, sac, unit);
+ *str = strdup(buffer);
+}
+
+static void fill_one_dive(struct dive *dive,
+ GtkTreeModel *model,
+ GtkTreeIter *iter)
+{
+ int duration, temp, nitrox, sac;
+ char *durationstr, *tempstr, *nitroxstr, *sacstr;
+ char *location;
+ get_duration(dive, &duration, &durationstr);
+ get_location(dive, &location);
get_temp(dive, &temp, &tempstr);
get_nitrox(dive, &nitrox, &nitroxstr);
get_sac(dive, &sac, &sacstr);
* 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_DURATIONSTR, durationstr,
+ DIVE_LOCATION, location,
DIVE_TEMPSTR, tempstr,
DIVE_TEMP, temp,
DIVE_NITROXSTR, nitroxstr,
DIVE_NITROX, nitrox,
DIVE_SACSTR, sacstr,
- DIVE_NITROX, sac,
+ DIVE_SAC, sac,
-1);
+}
+
+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;
+}
- return FALSE;
+void flush_divelist(struct DiveList *dive_list, 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(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_LOCATION, "location",
DIVE_TEMPSTR, "temp",
DIVE_TEMP, dive->watertemp.mkelvin,
DIVE_NITROXSTR, "21.0",
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_INT, /* Date */
+ G_TYPE_INT, /* Depth */
+ G_TYPE_STRING, G_TYPE_INT, /* Duration */
+ G_TYPE_STRING, /* Location */
G_TYPE_STRING, G_TYPE_INT, /* Temperature */
G_TYPE_STRING, G_TYPE_INT, /* Nitrox */
G_TYPE_STRING, G_TYPE_INT /* SAC */
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_column_set_cell_data_func(col, renderer, date_data_func, NULL, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
renderer = gtk_cell_renderer_text_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_column_set_cell_data_func(col, renderer, depth_data_func, NULL, NULL);
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_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.location = col = gtk_tree_view_column_new();
+ gtk_tree_view_column_set_title(col, "Location");
+ gtk_tree_view_column_set_sort_column_id(col, DIVE_LOCATION);
+ gtk_tree_view_column_pack_start(col, renderer, FALSE);
+ gtk_tree_view_column_add_attribute(col, renderer, "text", DIVE_LOCATION);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(dive_list.tree_view), col);
+
renderer = gtk_cell_renderer_text_new();
dive_list.temperature = col = gtk_tree_view_column_new();
gtk_tree_view_column_set_title(col, "deg");
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_title(col, "O2%");
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);
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;