X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=bab0d5335137f0a00bd2c8a2dd5bdbd3f14d437e;hb=1cc62d581158d52252f2ad7ef076811129510141;hp=151b1f9bd0a77262536ad39d1169e4fa48b9b7ca;hpb=e48cebc2d8e3acdfaf64512259fa582245265799;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index 151b1f9..bab0d53 100644 --- a/equipment.c +++ b/equipment.c @@ -12,12 +12,31 @@ 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,}; - int volume, pressure; cylinder_t *cyl = current_dive->cylinder + 0; /* Did the user set it to some non-standard value? */ @@ -43,16 +62,17 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data) 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); + 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, @@ -67,22 +87,47 @@ 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); - 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); + 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; if (!o2) o2 = 21.0; @@ -104,25 +149,44 @@ static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double mi return button; } -static void fill_cylinder_info(cylinder_t *cyl, const char *desc, int mliter, int mbar, int o2) +static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume, double pressure, int o2) { + 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; 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) { const gchar *desc; GtkComboBox *box = cylinder_description; - int volume, pressure, o2; + double volume, pressure; + int 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; + 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); } @@ -132,30 +196,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) {