mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make multiple cylinders actually work

Browse source 
This just always shows two cylinders, which is obviously bogus, but it's
a good test-case for the multi-cylinder case.

I need to figure out how to dynamically show the right number of
cylinders, but that also involves the notion of adding a cylinder in
order to fill out information that didn't use to exist.

That's lower priority - now the infrastructure seems to be there.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-13 13:25:06 -07:00
parent a4c9cc110f
commit a92811351b
1 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

38
equipment.c
View file

@ -121,17 +121,19 @@ static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int
} }
} }
void show_dive_equipment(struct dive *dive) static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
{ {
cylinder_t *cyl = &dive->cylinder[0]; const char *desc;
const char *desc = cyl->type.description;
struct cylinder_widget *cylinder = &gtk_cylinder[0];
int ml, mbar; int ml, mbar;
double o2; double o2;
/* Don't show uninitialized cylinder widgets */
if (!cylinder->description)
return;
desc = cyl->type.description;
if (!desc) if (!desc)
desc = ""; desc = "";
ml = cyl->type.size.mliter; ml = cyl->type.size.mliter;
mbar = cyl->type.workingpressure.mbar; mbar = cyl->type.workingpressure.mbar;
add_cylinder(cylinder, desc, ml, mbar); add_cylinder(cylinder, desc, ml, mbar);
@ -145,6 +147,14 @@ void show_dive_equipment(struct dive *dive)
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2); gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
} }
void show_dive_equipment(struct dive *dive)
{
int i;
for (i = 0; i < MAX_CYLINDERS; i++)
show_cylinder(dive->cylinder + i, gtk_cylinder+i);
}
static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr) static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr)
{ {
GtkWidget *frame, *hbox, *button; GtkWidget *frame, *hbox, *button;
@ -191,26 +201,33 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl
add_cylinder(cylinder, desc, ml, mbar); add_cylinder(cylinder, desc, ml, mbar);
} }
static void record_cylinder_changes(struct dive *dive) static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cylinder)
{ {
const gchar *desc; const gchar *desc;
struct cylinder_widget *cylinder = &gtk_cylinder[0]; GtkComboBox *box;
GtkComboBox *box = cylinder->description;
double volume, pressure; double volume, pressure;
int o2; int o2;
/* Ignore uninitialized cylinder widgets */
box = cylinder->description;
if (!box)
return;
desc = gtk_combo_box_get_active_text(box); desc = gtk_combo_box_get_active_text(box);
volume = gtk_spin_button_get_value(cylinder->size); volume = gtk_spin_button_get_value(cylinder->size);
pressure = gtk_spin_button_get_value(cylinder->pressure); pressure = gtk_spin_button_get_value(cylinder->pressure);
o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5; 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->gasmix_button)))
o2 = 0; o2 = 0;
fill_cylinder_info(cylinder, dive->cylinder+0, desc, volume, pressure, o2); fill_cylinder_info(cylinder, cyl, desc, volume, pressure, o2);
} }
void flush_dive_equipment_changes(struct dive *dive) void flush_dive_equipment_changes(struct dive *dive)
{ {
record_cylinder_changes(dive); int i;
for (i = 0; i < MAX_CYLINDERS; i++)
record_cylinder_changes(dive->cylinder+i, gtk_cylinder+i);
} }
/* /*
@ -358,6 +375,7 @@ GtkWidget *equipment_widget(void)
model = create_tank_size_model(); model = create_tank_size_model();
cylinder_widget(vbox, 0, model); cylinder_widget(vbox, 0, model);
cylinder_widget(vbox, 1, model);
return vbox; return vbox;
} }