diff options
| -rw-r--r-- | display-gtk.h | 9 | ||||
| -rw-r--r-- | divelist.c | 46 | ||||
| -rw-r--r-- | equipment.c | 456 | ||||
| -rw-r--r-- | gtk-gui.c | 36 | ||||
| -rw-r--r-- | uemis.c | 13 |
5 files changed, 449 insertions, 111 deletions
diff --git a/display-gtk.h b/display-gtk.h index ad437465c..fe373a14f 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -33,4 +33,13 @@ extern GtkWidget *equipment_widget(void); extern GtkWidget *dive_list_create(void); +typedef void (*data_func_t)(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data); + +extern GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title, + data_func_t data_func, PangoAlignment align, gboolean visible); + #endif diff --git a/divelist.c b/divelist.c index b43adfd0c..1cc76b38a 100644 --- a/divelist.c +++ b/divelist.c @@ -424,9 +424,9 @@ void update_dive_list_units(void) void update_dive_list_col_visibility(void) { - gtk_tree_view_column_set_visible(dive_list.sac, visible_cols.sac); - gtk_tree_view_column_set_visible(dive_list.otu, visible_cols.otu); - return; + gtk_tree_view_column_set_visible(dive_list.sac, visible_cols.sac); + gtk_tree_view_column_set_visible(dive_list.otu, visible_cols.otu); + return; } static void fill_dive_list(void) @@ -469,46 +469,10 @@ void dive_list_update_dives(void) 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, PangoAlignment align, gboolean visible) + data_func_t data_func, PangoAlignment align, gboolean visible) { - GtkCellRenderer *renderer; - GtkTreeViewColumn *col; - double xalign = 0.0; /* left as default */ - - 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, index); - 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); - gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL); - switch (align) { - case PANGO_ALIGN_LEFT: - xalign = 0.0; - break; - case PANGO_ALIGN_CENTER: - xalign = 0.5; - break; - case PANGO_ALIGN_RIGHT: - xalign = 1.0; - break; - } - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5); - gtk_tree_view_column_set_visible(col, visible); - gtk_tree_view_append_column(GTK_TREE_VIEW(dl->tree_view), col); - return col; + return tree_view_column(dl->tree_view, index, title, data_func, align, visible); } /* diff --git a/equipment.c b/equipment.c index da758a9d4..ba7fb6859 100644 --- a/equipment.c +++ b/equipment.c @@ -1,7 +1,7 @@ /* equipment.c */ /* creates the UI for the equipment page - * controlled through the following interfaces: - * + * * void show_dive_equipment(struct dive *dive) * void flush_dive_equipment_changes(struct dive *dive) * @@ -19,6 +19,27 @@ #include "display-gtk.h" #include "divelist.h" +GtkListStore *cylinder_model; + +enum { + CYL_DESC, + CYL_SIZE, + CYL_WORKP, + CYL_STARTP, + CYL_ENDP, + CYL_O2, + CYL_HE, + CYL_COLUMNS +}; + +static struct { + int max_index; + GtkListStore *model; + GtkWidget *tree_view; + GtkWidget *edit, *add, *del; + GtkTreeViewColumn *desc, *size, *workp, *startp, *endp, *o2, *he; +} cylinder_list; + struct cylinder_widget { int index, changed; const char *name; @@ -28,10 +49,25 @@ struct cylinder_widget { GtkWidget *o2, *gasmix_button; }; -static struct cylinder_widget gtk_cylinder[MAX_CYLINDERS]; +static int convert_pressure(int mbar, double *p) +{ + int decimals = 1; + double pressure; -static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) + pressure = mbar / 1000.0; + if (mbar) { + if (output_units.pressure == PSI) { + pressure *= 14.5037738; /* Bar to PSI */ + decimals = 0; + } + } + *p = pressure; + return decimals; +} + +static int convert_volume_pressure(int ml, int mbar, double *v, double *p) { + int decimals = 1; double volume, pressure; volume = ml / 1000.0; @@ -43,9 +79,19 @@ static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, i } if (output_units.pressure == PSI) { pressure *= 14.5037738; /* Bar to PSI */ + decimals = 0; } } + *v = volume; + *p = pressure; + return decimals; +} +static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) +{ + double volume, pressure; + + convert_volume_pressure(ml, mbar, &volume, &pressure); gtk_spin_button_set_value(cylinder->size, volume); gtk_spin_button_set_value(cylinder->pressure, pressure); } @@ -159,12 +205,58 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2); } +static int cyl_nothing(cylinder_t *cyl) +{ + return !cyl->type.size.mliter && + !cyl->type.workingpressure.mbar && + !cyl->type.description && + !cyl->gasmix.o2.permille && + !cyl->gasmix.he.permille && + !cyl->start.mbar && + !cyl->end.mbar; +} + +static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter) +{ + gtk_list_store_set(model, iter, + CYL_DESC, cyl->type.description ? : "", + CYL_SIZE, cyl->type.size.mliter, + CYL_WORKP, cyl->type.workingpressure.mbar, + CYL_STARTP, cyl->start.mbar, + CYL_ENDP, cyl->end.mbar, + CYL_O2, cyl->gasmix.o2.permille, + CYL_HE, cyl->gasmix.he.permille, + -1); +} + void show_dive_equipment(struct dive *dive) { - int i; + int i, max; + GtkTreeIter iter; + GtkListStore *model; + + model = cylinder_list.model; + gtk_list_store_clear(model); + max = MAX_CYLINDERS; + do { + cylinder_t *cyl = &dive->cylinder[max-1]; + + if (!cyl_nothing(cyl)) + break; + } while (--max); - for (i = 0; i < MAX_CYLINDERS; i++) - show_cylinder(dive->cylinder + i, gtk_cylinder+i); + cylinder_list.max_index = max; + + gtk_widget_set_sensitive(cylinder_list.edit, 0); + gtk_widget_set_sensitive(cylinder_list.del, 0); + gtk_widget_set_sensitive(cylinder_list.add, max < MAX_CYLINDERS); + + for (i = 0; i < max; i++) { + cylinder_t *cyl = dive->cylinder+i; + + gtk_list_store_append(model, &iter); + set_one_cylinder(i, cyl, model, &iter); + } } static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr) @@ -239,30 +331,6 @@ void flush_dive_equipment_changes(struct dive *dive) /* We do nothing: we require the "Ok" button press */ } -static void apply_cb(GtkButton *button, gpointer data) -{ - int i; - struct dive *dive = current_dive; - - if (!dive) - return; - - for (i = 0; i < MAX_CYLINDERS; i++) - record_cylinder_changes(dive->cylinder+i, gtk_cylinder+i); - mark_divelist_changed(TRUE); - flush_divelist(dive); -} - -static void cancel_cb(GtkButton *button, gpointer data) -{ - struct dive *dive = current_dive; - - if (!dive) - return; - - show_dive_equipment(current_dive); -} - /* * We hardcode the most common standard cylinders, * we should pick up any other names from the dive @@ -343,32 +411,26 @@ static void nitrox_cb(GtkToggleButton *button, gpointer data) gtk_widget_set_sensitive(cylinder->o2, state); } -static void cylinder_widget(int nr, GtkListStore *model) +static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, GtkListStore *model) { - struct cylinder_widget *cylinder; - GtkWidget *frame, *hbox, *hbox2; + GtkWidget *frame, *hbox; GtkWidget *widget; - char buffer[80]; - cylinder = gtk_cylinder + nr; - cylinder->index = nr; + frame = gtk_frame_new("Cylinder"); hbox = gtk_hbox_new(FALSE, 3); - cylinder->hbox = hbox; - - snprintf(buffer, sizeof(buffer), "Cylinder %d", nr+1); - frame = gtk_frame_new(buffer); - gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0); - - hbox2 = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(frame), hbox2); + gtk_container_add(GTK_CONTAINER(frame), hbox); widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0); - gtk_box_pack_start(GTK_BOX(hbox2), widget, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); cylinder->description = GTK_COMBO_BOX(widget); g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), cylinder); + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0); + widget = create_spinbutton(hbox, "Size", 0, 300, 0.1); cylinder->size = GTK_SPIN_BUTTON(widget); @@ -385,6 +447,138 @@ static void cylinder_widget(int nr, GtkListStore *model) gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0); } +static int edit_cylinder_dialog(int index, cylinder_t *cyl) +{ + int success; + GtkWidget *dialog, *vbox; + struct cylinder_widget cylinder; + struct dive *dive; + + cylinder.index = index; + cylinder.changed = 0; + + dive = current_dive; + if (!dive) + return 0; + *cyl = dive->cylinder[index]; + + dialog = gtk_dialog_new_with_buttons("Cylinder", + GTK_WINDOW(main_window), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL); + + vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + cylinder_widget(vbox, &cylinder, cylinder_model); + + show_cylinder(cyl, &cylinder); + + gtk_widget_show_all(dialog); + success = gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT; + if (success) { + record_cylinder_changes(cyl, &cylinder); + dive->cylinder[index] = *cyl; + mark_divelist_changed(TRUE); + flush_divelist(dive); + } + + gtk_widget_destroy(dialog); + + return success; +} + +static int get_model_index(GtkListStore *model, GtkTreeIter *iter) +{ + int *p, index; + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter); + p = gtk_tree_path_get_indices(path); + index = p ? *p : 0; + gtk_tree_path_free(path); + return index; +} + +static void edit_cb(GtkButton *button, gpointer data) +{ + int index; + GtkTreeIter iter; + GtkListStore *model = cylinder_list.model; + GtkTreeSelection *selection; + cylinder_t cyl; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); + + /* Nothing selected? This shouldn't happen, since the button should be inactive */ + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) + return; + + index = get_model_index(model, &iter); + if (!edit_cylinder_dialog(index, &cyl)) + return; + + set_one_cylinder(index, &cyl, model, &iter); +} + +static void add_cb(GtkButton *button, gpointer data) +{ + int index = cylinder_list.max_index; + GtkTreeIter iter; + GtkListStore *model = cylinder_list.model; + GtkTreeSelection *selection; + cylinder_t cyl; + + if (!edit_cylinder_dialog(index, &cyl)) + return; + + gtk_list_store_append(model, &iter); + set_one_cylinder(index, &cyl, model, &iter); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); + gtk_tree_selection_select_iter(selection, &iter); + + cylinder_list.max_index++; + gtk_widget_set_sensitive(cylinder_list.add, cylinder_list.max_index < MAX_CYLINDERS); +} + +static void del_cb(GtkButton *button, gpointer data) +{ + int index, nr; + GtkTreeIter iter; + GtkListStore *model = cylinder_list.model; + GtkTreeSelection *selection; + struct dive *dive; + cylinder_t *cyl; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); + + /* Nothing selected? This shouldn't happen, since the button should be inactive */ + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) + return; + + index = get_model_index(model, &iter); + + dive = current_dive; + if (!dive) + return; + cyl = dive->cylinder + index; + nr = cylinder_list.max_index - index - 1; + + gtk_list_store_remove(model, &iter); + + cylinder_list.max_index--; + memmove(cyl, cyl+1, nr*sizeof(*cyl)); + memset(cyl+nr, 0, sizeof(*cyl)); + + mark_divelist_changed(TRUE); + flush_divelist(dive); + + gtk_widget_set_sensitive(cylinder_list.edit, 0); + gtk_widget_set_sensitive(cylinder_list.del, 0); + gtk_widget_set_sensitive(cylinder_list.add, 1); +} + static GtkListStore *create_tank_size_model(void) { GtkListStore *model; @@ -399,37 +593,167 @@ static GtkListStore *create_tank_size_model(void) return model; } -GtkWidget *equipment_widget(void) +static void size_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int ml, mbar; + double size, pressure; + char buffer[10]; + + gtk_tree_model_get(model, iter, CYL_SIZE, &ml, CYL_WORKP, &mbar, -1); + convert_volume_pressure(ml, mbar, &size, &pressure); + if (size) + snprintf(buffer, sizeof(buffer), "%.1f", size); + else + strcpy(buffer, "unkn"); + g_object_set(renderer, "text", buffer, NULL); +} + +static void pressure_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int index = (long)data; + int mbar, decimals; + double pressure; + char buffer[10]; + + gtk_tree_model_get(model, iter, index, &mbar, -1); + decimals = convert_pressure(mbar, &pressure); + if (mbar) + snprintf(buffer, sizeof(buffer), "%.*f", decimals, pressure); + else + *buffer = 0; + g_object_set(renderer, "text", buffer, NULL); +} + +static void percentage_data_func(GtkTreeViewColumn *col, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + int index = (long)data; + int permille; + char buffer[10]; + + gtk_tree_model_get(model, iter, index, &permille, -1); + if (permille) + snprintf(buffer, sizeof(buffer), "%.1f%%", permille / 10.0); + else + *buffer = 0; + g_object_set(renderer, "text", buffer, NULL); +} + +static void selection_cb(GtkTreeSelection *selection, GtkTreeModel *model) +{ + GtkTreeIter iter; + int selected; + + selected = gtk_tree_selection_get_selected(selection, NULL, &iter); + gtk_widget_set_sensitive(cylinder_list.edit, selected); + gtk_widget_set_sensitive(cylinder_list.del, selected); +} + +static void row_activated_cb(GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, + GtkTreeModel *model) { - int i; - GtkWidget *vbox, *hbox; - GtkWidget *apply, *cancel; + edit_cb(NULL, NULL); +} + +static GtkWidget *cylinder_list_create(void) +{ + GtkWidget *tree_view; + GtkTreeSelection *selection; GtkListStore *model; + model = gtk_list_store_new(CYL_COLUMNS, + G_TYPE_STRING, /* CYL_DESC: utf8 */ + G_TYPE_INT, /* CYL_SIZE: mliter */ + G_TYPE_INT, /* CYL_WORKP: mbar */ + G_TYPE_INT, /* CYL_STARTP: mbar */ + G_TYPE_INT, /* CYL_ENDP: mbar */ + G_TYPE_INT, /* CYL_O2: permille */ + G_TYPE_INT /* CYL_HE: permille */ + ); + cylinder_list.model = model; + tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + g_signal_connect(tree_view, "row-activated", G_CALLBACK(row_activated_cb), model); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); + gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE); + g_signal_connect(selection, "changed", G_CALLBACK(selection_cb), model); + + g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE, + "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, + NULL); + + cylinder_list.desc = tree_view_column(tree_view, CYL_DESC, "Type", NULL, PANGO_ALIGN_LEFT, TRUE); + cylinder_list.size = tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, PANGO_ALIGN_RIGHT, TRUE); + cylinder_list.workp = tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE); + cylinder_list.startp = tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE); + cylinder_list.endp = tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE); + cylinder_list.o2 = tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE); + cylinder_list.he = tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE); + return tree_view; +} + +GtkWidget *equipment_widget(void) +{ + GtkWidget *vbox, *hbox, *frame, *framebox; + GtkWidget *add, *del, *edit; + vbox = gtk_vbox_new(FALSE, 3); - model = create_tank_size_model(); + /* + * We create the cylinder size model at startup, since + * we're going to share it across all cylinders and all + * dives. So if you add a new cylinder type in one dive, + * it will show up when you edit the cylinder types for + * another dive. + */ + cylinder_model = create_tank_size_model(); - /* Create all MAX_CYLINDER gtk widgets */ - for (i = 0; i < MAX_CYLINDERS; i++) - cylinder_widget(i, model); + cylinder_list.tree_view = cylinder_list_create(); - /* But only connect two of them right now to the frame vbox */ - for (i = 0; i < 2; i++) { - struct cylinder_widget *cylinder = gtk_cylinder+i; - gtk_box_pack_start(GTK_BOX(vbox), cylinder->hbox, FALSE, TRUE, 0); - } + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); - hbox = gtk_hbox_new(TRUE, 3); - gtk_box_pack_end(GTK_BOX(vbox), hbox, TRUE, FALSE, 0); + frame = gtk_frame_new("Cylinders"); + gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, FALSE, 3); - apply = gtk_button_new_from_stock(GTK_STOCK_APPLY); - cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); - gtk_box_pack_start(GTK_BOX(hbox), apply, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), cancel, FALSE, FALSE, 0); + framebox = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), framebox); - g_signal_connect(apply, "clicked", G_CALLBACK(apply_cb), NULL); - g_signal_connect(cancel, "clicked", G_CALLBACK(cancel_cb), NULL); + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + + gtk_box_pack_start(GTK_BOX(hbox), cylinder_list.tree_view, TRUE, FALSE, 3); + + hbox = gtk_hbox_new(TRUE, 3); + gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); + + edit = gtk_button_new_from_stock(GTK_STOCK_EDIT); + add = gtk_button_new_from_stock(GTK_STOCK_ADD); + del = gtk_button_new_from_stock(GTK_STOCK_DELETE); + gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0); + + cylinder_list.edit = edit; + cylinder_list.add = add; + cylinder_list.del = del; + + g_signal_connect(edit, "clicked", G_CALLBACK(edit_cb), NULL); + g_signal_connect(add, "clicked", G_CALLBACK(add_cb), NULL); + g_signal_connect(del, "clicked", G_CALLBACK(del_cb), NULL); return vbox; } @@ -205,6 +205,42 @@ static void quit(GtkWidget *w, gpointer data) gtk_main_quit(); } +GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title, + data_func_t data_func, PangoAlignment align, gboolean visible) +{ + GtkCellRenderer *renderer; + GtkTreeViewColumn *col; + double xalign = 0.0; /* left as default */ + + 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, index); + 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, (void *)(long)index, NULL); + else + gtk_tree_view_column_add_attribute(col, renderer, "text", index); + gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL); + switch (align) { + case PANGO_ALIGN_LEFT: + xalign = 0.0; + break; + case PANGO_ALIGN_CENTER: + xalign = 0.5; + break; + case PANGO_ALIGN_RIGHT: + xalign = 1.0; + break; + } + gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5); + gtk_tree_view_column_set_visible(col, visible); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col); + return col; +} + static void create_radio(GtkWidget *vbox, const char *name, ...) { va_list args; @@ -146,10 +146,15 @@ void uemis_parse_divelog_binary(char *base64, void *datap) { gasoffset = 4; for (i = 0; i < template; i++) { float volume = *(float *)(data+116+25*(gasoffset + i)) * 1000.0; - /* uemis always assumes a working pressure of 3000psi / 206bar - even though that's wrong */ - /* I also think that the unit that it stores (cuft for me) might change with SDA settings */ - // dive->cylinder[i].type.size.mliter = volume * 206.84 / 28.317; - dive->cylinder[i].type.size.mliter = volume * 200 / 28.317; + /* uemis always assumes a working pressure of 202.6bar (!?!?) - I first thought + * it was 3000psi, but testing against all my dives gets me that strange number. + * Still, that's of course completely bogus and shows they don't get how + * cylinders are named in non-metric parts of the world... + * we store the incorrect working pressure to get the SAC calculations "close" + * but the user will have to correct this manually + */ + dive->cylinder[i].type.size.mliter = volume; + dive->cylinder[i].type.workingpressure.mbar = 202600; dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data+120+25*(gasoffset + i)) * 10 + 0.5; dive->cylinder[i].gasmix.he.permille = 0; } |