X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=d2c7891aef4569c334d2a3c210be73aaf51d25cc;hb=43530d397bd8d754202d0e97d13c32c1f0685f01;hp=69006439084b1ee905c27f522dba9bb8222ffa5c;hpb=567c945714e0f627b8b7fe638d925b91b8397a9a;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index 6900643..d2c7891 100644 --- a/equipment.c +++ b/equipment.c @@ -3,7 +3,6 @@ * controlled through the following interfaces: * * void show_dive_equipment(struct dive *dive) - * void flush_dive_equipment_changes(struct dive *dive) * * called from gtk-ui: * GtkWidget *equipment_widget(void) @@ -19,7 +18,7 @@ #include "display-gtk.h" #include "divelist.h" -GtkListStore *cylinder_model; +static GtkListStore *cylinder_model; enum { CYL_DESC, @@ -35,9 +34,7 @@ enum { 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 { @@ -45,46 +42,46 @@ struct cylinder_widget { const char *name; GtkWidget *hbox; GtkComboBox *description; - GtkSpinButton *size, *pressure, *start, *end; - GtkWidget *o2, *gasmix_button; + GtkSpinButton *size, *pressure; + GtkWidget *start, *end, *pressure_button; + GtkWidget *o2, *he, *gasmix_button; }; +/* we want bar - so let's not use our unit functions */ static int convert_pressure(int mbar, double *p) { int decimals = 1; double pressure; - pressure = mbar / 1000.0; - if (mbar) { - if (output_units.pressure == PSI) { - pressure *= 14.5037738; /* Bar to PSI */ - decimals = 0; - } + if (output_units.pressure == PSI) { + pressure = mbar_to_PSI(mbar); + decimals = 0; + } else { + pressure = mbar / 1000.0; } + *p = pressure; return decimals; } -static int convert_volume_pressure(int ml, int mbar, double *v, double *p) +static void convert_volume_pressure(int ml, int mbar, double *v, double *p) { - int decimals = 1; double volume, pressure; volume = ml / 1000.0; - pressure = mbar / 1000.0; if (mbar) { if (output_units.volume == CUFT) { - volume /= 28.3168466; /* Liters to cuft */ - volume *= pressure / 1.01325; + volume = ml_to_cuft(ml); + volume *= bar_to_atm(mbar / 1000.0); } + if (output_units.pressure == PSI) { - pressure *= 14.5037738; /* Bar to PSI */ - decimals = 0; - } + pressure = mbar_to_PSI(mbar); + } else + pressure = mbar / 1000.0; } *v = volume; *p = pressure; - return decimals; } static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) @@ -96,14 +93,74 @@ static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int gtk_spin_button_set_value(cylinder->pressure, pressure); } -static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, int start, int end) +static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, cylinder_t *cyl) { + int set; + unsigned int start, end; double pressure; + start = cyl->start.mbar; + end = cyl->end.mbar; + set = start || end; + if (!set) { + start = cyl->sample_start.mbar; + end = cyl->sample_end.mbar; + } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->pressure_button), set); + gtk_widget_set_sensitive(cylinder->start, set); + gtk_widget_set_sensitive(cylinder->end, set); + convert_pressure(start, &pressure); - gtk_spin_button_set_value(cylinder->start, pressure); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->start), pressure); convert_pressure(end, &pressure); - gtk_spin_button_set_value(cylinder->end, pressure); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->end), pressure); +} + +/* + * The gtk_tree_model_foreach() interface is bad. It could have + * returned whether the callback ever returned true + */ +static GtkTreeIter *found_match = NULL; +static GtkTreeIter match_iter; + +static gboolean match_cylinder(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + int match; + gchar *name; + const char *desc = data; + + gtk_tree_model_get(model, iter, 0, &name, -1); + match = !strcmp(desc, name); + g_free(name); + if (match) { + match_iter = *iter; + found_match = &match_iter; + } + return match; +} + +static int get_active_cylinder(GtkComboBox *combo_box, GtkTreeIter *iter) +{ + char *desc; + + if (gtk_combo_box_get_active_iter(combo_box, iter)) + return TRUE; + + desc = gtk_combo_box_get_active_text(combo_box); + + found_match = NULL; + gtk_tree_model_foreach(GTK_TREE_MODEL(cylinder_model), match_cylinder, (void *)desc); + + g_free(desc); + if (!found_match) + return FALSE; + + *iter = *found_match; + gtk_combo_box_set_active_iter(combo_box, iter); + return TRUE; } static void cylinder_cb(GtkComboBox *combo_box, gpointer data) @@ -115,7 +172,7 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data) cylinder_t *cyl = current_dive->cylinder + cylinder->index; /* Did the user set it to some non-standard value? */ - if (!gtk_combo_box_get_active_iter(combo_box, &iter)) { + if (!get_active_cylinder(combo_box, &iter)) { cylinder->changed = 1; return; } @@ -144,58 +201,66 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data) set_cylinder_type_spinbuttons(cylinder, ml, mbar); } -/* - * The gtk_tree_model_foreach() interface is bad. It could have - * returned whether the callback ever returned true - */ -static int found_match = 0; - -static gboolean match_cylinder(GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - const char *name; - struct cylinder_widget *cylinder = data; - GValue value = {0, }; - - gtk_tree_model_get_value(model, iter, 0, &value); - name = g_value_get_string(&value); - if (strcmp(cylinder->name, name)) - return FALSE; - gtk_combo_box_set_active_iter(cylinder->description, iter); - found_match = 1; - return TRUE; -} - -static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar) +static GtkTreeIter *add_cylinder_type(const char *desc, int ml, int mbar, GtkTreeIter *iter) { GtkTreeModel *model; - found_match = 0; - model = gtk_combo_box_get_model(cylinder->description); - cylinder->name = desc; - gtk_tree_model_foreach(model, match_cylinder, cylinder); + /* Don't even bother adding stuff without a size */ + if (!ml) + return NULL; + + found_match = NULL; + model = GTK_TREE_MODEL(cylinder_model); + gtk_tree_model_foreach(model, match_cylinder, (void *)desc); if (!found_match) { GtkListStore *store = GTK_LIST_STORE(model); - GtkTreeIter iter; - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, + gtk_list_store_append(store, iter); + gtk_list_store_set(store, iter, 0, desc, 1, ml, 2, mbar, -1); - gtk_combo_box_set_active_iter(cylinder->description, &iter); + return iter; } + return found_match; +} + +/* + * When adding a dive, we'll add all the pre-existing cylinder + * information from that dive to our cylinder model. + */ +void add_cylinder_description(cylinder_type_t *type) +{ + GtkTreeIter iter; + const char *desc; + unsigned int size, workp; + + desc = type->description; + if (!desc) + return; + size = type->size.mliter; + workp = type->workingpressure.mbar; + add_cylinder_type(desc, size, workp, &iter); +} + +static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar) +{ + GtkTreeIter iter, *match; + + cylinder->name = desc; + match = add_cylinder_type(desc, ml, mbar, &iter); + if (match) + gtk_combo_box_set_active_iter(cylinder->description, match); } static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) { const char *desc; int ml, mbar; - double o2; + int gasmix; + double o2, he; /* Don't show uninitialized cylinder widgets */ if (!cylinder->description) @@ -210,35 +275,46 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) set_cylinder_type_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar); - set_cylinder_pressure_spinbuttons(cylinder, - cyl->start.mbar, cyl->end.mbar); + set_cylinder_pressure_spinbuttons(cylinder, cyl); + + gasmix = cyl->gasmix.o2.permille || cyl->gasmix.he.permille; + gtk_widget_set_sensitive(cylinder->o2, gasmix); + gtk_widget_set_sensitive(cylinder->he, gasmix); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), gasmix); + o2 = cyl->gasmix.o2.permille / 10.0; - gtk_widget_set_sensitive(cylinder->o2, !!o2); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), !!o2); + he = cyl->gasmix.he.permille / 10.0; if (!o2) - o2 = 21.0; + o2 = AIR_PERMILLE / 10.0; gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->he), he); } -static int cyl_nothing(cylinder_t *cyl) +int cylinder_none(cylinder_t *cyl) { return !cyl->type.size.mliter && !cyl->type.workingpressure.mbar && !cyl->type.description && !cyl->gasmix.o2.permille && !cyl->gasmix.he.permille && + !cyl->sample_start.mbar && + !cyl->sample_end.mbar && !cyl->start.mbar && !cyl->end.mbar; } static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter) { + unsigned int start, end; + + start = cyl->start.mbar ? : cyl->sample_start.mbar; + end = cyl->end.mbar ? : cyl->sample_end.mbar; 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_STARTP, start, + CYL_ENDP, end, CYL_O2, cyl->gasmix.o2.permille, CYL_HE, cyl->gasmix.he.permille, -1); @@ -256,7 +332,7 @@ void show_dive_equipment(struct dive *dive) do { cylinder_t *cyl = &dive->cylinder[max-1]; - if (!cyl_nothing(cyl)) + if (!cylinder_none(cyl)) break; } while (--max); @@ -293,32 +369,39 @@ static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double mi } static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl, const char *desc, - double volume, double pressure, double start, double end, int o2) + double volume, double pressure, double start, double end, int o2, int he) { int mbar, ml; if (output_units.pressure == PSI) { - pressure /= 14.5037738; - start /= 14.5037738; - end /= 14.5037738; + pressure = psi_to_bar(pressure); + start = psi_to_bar(start); + end = psi_to_bar(end); } if (pressure && output_units.volume == CUFT) { - volume *= 28.3168466; /* CUFT to liter */ - volume /= pressure / 1.01325; + volume = cuft_to_l(volume); + volume /= bar_to_atm(pressure); } ml = volume * 1000 + 0.5; mbar = pressure * 1000 + 0.5; - if (o2 < 211) + /* Ignore obviously crazy He values */ + if (o2 + he > 1000) + he = 0; + + /* We have a rule that normal air is all zeroes */ + if (!he && o2 > 208 && o2 < 211) o2 = 0; + cyl->type.description = desc; cyl->type.size.mliter = ml; cyl->type.workingpressure.mbar = mbar; cyl->start.mbar = start * 1000 + 0.5; cyl->end.mbar = end * 1000 + 0.5; cyl->gasmix.o2.permille = o2; + cyl->gasmix.he.permille = he; /* * Also, insert it into the model if it doesn't already exist @@ -331,7 +414,7 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl const gchar *desc; GtkComboBox *box; double volume, pressure, start, end; - int o2; + int o2, he; /* Ignore uninitialized cylinder widgets */ box = cylinder->description; @@ -341,17 +424,20 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl desc = gtk_combo_box_get_active_text(box); volume = gtk_spin_button_get_value(cylinder->size); pressure = gtk_spin_button_get_value(cylinder->pressure); - start = gtk_spin_button_get_value(cylinder->start); - end = gtk_spin_button_get_value(cylinder->end); - o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5; - if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->pressure_button))) { + start = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->start)); + end = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->end)); + } else { + start = end = 0; + } + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button))) { + o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5; + he = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->he))*10 + 0.5; + } else { o2 = 0; - fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2); -} - -void flush_dive_equipment_changes(struct dive *dive) -{ - /* We do nothing: we require the "Ok" button press */ + he = 0; + } + fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2, he); } /* @@ -361,35 +447,45 @@ void flush_dive_equipment_changes(struct dive *dive) */ static struct tank_info { const char *name; - int size; /* cuft if < 1000, otherwise mliter */ - int psi; /* If zero, size is in mliter */ + int cuft, ml, psi, bar; } tank_info[100] = { /* Need an empty entry for the no-cylinder case */ - { "", 0, 0 }, + { "", }, /* Size-only metric cylinders */ - { "10.0 l", 10000 }, - { "11.1 l", 11100 }, + { "10.0 l", .ml = 10000 }, + { "11.1 l", .ml = 11100 }, /* Most common AL cylinders */ - { "AL50", 50, 3000 }, - { "AL63", 63, 3000 }, - { "AL72", 72, 3000 }, - { "AL80", 80, 3000 }, - { "AL100", 100, 3300 }, + { "AL50", .cuft = 50, .psi = 3000 }, + { "AL63", .cuft = 63, .psi = 3000 }, + { "AL72", .cuft = 72, .psi = 3000 }, + { "AL80", .cuft = 80, .psi = 3000 }, + { "AL100", .cuft = 100, .psi = 3300 }, /* Somewhat common LP steel cylinders */ - { "LP85", 85, 2640 }, - { "LP95", 95, 2640 }, - { "LP108", 108, 2640 }, - { "LP121", 121, 2640 }, + { "LP85", .cuft = 85, 2640 }, + { "LP95", .cuft = 95, 2640 }, + { "LP108", .cuft = 108, 2640 }, + { "LP121", .cuft = 121, 2640 }, /* Somewhat common HP steel cylinders */ - { "HP65", 65, 3442 }, - { "HP80", 80, 3442 }, - { "HP100", 100, 3442 }, - { "HP119", 119, 3442 }, - { "HP130", 130, 3442 }, + { "HP65", .cuft = 65, .psi = 3442 }, + { "HP80", .cuft = 80, .psi = 3442 }, + { "HP100", .cuft = 100, .psi = 3442 }, + { "HP119", .cuft = 119, .psi = 3442 }, + { "HP130", .cuft = 130, .psi = 3442 }, + + /* Common European steel cylinders */ + { "10L 300 bar", .ml = 10000, .bar = 300 }, + { "12L 200 bar", .ml = 12000, .bar = 200 }, + { "12L 232 bar", .ml = 12000, .bar = 232 }, + { "12L 300 bar", .ml = 12000, .bar = 300 }, + { "15L 200 bar", .ml = 15000, .bar = 200 }, + { "15L 232 bar", .ml = 15000, .bar = 232 }, + { "D7 300 bar", .ml = 14000, .bar = 300 }, + { "D8.5 232 bar", .ml = 17000, .bar = 232 }, + { "D12 232 bar", .ml = 24000, .bar = 232 }, /* We'll fill in more from the dive log dynamically */ { NULL, } @@ -401,20 +497,26 @@ static void fill_tank_list(GtkListStore *store) struct tank_info *info = tank_info; while (info->name) { - int size = info->size; + int ml = info->ml; + int cuft = info->cuft; int psi = info->psi; - int mbar = 0, ml = size; + int mbar; + double bar = info->bar; /* Is it in cuft and psi? */ if (psi) { - double bar = 0.0689475729 * psi; - double airvolume = 28316.8466 * size; - double atm = bar / 1.01325; + bar = psi_to_bar(psi); + + if (cuft) { + double airvolume = cuft_to_l(cuft) * 1000.0; + double atm = bar_to_atm(bar); - ml = airvolume / atm + 0.5; - mbar = bar*1000 + 0.5; + ml = airvolume / atm + 0.5; + } } + mbar = bar * 1000 + 0.5; + gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, info->name, @@ -425,18 +527,82 @@ static void fill_tank_list(GtkListStore *store) } } -static void nitrox_cb(GtkToggleButton *button, gpointer data) +static void gasmix_cb(GtkToggleButton *button, gpointer data) { struct cylinder_widget *cylinder = data; int state; state = gtk_toggle_button_get_active(button); gtk_widget_set_sensitive(cylinder->o2, state); + gtk_widget_set_sensitive(cylinder->he, state); +} + +static void pressure_cb(GtkToggleButton *button, gpointer data) +{ + struct cylinder_widget *cylinder = data; + int state; + + state = gtk_toggle_button_get_active(button); + gtk_widget_set_sensitive(cylinder->start, state); + gtk_widget_set_sensitive(cylinder->end, state); +} + +static gboolean completion_cb(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, struct cylinder_widget *cylinder) +{ + const char *desc; + unsigned int ml, mbar; + + gtk_tree_model_get(model, iter, CYL_DESC, &desc, CYL_SIZE, &ml, CYL_WORKP, &mbar, -1); + add_cylinder(cylinder, desc, ml, mbar); + return TRUE; +} + +static void cylinder_activate_cb(GtkComboBox *combo_box, gpointer data) +{ + struct cylinder_widget *cylinder = data; + cylinder_cb(cylinder->description, data); +} + +/* Return a frame containing a hbox inside a hbox */ +static GtkWidget *frame_box(const char *title, GtkWidget *vbox) +{ + GtkWidget *hbox, *frame; + + hbox = gtk_hbox_new(FALSE, 10); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0); + + frame = gtk_frame_new(title); + gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, FALSE, 0); + + hbox = gtk_hbox_new(FALSE, 10); + gtk_container_add(GTK_CONTAINER(frame), hbox); + + return hbox; +} + +static GtkWidget *labeled_spinbutton(GtkWidget *box, const char *name, double min, double max, double incr) +{ + GtkWidget *hbox, *label, *button; + + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, FALSE, 0); + + label = gtk_label_new(name); + gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0); + + button = gtk_spin_button_new_with_range(min, max, incr); + gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0); + + gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID); + + return button; } static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, GtkListStore *model) { GtkWidget *frame, *hbox; + GtkEntry *entry; + GtkEntryCompletion *completion; GtkWidget *widget; /* @@ -454,6 +620,15 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G cylinder->description = GTK_COMBO_BOX(widget); g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), cylinder); + entry = GTK_ENTRY(GTK_BIN(widget)->child); + g_signal_connect(entry, "activate", G_CALLBACK(cylinder_activate_cb), cylinder); + + completion = gtk_entry_completion_new(); + gtk_entry_completion_set_text_column(completion, 0); + gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(model)); + g_signal_connect(completion, "match-selected", G_CALLBACK(completion_cb), cylinder); + gtk_entry_set_completion(entry, completion); + 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); @@ -467,29 +642,30 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G /* * Cylinder start/end pressures */ - hbox = gtk_hbox_new(FALSE, 3); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + hbox = frame_box("Pressure", vbox); + + widget = labeled_spinbutton(hbox, "Start", 0, 5000, 1); + cylinder->start = widget; - widget = create_spinbutton(hbox, "Start Pressure", 0, 5000, 1); - cylinder->start = GTK_SPIN_BUTTON(widget); + widget = labeled_spinbutton(hbox, "End", 0, 5000, 1); + cylinder->end = widget; - widget = create_spinbutton(hbox, "End Pressure", 0, 5000, 1); - cylinder->end = GTK_SPIN_BUTTON(widget); + cylinder->pressure_button = gtk_check_button_new(); + gtk_box_pack_start(GTK_BOX(hbox), cylinder->pressure_button, FALSE, FALSE, 3); + g_signal_connect(cylinder->pressure_button, "toggled", G_CALLBACK(pressure_cb), cylinder); /* * Cylinder gas mix: Air, Nitrox or Trimix */ - hbox = gtk_hbox_new(FALSE, 3); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + hbox = frame_box("Gasmix", vbox); - widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1); + widget = labeled_spinbutton(hbox, "O"UTF8_SUBSCRIPT_2 "%", 1, 100, 0.1); cylinder->o2 = widget; + widget = labeled_spinbutton(hbox, "He%", 0, 100, 0.1); + cylinder->he = widget; cylinder->gasmix_button = gtk_check_button_new(); - gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(cylinder->o2)), - cylinder->gasmix_button, FALSE, FALSE, 3); - g_signal_connect(cylinder->gasmix_button, "toggled", G_CALLBACK(nitrox_cb), cylinder); - - gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0); + gtk_box_pack_start(GTK_BOX(hbox), cylinder->gasmix_button, FALSE, FALSE, 3); + g_signal_connect(cylinder->gasmix_button, "toggled", G_CALLBACK(gasmix_cb), cylinder); } static int edit_cylinder_dialog(int index, cylinder_t *cyl) @@ -525,6 +701,7 @@ static int edit_cylinder_dialog(int index, cylinder_t *cyl) record_cylinder_changes(cyl, &cylinder); dive->cylinder[index] = *cyl; mark_divelist_changed(TRUE); + update_cylinder_related_info(dive); flush_divelist(dive); } @@ -545,7 +722,7 @@ static int get_model_index(GtkListStore *model, GtkTreeIter *iter) return index; } -static void edit_cb(GtkButton *button, gpointer data) +static void edit_cb(GtkButton *button, GtkTreeView *tree_view) { int index; GtkTreeIter iter; @@ -553,7 +730,7 @@ static void edit_cb(GtkButton *button, gpointer data) GtkTreeSelection *selection; cylinder_t cyl; - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); + selection = gtk_tree_view_get_selection(tree_view); /* Nothing selected? This shouldn't happen, since the button should be inactive */ if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) @@ -567,7 +744,7 @@ static void edit_cb(GtkButton *button, gpointer data) repaint_dive(); } -static void add_cb(GtkButton *button, gpointer data) +static void add_cb(GtkButton *button, GtkTreeView *tree_view) { int index = cylinder_list.max_index; GtkTreeIter iter; @@ -581,14 +758,14 @@ static void add_cb(GtkButton *button, gpointer data) 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)); + selection = gtk_tree_view_get_selection(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) +static void del_cb(GtkButton *button, GtkTreeView *tree_view) { int index, nr; GtkTreeIter iter; @@ -597,7 +774,7 @@ static void del_cb(GtkButton *button, gpointer data) struct dive *dive; cylinder_t *cyl; - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(cylinder_list.tree_view)); + selection = gtk_tree_view_get_selection(tree_view); /* Nothing selected? This shouldn't happen, since the button should be inactive */ if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) @@ -711,26 +888,18 @@ static void row_activated_cb(GtkTreeView *tree_view, GtkTreeViewColumn *column, GtkTreeModel *model) { - edit_cb(NULL, NULL); + edit_cb(NULL, tree_view); } -static GtkWidget *cylinder_list_create(void) +GtkWidget *cylinder_list_widget(void) { + GtkListStore *model = cylinder_list.model; 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)); + gtk_widget_set_can_focus(tree_view, FALSE); + g_signal_connect(tree_view, "row-activated", G_CALLBACK(row_activated_cb), model); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); @@ -741,19 +910,36 @@ static GtkWidget *cylinder_list_create(void) "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); + tree_view_column(tree_view, CYL_DESC, "Type", NULL, ALIGN_LEFT | UNSORTABLE); + tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, ALIGN_RIGHT | UNSORTABLE); + tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, ALIGN_RIGHT | UNSORTABLE); + tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, ALIGN_RIGHT | UNSORTABLE); + tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, ALIGN_RIGHT | UNSORTABLE); + tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, ALIGN_RIGHT | UNSORTABLE); + tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, ALIGN_RIGHT | UNSORTABLE); return tree_view; } +static GtkWidget *cylinder_list_create(void) +{ + 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; + return cylinder_list_widget(); +} + GtkWidget *equipment_widget(void) { - GtkWidget *vbox, *hbox, *frame, *framebox; + GtkWidget *vbox, *hbox, *frame, *framebox, *tree_view; GtkWidget *add, *del, *edit; vbox = gtk_vbox_new(FALSE, 3); @@ -767,7 +953,7 @@ GtkWidget *equipment_widget(void) */ cylinder_model = create_tank_size_model(); - cylinder_list.tree_view = cylinder_list_create(); + tree_view = cylinder_list_create(); hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); @@ -781,7 +967,7 @@ GtkWidget *equipment_widget(void) 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); + gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3); hbox = gtk_hbox_new(TRUE, 3); gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3); @@ -797,9 +983,9 @@ GtkWidget *equipment_widget(void) 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); + g_signal_connect(edit, "clicked", G_CALLBACK(edit_cb), tree_view); + g_signal_connect(add, "clicked", G_CALLBACK(add_cb), tree_view); + g_signal_connect(del, "clicked", G_CALLBACK(del_cb), tree_view); return vbox; }