X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=f86e63b2073f0982902dfb3a55bf1f6e7c9b1f50;hb=4cff1f5b90217365d13ab2e2d5ff09b35590aab3;hp=ba7fb6859f87ce6e821c43bfbc39fc5dca342e43;hpb=776355cf10cf109ac50e8027381201b7b6d9f5ac;p=ext%2Fsubsurface.git diff --git a/equipment.c b/equipment.c index ba7fb68..f86e63b 100644 --- a/equipment.c +++ b/equipment.c @@ -19,7 +19,7 @@ #include "display-gtk.h" #include "divelist.h" -GtkListStore *cylinder_model; +static GtkListStore *cylinder_model; enum { CYL_DESC, @@ -46,21 +46,23 @@ struct cylinder_widget { GtkWidget *hbox; GtkComboBox *description; GtkSpinButton *size, *pressure; + GtkWidget *start, *end, *pressure_button; GtkWidget *o2, *gasmix_button; }; +/* we want bar - so let's not use our unit functions */ static int convert_pressure(int mbar, double *p) { int decimals = 1; double pressure; - pressure = mbar / 1000.0; - if (mbar) { - if (output_units.pressure == PSI) { - pressure *= 14.5037738; /* Bar to PSI */ - decimals = 0; - } + if (output_units.pressure == PSI) { + pressure = mbar_to_PSI(mbar); + decimals = 0; + } else { + pressure = mbar / 1000.0; } + *p = pressure; return decimals; } @@ -71,23 +73,24 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p) 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; + volume = ml_to_cuft(ml); + volume *= bar_to_atm(mbar / 1000.0); } + if (output_units.pressure == PSI) { - pressure *= 14.5037738; /* Bar to PSI */ + pressure = mbar_to_PSI(mbar); decimals = 0; - } + } else + pressure = mbar / 1000.0; } *v = volume; *p = pressure; return decimals; } -static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) +static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar) { double volume, pressure; @@ -96,16 +99,86 @@ static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, i gtk_spin_button_set_value(cylinder->pressure, pressure); } +static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, cylinder_t *cyl) +{ + int set; + unsigned int start, end; + double pressure; + + start = cyl->start.mbar; + end = cyl->end.mbar; + set = start || end; + if (!set) { + start = cyl->sample_start.mbar; + end = cyl->sample_end.mbar; + } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->pressure_button), set); + gtk_widget_set_sensitive(cylinder->start, set); + gtk_widget_set_sensitive(cylinder->end, set); + + convert_pressure(start, &pressure); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->start), pressure); + convert_pressure(end, &pressure); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->end), pressure); +} + +/* + * The gtk_tree_model_foreach() interface is bad. It could have + * returned whether the callback ever returned true + */ +static GtkTreeIter *found_match = NULL; +static GtkTreeIter match_iter; + +static gboolean match_cylinder(GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + int match; + gchar *name; + const char *desc = data; + + gtk_tree_model_get(model, iter, 0, &name, -1); + match = !strcmp(desc, name); + g_free(name); + if (match) { + match_iter = *iter; + found_match = &match_iter; + } + return match; +} + +static int get_active_cylinder(GtkComboBox *combo_box, GtkTreeIter *iter) +{ + char *desc; + + if (gtk_combo_box_get_active_iter(combo_box, iter)) + return TRUE; + + desc = gtk_combo_box_get_active_text(combo_box); + + found_match = NULL; + gtk_tree_model_foreach(GTK_TREE_MODEL(cylinder_model), match_cylinder, (void *)desc); + + g_free(desc); + if (!found_match) + return FALSE; + + *iter = *found_match; + gtk_combo_box_set_active_iter(combo_box, iter); + return TRUE; +} + 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 ml, mbar; struct cylinder_widget *cylinder = data; cylinder_t *cyl = current_dive->cylinder + cylinder->index; /* Did the user set it to some non-standard value? */ - if (!gtk_combo_box_get_active_iter(combo_box, &iter)) { + if (!get_active_cylinder(combo_box, &iter)) { cylinder->changed = 1; return; } @@ -126,57 +199,66 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data) } cylinder->changed = 1; - gtk_tree_model_get_value(model, &iter, 1, &value1); - gtk_tree_model_get_value(model, &iter, 2, &value2); - - set_cylinder_spinbuttons(cylinder, 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, - gpointer data) -{ - const char *name; - struct cylinder_widget *cylinder = data; - GValue value = {0, }; + gtk_tree_model_get(model, &iter, + CYL_SIZE, &ml, + CYL_WORKP, &mbar, + -1); - gtk_tree_model_get_value(model, iter, 0, &value); - name = g_value_get_string(&value); - if (strcmp(cylinder->name, name)) - return FALSE; - gtk_combo_box_set_active_iter(cylinder->description, iter); - found_match = 1; - return TRUE; + set_cylinder_type_spinbuttons(cylinder, ml, mbar); } -static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar) +static GtkTreeIter *add_cylinder_type(const char *desc, int ml, int mbar, GtkTreeIter *iter) { GtkTreeModel *model; - found_match = 0; - model = gtk_combo_box_get_model(cylinder->description); - cylinder->name = desc; - gtk_tree_model_foreach(model, match_cylinder, cylinder); + /* Don't even bother adding stuff without a size */ + if (!ml) + return NULL; + + found_match = NULL; + model = GTK_TREE_MODEL(cylinder_model); + gtk_tree_model_foreach(model, match_cylinder, (void *)desc); if (!found_match) { GtkListStore *store = GTK_LIST_STORE(model); - GtkTreeIter iter; - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &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); + return iter; } + return found_match; +} + +/* + * When adding a dive, we'll add all the pre-existing cylinder + * information from that dive to our cylinder model. + */ +void add_cylinder_description(cylinder_type_t *type) +{ + GtkTreeIter iter; + const char *desc; + unsigned int size, workp; + + desc = type->description; + if (!desc) + return; + size = type->size.mliter; + workp = type->workingpressure.mbar; + add_cylinder_type(desc, size, workp, &iter); +} + +static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar) +{ + GtkTreeIter iter, *match; + + cylinder->name = desc; + match = add_cylinder_type(desc, ml, mbar, &iter); + if (match) + gtk_combo_box_set_active_iter(cylinder->description, match); } static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) @@ -196,7 +278,9 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) mbar = cyl->type.workingpressure.mbar; add_cylinder(cylinder, desc, ml, mbar); - set_cylinder_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar); + set_cylinder_type_spinbuttons(cylinder, + cyl->type.size.mliter, cyl->type.workingpressure.mbar); + set_cylinder_pressure_spinbuttons(cylinder, cyl); 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); @@ -212,18 +296,24 @@ static int cyl_nothing(cylinder_t *cyl) !cyl->type.description && !cyl->gasmix.o2.permille && !cyl->gasmix.he.permille && + !cyl->sample_start.mbar && + !cyl->sample_end.mbar && !cyl->start.mbar && !cyl->end.mbar; } static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter) { + unsigned int start, end; + + start = cyl->start.mbar ? : cyl->sample_start.mbar; + end = cyl->end.mbar ? : cyl->sample_end.mbar; gtk_list_store_set(model, iter, CYL_DESC, cyl->type.description ? : "", CYL_SIZE, cyl->type.size.mliter, CYL_WORKP, cyl->type.workingpressure.mbar, - CYL_STARTP, cyl->start.mbar, - CYL_ENDP, cyl->end.mbar, + CYL_STARTP, start, + CYL_ENDP, end, CYL_O2, cyl->gasmix.o2.permille, CYL_HE, cyl->gasmix.he.permille, -1); @@ -264,29 +354,33 @@ static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double mi GtkWidget *frame, *hbox, *button; frame = gtk_frame_new(name); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, FALSE, 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); + 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 fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl, const char *desc, double volume, double pressure, int o2) +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) { int mbar, ml; - if (output_units.pressure == PSI) - pressure /= 14.5037738; + if (output_units.pressure == PSI) { + pressure = psi_to_bar(pressure); + start = psi_to_bar(start); + end = psi_to_bar(end); + } if (pressure && output_units.volume == CUFT) { - volume *= 28.3168466; /* CUFT to liter */ - volume /= pressure / 1.01325; + volume = cuft_to_l(volume); + volume /= bar_to_atm(pressure); } ml = volume * 1000 + 0.5; @@ -297,6 +391,8 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl 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; /* @@ -309,7 +405,7 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl { const gchar *desc; GtkComboBox *box; - double volume, pressure; + double volume, pressure, start, end; int o2; /* Ignore uninitialized cylinder widgets */ @@ -320,10 +416,17 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl 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(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5; - if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->pressure_button))) { + start = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->start)); + end = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->end)); + } else { + start = end = 0; + } + 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 o2 = 0; - fill_cylinder_info(cylinder, cyl, desc, volume, pressure, o2); + fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2); } void flush_dive_equipment_changes(struct dive *dive) @@ -384,9 +487,9 @@ static void fill_tank_list(GtkListStore *store) /* Is it in cuft and psi? */ if (psi) { - double bar = 0.0689475729 * psi; - double airvolume = 28316.8466 * size; - double atm = bar / 1.01325; + double bar = psi_to_bar(psi); + double airvolume = cuft_to_l(size) * 1000.0; + double atm = bar_to_atm(bar); ml = airvolume / atm + 0.5; mbar = bar*1000 + 0.5; @@ -411,11 +514,43 @@ static void nitrox_cb(GtkToggleButton *button, gpointer data) gtk_widget_set_sensitive(cylinder->o2, state); } +static void pressure_cb(GtkToggleButton *button, gpointer data) +{ + struct cylinder_widget *cylinder = data; + int state; + + state = gtk_toggle_button_get_active(button); + gtk_widget_set_sensitive(cylinder->start, state); + gtk_widget_set_sensitive(cylinder->end, state); +} + +static gboolean completion_cb(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, struct cylinder_widget *cylinder) +{ + const char *desc; + unsigned int ml, mbar; + + gtk_tree_model_get(model, iter, CYL_DESC, &desc, CYL_SIZE, &ml, CYL_WORKP, &mbar, -1); + add_cylinder(cylinder, desc, ml, mbar); + return TRUE; +} + +static void cylinder_activate_cb(GtkComboBox *combo_box, gpointer data) +{ + struct cylinder_widget *cylinder = data; + cylinder_cb(cylinder->description, data); +} + static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, GtkListStore *model) { GtkWidget *frame, *hbox; + GtkEntry *entry; + GtkEntryCompletion *completion; GtkWidget *widget; + /* + * Cylinder type: description, size and + * working pressure + */ frame = gtk_frame_new("Cylinder"); hbox = gtk_hbox_new(FALSE, 3); @@ -427,6 +562,15 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G cylinder->description = GTK_COMBO_BOX(widget); g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), cylinder); + entry = GTK_ENTRY(GTK_BIN(widget)->child); + g_signal_connect(entry, "activate", G_CALLBACK(cylinder_activate_cb), cylinder); + + completion = gtk_entry_completion_new(); + gtk_entry_completion_set_text_column(completion, 0); + gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(model)); + g_signal_connect(completion, "match-selected", G_CALLBACK(completion_cb), cylinder); + gtk_entry_set_completion(entry, completion); + hbox = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0); @@ -437,6 +581,28 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1); cylinder->pressure = GTK_SPIN_BUTTON(widget); + /* + * Cylinder start/end pressures + */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + + 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); + cylinder->start = widget; + + widget = create_spinbutton(hbox, "End Pressure", 0, 5000, 1); + cylinder->end = widget; + + /* + * Cylinder gas mix: Air, Nitrox or Trimix + */ + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1); cylinder->o2 = widget; cylinder->gasmix_button = gtk_check_button_new(); @@ -480,6 +646,7 @@ static int edit_cylinder_dialog(int index, cylinder_t *cyl) record_cylinder_changes(cyl, &cylinder); dive->cylinder[index] = *cyl; mark_divelist_changed(TRUE); + update_cylinder_related_info(dive); flush_divelist(dive); } @@ -519,6 +686,7 @@ static void edit_cb(GtkButton *button, gpointer data) return; set_one_cylinder(index, &cyl, model, &iter); + repaint_dive(); } static void add_cb(GtkButton *button, gpointer data)