static int cylinder_changed;
static GtkComboBox *cylinder_description;
-static GtkSpinButton *cylinder_size, *cylinder_pressure;
+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;
- cylinder_changed = 1;
- if (!gtk_combo_box_get_active_iter(combo_box, &iter))
+ /* 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);
+ 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,
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_type_t *type = &dive->cylinder[0].type;
- const char *desc = type->description;
- GtkTreeModel *model = gtk_combo_box_get_model(cylinder_description);
-
- if (desc)
- gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
- gtk_spin_button_set_value(cylinder_size,
- type->size.mliter / 1000.0);
- gtk_spin_button_set_value(cylinder_pressure,
- type->workingpressure.mbar / 1000.0);
+ cylinder_t *cyl = &dive->cylinder[0];
+ const char *desc = cyl->type.description;
+ int ml, mbar;
+ double o2;
+
+ 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;
+ 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;
+ 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_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
- button = gtk_spin_button_new_with_range( 0.0, 3500.0, 0.1);
- gtk_container_add(GTK_CONTAINER(frame), button);
+ gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID);
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);
}
static void record_cylinder_changes(struct dive *dive)
{
const gchar *desc;
GtkComboBox *box = cylinder_description;
- gdouble volume, pressure;
+ 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);
-
- fill_cylinder_info(dive->cylinder+0,
- desc, volume * 1000, pressure * 1000);
+ o2 = gtk_spin_button_get_value(nitrox_value)*10 + 0.5;
+ fill_cylinder_info(dive->cylinder+0, desc, volume, pressure, o2);
}
void flush_dive_equipment_changes(struct dive *dive)
{
- if (cylinder_changed) {
- cylinder_changed = 0;
- record_cylinder_changes(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) {
static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
{
GtkWidget *frame, *hbox;
- GtkWidget *description, *size, *pressure;
+ 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);
- description = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
- gtk_container_add(GTK_CONTAINER(frame), description);
+ cylinder_description = GTK_COMBO_BOX(widget);
+ g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), NULL);
- cylinder_description = GTK_COMBO_BOX(description);
- g_signal_connect(description, "changed", G_CALLBACK(cylinder_cb), description);
+ widget = create_spinbutton(hbox, "Size", 0, 200, 0.1);
+ cylinder_size = GTK_SPIN_BUTTON(widget);
- size = create_spinbutton(hbox, "Size");
- cylinder_size = GTK_SPIN_BUTTON(size);
+ widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1);
+ cylinder_pressure = GTK_SPIN_BUTTON(widget);
- pressure = create_spinbutton(hbox, "Working Pressure");
- cylinder_pressure = GTK_SPIN_BUTTON(pressure);
+ 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)
projects / ext / subsurface.git / blobdiff