X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=151b1f9bd0a77262536ad39d1169e4fa48b9b7ca;hb=e48cebc2d8e3acdfaf64512259fa582245265799;hp=f250c46f25a062bb12c1eb7457d82618b55a2a3d;hpb=8f12eed9e0acb474cdab019ce912db3afd3c3584;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index f250c46..151b1f9 100644 --- a/equipment.c +++ b/equipment.c @@ -8,7 +8,50 @@ #include "display.h" #include "divelist.h" -static GtkWidget *cylinder_description; +static int cylinder_changed; +static GtkComboBox *cylinder_description; +static GtkSpinButton *cylinder_size, *cylinder_pressure, *nitrox_value; + +static void cylinder_cb(GtkComboBox *combo_box, gpointer data) +{ + GtkTreeIter iter; + GtkTreeModel *model = gtk_combo_box_get_model(combo_box); + GValue value1 = {0, }, value2 = {0,}; + int volume, pressure; + cylinder_t *cyl = current_dive->cylinder + 0; + + /* Did the user set it to some non-standard value? */ + if (!gtk_combo_box_get_active_iter(combo_box, &iter)) { + cylinder_changed = 1; + return; + } + + /* + * We get "change" signal callbacks just because we set + * the description by hand. Whatever. So ignore them if + * they are no-ops. + */ + if (!cylinder_changed && cyl->type.description) { + int same; + char *desc = gtk_combo_box_get_active_text(combo_box); + + same = !strcmp(desc, cyl->type.description); + g_free(desc); + if (same) + return; + } + cylinder_changed = 1; + + gtk_tree_model_get_value(model, &iter, 1, &value1); + volume = g_value_get_int(&value1); + gtk_tree_model_get_value(model, &iter, 2, &value2); + pressure = g_value_get_int(&value2); + + gtk_spin_button_set_value(cylinder_size, + volume / 1000.0); + gtk_spin_button_set_value(cylinder_pressure, + pressure / 1000.0); +} static gboolean match_cylinder(GtkTreeModel *model, GtkTreePath *path, @@ -23,106 +66,70 @@ static gboolean match_cylinder(GtkTreeModel *model, name = g_value_get_string(&value); if (strcmp(desc, name)) return FALSE; - gtk_combo_box_set_active_iter(GTK_COMBO_BOX(cylinder_description), iter); + gtk_combo_box_set_active_iter(cylinder_description, iter); return TRUE; } void show_dive_equipment(struct dive *dive) { - const char *desc = dive->cylinder[0].type.description; - GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(cylinder_description)); - - if (!desc) - return; - gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc); + cylinder_t *cyl = &dive->cylinder[0]; + const char *desc = cyl->type.description; + GtkTreeModel *model = gtk_combo_box_get_model(cylinder_description); + double o2; + + if (desc) + gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc); + gtk_spin_button_set_value(cylinder_size, + cyl->type.size.mliter / 1000.0); + gtk_spin_button_set_value(cylinder_pressure, + cyl->type.workingpressure.mbar / 1000.0); + o2 = cyl->gasmix.o2.permille / 10.0; + if (!o2) + o2 = 21.0; + gtk_spin_button_set_value(nitrox_value, o2); } -static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name) +static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr) { GtkWidget *frame, *button; frame = gtk_frame_new(name); gtk_container_add(GTK_CONTAINER(vbox), frame); - button = gtk_spin_button_new_with_range( 1.0, 3000, 0.1); + button = gtk_spin_button_new_with_range(min, max, incr); gtk_container_add(GTK_CONTAINER(frame), button); - return button; -} - -static int get_cylinder_details(const char *name, int *volume, int *pressure) -{ - int result; - GtkWidget *dialog, *frame, *vbox; - - dialog = gtk_dialog_new_with_buttons("New Cylinder Type", - GTK_WINDOW(main_window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - NULL); + gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID); - frame = gtk_frame_new(name); - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), frame); - vbox = gtk_vbox_new(TRUE, 6); - gtk_container_add(GTK_CONTAINER(frame), vbox); - - create_spinbutton(vbox, "Size:"); - create_spinbutton(vbox, "Working pressure:"); - - gtk_widget_show_all(dialog); - result = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - - *volume = 0; - *pressure = 0; - return result == GTK_RESPONSE_ACCEPT; + return button; } -static void fill_cylinder_info(cylinder_t *cyl, const char *desc, int mliter, int mbar) +static void fill_cylinder_info(cylinder_t *cyl, const char *desc, int mliter, int mbar, int o2) { - /* - * The code is currently too broken to actually set anything, - * so just print what we would set - */ - printf("Set cylinder to '%s': %.1f liter at %.1f bar working pressure\n", - desc, mliter / 1000.0, mbar / 1000.); -#if 0 + if (o2 < 211) + o2 = 0; cyl->type.description = desc; cyl->type.size.mliter = mliter; cyl->type.workingpressure.mbar = mbar; -#endif + cyl->gasmix.o2.permille = o2; } -void flush_dive_equipment_changes(struct dive *dive) +static void record_cylinder_changes(struct dive *dive) { - GtkTreeIter iter; const gchar *desc; - GtkComboBox *box = GTK_COMBO_BOX(cylinder_description); - GtkTreeModel *model = gtk_combo_box_get_model(box); - GtkListStore *store = GTK_LIST_STORE(model); - GValue value1 = {0, }, value2 = {0,}, value3 = {0, }; - int volume, pressure; - - if (!gtk_combo_box_get_active_iter(box, &iter)) { - desc = gtk_combo_box_get_active_text(box); - if (!get_cylinder_details(desc, &volume, &pressure)) - return; - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, desc, - 1, volume, - 2, pressure, - -1); - } + GtkComboBox *box = cylinder_description; + int volume, pressure, o2; + + desc = gtk_combo_box_get_active_text(box); + volume = gtk_spin_button_get_value(cylinder_size) * 1000 + 0.5; + pressure = gtk_spin_button_get_value(cylinder_pressure) * 1000 + 0.5; + o2 = gtk_spin_button_get_value(nitrox_value)*10 + 0.5; + fill_cylinder_info(dive->cylinder+0, desc, volume, pressure, o2); +} - gtk_tree_model_get_value(model, &iter, 0, &value1); - desc = g_value_get_string(&value1); - gtk_tree_model_get_value(model, &iter, 1, &value2); - volume = g_value_get_int(&value2); - gtk_tree_model_get_value(model, &iter, 2, &value3); - pressure = g_value_get_int(&value3); - fill_cylinder_info(dive->cylinder+0, desc, volume, pressure); +void flush_dive_equipment_changes(struct dive *dive) +{ + record_cylinder_changes(dive); } /* We should take these from the dive list instead */ @@ -178,7 +185,8 @@ static void fill_tank_list(GtkListStore *store) static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model) { - GtkWidget *frame, *hbox, *size; + GtkWidget *frame, *hbox; + GtkWidget *widget; char buffer[80]; snprintf(buffer, sizeof(buffer), "Cylinder %d", nr); @@ -188,10 +196,24 @@ static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model) hbox = gtk_hbox_new(TRUE, 3); gtk_container_add(GTK_CONTAINER(frame), hbox); - size = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0); - gtk_box_pack_start(GTK_BOX(hbox), size, FALSE, FALSE, 0); + frame = gtk_frame_new("Description"); + gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0); + + widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0); + gtk_container_add(GTK_CONTAINER(frame), widget); + + cylinder_description = GTK_COMBO_BOX(widget); + g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), NULL); + + widget = create_spinbutton(hbox, "Size", 0, 200, 0.1); + cylinder_size = GTK_SPIN_BUTTON(widget); + + widget = create_spinbutton(hbox, "Working Pressure", 0, 5000, 1); + cylinder_pressure = GTK_SPIN_BUTTON(widget); - cylinder_description = size; + widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1); + nitrox_value = GTK_SPIN_BUTTON(widget); + gtk_spin_button_set_range(nitrox_value, 21.0, 100.0); } static GtkListStore *create_tank_size_model(void)