#include "display.h"
#include "divelist.h"
+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));
+}
+
+static gboolean match_cylinder(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ const char *name;
+ const char *desc = data;
+ GValue value = {0, };
+
+ gtk_tree_model_get_value(model, iter, 0, &value);
+ name = g_value_get_string(&value);
+ if (strcmp(desc, name))
+ return FALSE;
+ gtk_combo_box_set_active_iter(cylinder_description, iter);
+ return TRUE;
+}
+
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);
+ double o2;
+
+ if (desc)
+ gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
+
+ 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, 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(min, max, incr);
+ 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, 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 = ml;
+ cyl->type.workingpressure.mbar = mbar;
+ cyl->gasmix.o2.permille = o2;
+}
+
+static void record_cylinder_changes(struct dive *dive)
+{
+ const gchar *desc;
+ 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);
}
void flush_dive_equipment_changes(struct dive *dive)
{
+ record_cylinder_changes(dive);
}
+/* We should take these from the dive list instead */
static struct tank_info {
const char *name;
int size; /* cuft or mliter depending on psi */
int psi; /* If zero, size is in mliter */
} tank_info[] = {
- { "None", },
+ { "None", 0, 0 },
{ "10.0 l", 10000 },
{ "11.1 l", 11100 },
{ "AL72", 72, 3000 },
{ "AL80", 80, 3000 },
- { "LP85", 85, 2640 },
- { "LP95", 95, 2640 },
+ { "LP85", 85, 2400 },
+ { "LP95", 95, 2400 },
+ { "LP85+", 85, 2640 },
+ { "LP95+", 95, 2640 },
{ "HP100", 100, 3442 },
{ "HP119", 119, 3442 },
{ NULL, }
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);
frame = gtk_frame_new(buffer);
- gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
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);
+
+ 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)
GtkWidget *vbox;
GtkListStore *model;
- vbox = gtk_vbox_new(TRUE, 3);
+ vbox = gtk_vbox_new(FALSE, 3);
model = create_tank_size_model();
cylinder_widget(vbox, 0, model);