GtkComboBox *description;
GtkSpinButton *size, *pressure;
GtkWidget *start, *end, *pressure_button;
- GtkWidget *o2, *gasmix_button;
+ GtkWidget *o2, *he, *gasmix_button;
};
/* we want bar - so let's not use our unit functions */
{
const char *desc;
int ml, mbar;
- double o2;
+ int gasmix;
+ double o2, he;
/* Don't show uninitialized cylinder widgets */
if (!cylinder->description)
set_cylinder_type_spinbuttons(cylinder,
cyl->type.size.mliter, cyl->type.workingpressure.mbar);
set_cylinder_pressure_spinbuttons(cylinder, cyl);
+
+ gasmix = cyl->gasmix.o2.permille || cyl->gasmix.he.permille;
+ gtk_widget_set_sensitive(cylinder->o2, gasmix);
+ gtk_widget_set_sensitive(cylinder->he, gasmix);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), gasmix);
+
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);
+ he = cyl->gasmix.he.permille / 10.0;
if (!o2)
o2 = 21.0;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->he), he);
}
int cylinder_none(cylinder_t *cyl)
}
static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl, const char *desc,
- double volume, double pressure, double start, double end, int o2)
+ double volume, double pressure, double start, double end, int o2, int he)
{
int mbar, ml;
ml = volume * 1000 + 0.5;
mbar = pressure * 1000 + 0.5;
- if (o2 < 211)
+ /* Ignore obviously crazy He values */
+ if (o2 + he > 1000)
+ he = 0;
+
+ /* We have a rule that normal air is all zeroes */
+ if (!he && o2 > 208 && o2 < 211)
o2 = 0;
+
cyl->type.description = desc;
cyl->type.size.mliter = ml;
cyl->type.workingpressure.mbar = mbar;
cyl->start.mbar = start * 1000 + 0.5;
cyl->end.mbar = end * 1000 + 0.5;
cyl->gasmix.o2.permille = o2;
+ cyl->gasmix.he.permille = he;
/*
* Also, insert it into the model if it doesn't already exist
const gchar *desc;
GtkComboBox *box;
double volume, pressure, start, end;
- int o2;
+ int o2, he;
/* Ignore uninitialized cylinder widgets */
box = cylinder->description;
} else {
start = end = 0;
}
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button)))
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button))) {
o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5;
- else
+ he = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->he))*10 + 0.5;
+ } else {
o2 = 0;
- fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2);
+ he = 0;
+ }
+ fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2, he);
}
/*
*/
static struct tank_info {
const char *name;
- int size; /* cuft if < 1000, otherwise mliter */
- int psi; /* If zero, size is in mliter */
+ int cuft, ml, psi, bar;
} 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 },
+ { "10.0 l", .ml = 10000 },
+ { "11.1 l", .ml = 11100 },
/* Most common AL cylinders */
- { "AL50", 50, 3000 },
- { "AL63", 63, 3000 },
- { "AL72", 72, 3000 },
- { "AL80", 80, 3000 },
- { "AL100", 100, 3300 },
+ { "AL50", .cuft = 50, .psi = 3000 },
+ { "AL63", .cuft = 63, .psi = 3000 },
+ { "AL72", .cuft = 72, .psi = 3000 },
+ { "AL80", .cuft = 80, .psi = 3000 },
+ { "AL100", .cuft = 100, .psi = 3300 },
/* Somewhat common LP steel cylinders */
- { "LP85", 85, 2640 },
- { "LP95", 95, 2640 },
- { "LP108", 108, 2640 },
- { "LP121", 121, 2640 },
+ { "LP85", .cuft = 85, 2640 },
+ { "LP95", .cuft = 95, 2640 },
+ { "LP108", .cuft = 108, 2640 },
+ { "LP121", .cuft = 121, 2640 },
/* Somewhat common HP steel cylinders */
- { "HP65", 65, 3442 },
- { "HP80", 80, 3442 },
- { "HP100", 100, 3442 },
- { "HP119", 119, 3442 },
- { "HP130", 130, 3442 },
+ { "HP65", .cuft = 65, .psi = 3442 },
+ { "HP80", .cuft = 80, .psi = 3442 },
+ { "HP100", .cuft = 100, .psi = 3442 },
+ { "HP119", .cuft = 119, .psi = 3442 },
+ { "HP130", .cuft = 130, .psi = 3442 },
+
+ /* Common European steel cylinders */
+ { "10L 300 bar", .ml = 10000, .bar = 300 },
+ { "12L 200 bar", .ml = 12000, .bar = 200 },
+ { "12L 232 bar", .ml = 12000, .bar = 232 },
+ { "12L 300 bar", .ml = 12000, .bar = 300 },
+ { "15L 200 bar", .ml = 15000, .bar = 200 },
+ { "15L 232 bar", .ml = 15000, .bar = 232 },
+ { "D7 300 bar", .ml = 14000, .bar = 300 },
+ { "D8.5 232 bar", .ml = 17000, .bar = 232 },
+ { "D12 232 bar", .ml = 24000, .bar = 232 },
/* We'll fill in more from the dive log dynamically */
{ NULL, }
struct tank_info *info = tank_info;
while (info->name) {
- int size = info->size;
+ int ml = info->ml;
+ int cuft = info->cuft;
int psi = info->psi;
- int mbar = 0, ml = size;
+ int mbar;
+ double bar = info->bar;
/* Is it in cuft and psi? */
if (psi) {
- double bar = psi_to_bar(psi);
- double airvolume = cuft_to_l(size) * 1000.0;
- double atm = bar_to_atm(bar);
+ bar = psi_to_bar(psi);
+
+ if (cuft) {
+ double airvolume = cuft_to_l(cuft) * 1000.0;
+ double atm = bar_to_atm(bar);
- ml = airvolume / atm + 0.5;
- mbar = bar*1000 + 0.5;
+ ml = airvolume / atm + 0.5;
+ }
}
+ mbar = bar * 1000 + 0.5;
+
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
0, info->name,
}
}
-static void nitrox_cb(GtkToggleButton *button, gpointer data)
+static void gasmix_cb(GtkToggleButton *button, gpointer data)
{
struct cylinder_widget *cylinder = data;
int state;
state = gtk_toggle_button_get_active(button);
gtk_widget_set_sensitive(cylinder->o2, state);
+ gtk_widget_set_sensitive(cylinder->he, state);
}
static void pressure_cb(GtkToggleButton *button, gpointer data)
cylinder_cb(cylinder->description, data);
}
+/* Return a frame containing a hbox inside a hbox */
+static GtkWidget *frame_box(const char *title, GtkWidget *vbox)
+{
+ GtkWidget *hbox, *frame;
+
+ hbox = gtk_hbox_new(FALSE, 10);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 0);
+
+ frame = gtk_frame_new(title);
+ gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, FALSE, 0);
+
+ hbox = gtk_hbox_new(FALSE, 10);
+ gtk_container_add(GTK_CONTAINER(frame), hbox);
+
+ return hbox;
+}
+
+static GtkWidget *labeled_spinbutton(GtkWidget *box, const char *name, double min, double max, double incr)
+{
+ GtkWidget *hbox, *label, *button;
+
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, FALSE, 0);
+
+ label = gtk_label_new(name);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, FALSE, 0);
+
+ button = gtk_spin_button_new_with_range(min, max, incr);
+ gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
+
+ gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID);
+
+ return button;
+}
+
static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, GtkListStore *model)
{
GtkWidget *frame, *hbox;
/*
* Cylinder start/end pressures
*/
- hbox = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+ hbox = frame_box("Pressure", vbox);
- cylinder->pressure_button = gtk_check_button_new();
- gtk_box_pack_start(GTK_BOX(hbox), cylinder->pressure_button, FALSE, FALSE, 3);
- g_signal_connect(cylinder->pressure_button, "toggled", G_CALLBACK(pressure_cb), cylinder);
-
- widget = create_spinbutton(hbox, "Start Pressure", 0, 5000, 1);
+ widget = labeled_spinbutton(hbox, "Start", 0, 5000, 1);
cylinder->start = widget;
- widget = create_spinbutton(hbox, "End Pressure", 0, 5000, 1);
+ widget = labeled_spinbutton(hbox, "End", 0, 5000, 1);
cylinder->end = widget;
+ cylinder->pressure_button = gtk_check_button_new();
+ gtk_box_pack_start(GTK_BOX(hbox), cylinder->pressure_button, FALSE, FALSE, 3);
+ g_signal_connect(cylinder->pressure_button, "toggled", G_CALLBACK(pressure_cb), cylinder);
+
/*
* Cylinder gas mix: Air, Nitrox or Trimix
*/
- hbox = gtk_hbox_new(FALSE, 3);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+ hbox = frame_box("Gasmix", vbox);
- widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);
+ widget = labeled_spinbutton(hbox, "O"UTF8_SUBSCRIPT_2 "%", 1, 100, 0.1);
cylinder->o2 = widget;
+ widget = labeled_spinbutton(hbox, "He%", 0, 100, 0.1);
+ cylinder->he = 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);
-
- gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0);
+ gtk_box_pack_start(GTK_BOX(hbox), cylinder->gasmix_button, FALSE, FALSE, 3);
+ g_signal_connect(cylinder->gasmix_button, "toggled", G_CALLBACK(gasmix_cb), cylinder);
}
static int edit_cylinder_dialog(int index, cylinder_t *cyl)
"enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH,
NULL);
- tree_view_column(tree_view, CYL_DESC, "Type", NULL, PANGO_ALIGN_LEFT, TRUE);
- tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, PANGO_ALIGN_RIGHT, TRUE);
- tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
- tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
- tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
- tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
- tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
+ tree_view_column(tree_view, CYL_DESC, "Type", NULL, ALIGN_LEFT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, ALIGN_RIGHT | UNSORTABLE);
+ tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, ALIGN_RIGHT | UNSORTABLE);
return tree_view;
}
projects / ext / subsurface.git / blobdiff