X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=2c25e03b1ac977f5299bb1147ef10e1359bc10bc;hb=7d8fed4eee77ed8e011762bde6f5691f0fa81f39;hp=caa2958de037983037273245cc08a2f056e6761f;hpb=c43e1ad21b1a042bab96e2b214c6e33a412658d3;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index caa2958..2c25e03 100644 --- a/equipment.c +++ b/equipment.c @@ -67,6 +67,12 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data) 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, GtkTreeIter *iter, @@ -81,18 +87,45 @@ static gboolean match_cylinder(GtkTreeModel *model, if (strcmp(desc, name)) return FALSE; gtk_combo_box_set_active_iter(cylinder_description, iter); + found_match = 1; return TRUE; } +static void add_cylinder(const char *desc, int ml, int mbar) +{ + GtkTreeModel *model; + + 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); + } +} + void show_dive_equipment(struct dive *dive) { cylinder_t *cyl = &dive->cylinder[0]; const char *desc = cyl->type.description; - GtkTreeModel *model = gtk_combo_box_get_model(cylinder_description); + int ml, mbar; double o2; - if (desc) - gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc); + if (!desc) + desc = ""; + + ml = cyl->type.size.mliter; + mbar = cyl->type.workingpressure.mbar; + add_cylinder(desc, ml, mbar); set_cylinder_spinbuttons(cyl->type.size.mliter, cyl->type.workingpressure.mbar); o2 = cyl->gasmix.o2.permille / 10.0; @@ -103,13 +136,16 @@ void show_dive_equipment(struct dive *dive) static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr) { - GtkWidget *frame, *button; + GtkWidget *frame, *hbox, *button; frame = gtk_frame_new(name); - gtk_container_add(GTK_CONTAINER(vbox), frame); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), hbox); button = gtk_spin_button_new_with_range(min, max, incr); - gtk_container_add(GTK_CONTAINER(frame), button); + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0); gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID); @@ -137,6 +173,11 @@ static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume, cyl->type.size.mliter = ml; cyl->type.workingpressure.mbar = mbar; cyl->gasmix.o2.permille = o2; + + /* + * Also, insert it into the model if it doesn't already exist + */ + add_cylinder(desc, ml, mbar); } static void record_cylinder_changes(struct dive *dive) @@ -158,30 +199,50 @@ 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) { @@ -215,15 +276,18 @@ static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model) 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); frame = gtk_frame_new("Description"); - gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0); + 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); @@ -234,7 +298,7 @@ static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model) widget = create_spinbutton(hbox, "Size", 0, 200, 0.1); cylinder_size = GTK_SPIN_BUTTON(widget); - widget = create_spinbutton(hbox, "Working Pressure", 0, 5000, 1); + widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1); cylinder_pressure = GTK_SPIN_BUTTON(widget); widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);