mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-31 23:03:23 +00:00
Start abstracting out the cylinder equipment widgets
Create a "struct cylinder_widget" so that when we handle multiple cylinders, we can match them up with the actual cylinder data; Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds
parent
cb2f70f631
commit
b19b76ecfa
1 changed files with 35 additions and 31 deletions
66
equipment.c
66
equipment.c
|
|
@ -8,10 +8,14 @@
|
|||
#include "display.h"
|
||||
#include "divelist.h"
|
||||
|
||||
static int cylinder_changed;
|
||||
static GtkComboBox *cylinder_description;
|
||||
static GtkSpinButton *cylinder_size, *cylinder_pressure;
|
||||
static GtkWidget *nitrox_value, *nitrox_button;
|
||||
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)
|
||||
{
|
||||
|
|
@ -29,8 +33,8 @@ 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)
|
||||
|
|
@ -42,7 +46,7 @@ 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;
|
||||
}
|
||||
|
||||
|
|
@ -51,7 +55,7 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
|
|||
* 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);
|
||||
|
||||
|
|
@ -60,7 +64,7 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
|
|||
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);
|
||||
|
|
@ -87,7 +91,7 @@ static gboolean match_cylinder(GtkTreeModel *model,
|
|||
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;
|
||||
}
|
||||
|
|
@ -97,7 +101,7 @@ static void add_cylinder(const char *desc, int ml, int mbar)
|
|||
GtkTreeModel *model;
|
||||
|
||||
found_match = 0;
|
||||
model = gtk_combo_box_get_model(cylinder_description);
|
||||
model = gtk_combo_box_get_model(cylinder.description);
|
||||
gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
|
||||
|
||||
if (!found_match) {
|
||||
|
|
@ -110,7 +114,7 @@ static void add_cylinder(const char *desc, int ml, int mbar)
|
|||
1, ml,
|
||||
2, mbar,
|
||||
-1);
|
||||
gtk_combo_box_set_active_iter(cylinder_description, &iter);
|
||||
gtk_combo_box_set_active_iter(cylinder.description, &iter);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -130,11 +134,11 @@ void show_dive_equipment(struct dive *dive)
|
|||
|
||||
set_cylinder_spinbuttons(cyl->type.size.mliter, cyl->type.workingpressure.mbar);
|
||||
o2 = cyl->gasmix.o2.permille / 10.0;
|
||||
gtk_widget_set_sensitive(nitrox_value, !!o2);
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(nitrox_button), !!o2);
|
||||
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(GTK_SPIN_BUTTON(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)
|
||||
|
|
@ -186,15 +190,15 @@ static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume,
|
|||
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(GTK_SPIN_BUTTON(nitrox_value))*10 + 0.5;
|
||||
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(nitrox_button)))
|
||||
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);
|
||||
}
|
||||
|
|
@ -277,11 +281,11 @@ static void fill_tank_list(GtkListStore *store)
|
|||
|
||||
static void nitrox_cb(GtkToggleButton *button, gpointer data)
|
||||
{
|
||||
GtkWidget *nitrox_value = data;
|
||||
GtkWidget *o2 = data;
|
||||
int state;
|
||||
|
||||
state = gtk_toggle_button_get_active(button);
|
||||
gtk_widget_set_sensitive(nitrox_value, state);
|
||||
gtk_widget_set_sensitive(o2, state);
|
||||
}
|
||||
|
||||
static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
|
||||
|
|
@ -303,23 +307,23 @@ static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
|
|||
widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
|
||||
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, "Pressure", 0, 5000, 1);
|
||||
cylinder_pressure = GTK_SPIN_BUTTON(widget);
|
||||
cylinder.pressure = GTK_SPIN_BUTTON(widget);
|
||||
|
||||
widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);
|
||||
nitrox_value = widget;
|
||||
nitrox_button = gtk_check_button_new();
|
||||
gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(nitrox_value)),
|
||||
nitrox_button, FALSE, FALSE, 3);
|
||||
g_signal_connect(nitrox_button, "toggled", G_CALLBACK(nitrox_cb), nitrox_value);
|
||||
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(nitrox_value), 21.0, 100.0);
|
||||
gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder.o2), 21.0, 100.0);
|
||||
}
|
||||
|
||||
static GtkListStore *create_tank_size_model(void)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue