From 04b076cf40e0a4643493ee4671157ef4055f7fed Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 9 Nov 2011 08:33:13 -0800 Subject: [PATCH] equipment: clean up cylinder pressure spinbutton setup This is just in case I end up doing the graying out of implicit pressure information: I wanted to clean things up a bit first. Signed-off-by: Linus Torvalds --- equipment.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/equipment.c b/equipment.c index be544ab..c2d05d2 100644 --- a/equipment.c +++ b/equipment.c @@ -98,13 +98,13 @@ static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int gtk_spin_button_set_value(cylinder->pressure, pressure); } -static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, int start, int end) +static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, cylinder_t *cyl) { double pressure; - convert_pressure(start, &pressure); + convert_pressure(cyl->start.mbar, &pressure); gtk_spin_button_set_value(cylinder->start, pressure); - convert_pressure(end, &pressure); + convert_pressure(cyl->end.mbar, &pressure); gtk_spin_button_set_value(cylinder->end, pressure); } @@ -266,8 +266,7 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder) set_cylinder_type_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar); - set_cylinder_pressure_spinbuttons(cylinder, - cyl->start.mbar, cyl->end.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); -- 2.45.2