X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=2c25e03b1ac977f5299bb1147ef10e1359bc10bc;hb=9cb60c910681b0fb3c04d22c77bcf9c2754bfa7f;hp=f250c46f25a062bb12c1eb7457d82618b55a2a3d;hpb=8f12eed9e0acb474cdab019ce912db3afd3c3584;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index f250c46..2c25e03 100644 --- a/equipment.c +++ b/equipment.c @@ -8,7 +8,70 @@ #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 set_cylinder_spinbuttons(int ml, int mbar) +{ + 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; + } + if (output_units.pressure == PSI) { + pressure *= 14.5037738; /* Bar to PSI */ + } + } + + gtk_spin_button_set_value(cylinder_size, volume); + gtk_spin_button_set_value(cylinder_pressure, pressure); +} + +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,}; + 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); + gtk_tree_model_get_value(model, &iter, 2, &value2); + + set_cylinder_spinbuttons(g_value_get_int(&value1), g_value_get_int(&value2)); +} + +/* + * 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, @@ -23,132 +86,163 @@ 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); + found_match = 1; return TRUE; } -void show_dive_equipment(struct dive *dive) +static void add_cylinder(const char *desc, int ml, int mbar) { - const char *desc = dive->cylinder[0].type.description; - GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(cylinder_description)); + GtkTreeModel *model; - if (!desc) - return; + found_match = 0; + model = gtk_combo_box_get_model(cylinder_description); gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc); + + if (!found_match) { + GtkListStore *store = GTK_LIST_STORE(model); + GtkTreeIter 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); + } } -static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name) +void show_dive_equipment(struct dive *dive) { - GtkWidget *frame, *button; + cylinder_t *cyl = &dive->cylinder[0]; + const char *desc = cyl->type.description; + int ml, mbar; + double o2; - frame = gtk_frame_new(name); - gtk_container_add(GTK_CONTAINER(vbox), frame); + if (!desc) + desc = ""; - button = gtk_spin_button_new_with_range( 1.0, 3000, 0.1); - gtk_container_add(GTK_CONTAINER(frame), button); + ml = cyl->type.size.mliter; + mbar = cyl->type.workingpressure.mbar; + add_cylinder(desc, ml, mbar); - return button; + set_cylinder_spinbuttons(cyl->type.size.mliter, cyl->type.workingpressure.mbar); + o2 = cyl->gasmix.o2.permille / 10.0; + if (!o2) + o2 = 21.0; + gtk_spin_button_set_value(nitrox_value, o2); } -static int get_cylinder_details(const char *name, int *volume, int *pressure) +static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr) { - 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); + GtkWidget *frame, *hbox, *button; 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); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), hbox); - create_spinbutton(vbox, "Size:"); - create_spinbutton(vbox, "Working pressure:"); + button = gtk_spin_button_new_with_range(min, max, incr); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0); - gtk_widget_show_all(dialog); - result = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); + gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID); - *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, double volume, double pressure, 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 + int mbar, ml; + + if (output_units.pressure == PSI) + pressure /= 14.5037738; + + if (pressure && output_units.volume == CUFT) { + volume *= 28.3168466; /* CUFT to liter */ + volume /= pressure / 1.01325; + } + + ml = volume * 1000 + 0.5; + mbar = pressure * 1000 + 0.5; + + if (o2 < 211) + o2 = 0; cyl->type.description = desc; - cyl->type.size.mliter = mliter; + cyl->type.size.mliter = ml; cyl->type.workingpressure.mbar = mbar; -#endif + cyl->gasmix.o2.permille = o2; + + /* + * Also, insert it into the model if it doesn't already exist + */ + add_cylinder(desc, ml, mbar); } -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; + double volume, pressure; + int o2; + + desc = gtk_combo_box_get_active_text(box); + volume = gtk_spin_button_get_value(cylinder_size); + pressure = gtk_spin_button_get_value(cylinder_pressure); + 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 */ +/* + * We hardcode the most common standard cylinders, + * we should pick up any other names from the dive + * logs directly. + */ static struct tank_info { const char *name; - int size; /* cuft or mliter depending on psi */ + int size; /* cuft if < 1000, otherwise mliter */ int psi; /* If zero, size is in mliter */ -} tank_info[] = { - { "None", 0, 0 }, +} 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 }, - { "AL72", 72, 3000 }, - { "AL80", 80, 3000 }, - { "LP85", 85, 2400 }, - { "LP95", 95, 2400 }, - { "LP85+", 85, 2640 }, - { "LP95+", 95, 2640 }, + + /* Most common AL cylinders */ + { "AL50", 50, 3000 }, + { "AL63", 63, 3000 }, + { "AL72", 72, 3000 }, + { "AL80", 80, 3000 }, + { "AL100", 100, 3300 }, + + /* Somewhat common LP steel cylinders */ + { "LP85", 85, 2640 }, + { "LP95", 95, 2640 }, + { "LP108", 108, 2640 }, + { "LP121", 121, 2640 }, + + /* Somewhat common HP steel cylinders */ + { "HP65", 65, 3442 }, + { "HP80", 80, 3442 }, { "HP100", 100, 3442 }, { "HP119", 119, 3442 }, + { "HP130", 130, 3442 }, + + /* We'll fill in more from the dive log dynamically */ { NULL, } }; static void fill_tank_list(GtkListStore *store) { GtkTreeIter iter; - struct tank_info *info = tank_info; while (info->name) { @@ -178,20 +272,38 @@ 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]; + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0); + snprintf(buffer, sizeof(buffer), "Cylinder %d", nr); frame = gtk_frame_new(buffer); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0); - hbox = gtk_hbox_new(TRUE, 3); + hbox = gtk_hbox_new(FALSE, 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, TRUE, 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, "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)