#include "display.h"
#include "divelist.h"
-static int cylinder_changed;
-static GtkComboBox *cylinder_description;
-static GtkSpinButton *cylinder_size, *cylinder_pressure, *nitrox_value;
+struct cylinder_widget {
+ int changed;
+ GtkComboBox *description;
+ GtkSpinButton *size, *pressure;
+ GtkWidget *o2, *gasmix_button;
+};
+
+static struct cylinder_widget cylinder;
static void set_cylinder_spinbuttons(int ml, int mbar)
{
}
}
- gtk_spin_button_set_value(cylinder_size, volume);
- gtk_spin_button_set_value(cylinder_pressure, pressure);
+ 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)
/* Did the user set it to some non-standard value? */
if (!gtk_combo_box_get_active_iter(combo_box, &iter)) {
- cylinder_changed = 1;
+ cylinder.changed = 1;
return;
}
* the description by hand. Whatever. So ignore them if
* they are no-ops.
*/
- if (!cylinder_changed && cyl->type.description) {
+ if (!cylinder.changed && cyl->type.description) {
int same;
char *desc = gtk_combo_box_get_active_text(combo_box);
if (same)
return;
}
- cylinder_changed = 1;
+ cylinder.changed = 1;
gtk_tree_model_get_value(model, &iter, 1, &value1);
gtk_tree_model_get_value(model, &iter, 2, &value2);
name = g_value_get_string(&value);
if (strcmp(desc, name))
return FALSE;
- gtk_combo_box_set_active_iter(cylinder_description, iter);
+ 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)
desc = "";
- gtk_tree_model_foreach(model, match_cylinder, (gpointer)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;
+ gtk_widget_set_sensitive(cylinder.o2, !!o2);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder.gasmix_button), !!o2);
if (!o2)
o2 = 21.0;
- gtk_spin_button_set_value(nitrox_value, o2);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder.o2), o2);
}
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);
static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume, double pressure, int o2)
{
int mbar, ml;
- GtkTreeModel *model;
if (output_units.pressure == PSI)
pressure /= 14.5037738;
/*
* Also, insert it into the model if it doesn't already exist
*/
- 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);
- }
+ add_cylinder(desc, ml, mbar);
}
static void record_cylinder_changes(struct dive *dive)
{
const gchar *desc;
- GtkComboBox *box = cylinder_description;
+ 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;
+ volume = gtk_spin_button_get_value(cylinder.size);
+ pressure = gtk_spin_button_get_value(cylinder.pressure);
+ o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder.o2))*10 + 0.5;
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder.gasmix_button)))
+ o2 = 0;
fill_cylinder_info(dive->cylinder+0, desc, volume, pressure, o2);
}
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[] = {
+} 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 nitrox_cb(GtkToggleButton *button, gpointer data)
+{
+ GtkWidget *o2 = data;
+ int state;
+
+ state = gtk_toggle_button_get_active(button);
+ gtk_widget_set_sensitive(o2, state);
+}
+
static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
{
- GtkWidget *frame, *hbox;
+ GtkWidget *frame, *hbox, *hbox2;
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, FALSE, FALSE, 0);
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(TRUE, 3);
- gtk_container_add(GTK_CONTAINER(frame), hbox);
+ snprintf(buffer, sizeof(buffer), "Cylinder %d", nr+1);
+ frame = gtk_frame_new(buffer);
+ gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
- frame = gtk_frame_new("Description");
- gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0);
+ hbox2 = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(frame), hbox2);
widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
- gtk_container_add(GTK_CONTAINER(frame), widget);
+ gtk_box_pack_start(GTK_BOX(hbox2), widget, FALSE, TRUE, 0);
- cylinder_description = GTK_COMBO_BOX(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);
+ 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, "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);
+ cylinder.o2 = widget;
+ cylinder.gasmix_button = gtk_check_button_new();
+ gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(cylinder.o2)),
+ cylinder.gasmix_button, FALSE, FALSE, 3);
+ g_signal_connect(cylinder.gasmix_button, "toggled", G_CALLBACK(nitrox_cb), cylinder.o2);
+
+ gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder.o2), 21.0, 100.0);
}
static GtkListStore *create_tank_size_model(void)
projects / ext / subsurface.git / blobdiff