From 7bbdea19ed0c634b4a990e49be7a2c8936a61818 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 7 Sep 2011 08:35:35 -0700 Subject: [PATCH] Add radio buttons for temperature and volume .. and clean up some of the conversions. Signed-off-by: Linus Torvalds --- main.c | 58 ++++++++++++++++++++++++------------------------------- profile.c | 8 ++++---- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/main.c b/main.c index daad244..970e85f 100644 --- a/main.c +++ b/main.c @@ -239,40 +239,23 @@ static void create_radio(GtkWidget *dialog, const char *name, ...) va_end(args); } -static void set_meter(GtkWidget *w, gpointer data) -{ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - output_units.length = METERS; - repaint_dive(); -} - -static void set_feet(GtkWidget *w, gpointer data) -{ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - output_units.length = FEET; - repaint_dive(); -} - -static void set_bar(GtkWidget *w, gpointer data) -{ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - output_units.pressure = BAR; - repaint_dive(); -} - -static void set_psi(GtkWidget *w, gpointer data) -{ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - output_units.pressure = PSI; - repaint_dive(); +#define UNITCALLBACK(name, type, value) \ +static void name(GtkWidget *w, gpointer data) \ +{ \ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) \ + output_units.type = value; \ + repaint_dive(); \ + dive_list_update_dives(dive_list); \ } -static void set_pascal(GtkWidget *w, gpointer data) -{ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) - output_units.pressure = PASCAL; - repaint_dive(); -} +UNITCALLBACK(set_meter, length, METERS) +UNITCALLBACK(set_feet, length, FEET) +UNITCALLBACK(set_bar, pressure, BAR) +UNITCALLBACK(set_psi, pressure, PSI) +UNITCALLBACK(set_liter, volume, LITER) +UNITCALLBACK(set_cuft, volume, CUFT) +UNITCALLBACK(set_celsius, temperature, CELSIUS) +UNITCALLBACK(set_fahrenheit, temperature, FAHRENHEIT) static void unit_dialog(GtkWidget *w, gpointer data) { @@ -290,7 +273,16 @@ static void unit_dialog(GtkWidget *w, gpointer data) create_radio(dialog, "Pressure:", "Bar", set_bar, (output_units.pressure == BAR), "PSI", set_psi, (output_units.pressure == PSI), - "Pascal", set_pascal, (output_units.pressure == PASCAL), + NULL); + + create_radio(dialog, "Volume:", + "Liter", set_liter, (output_units.volume == LITER), + "CuFt", set_cuft, (output_units.volume == CUFT), + NULL); + + create_radio(dialog, "Temperature:", + "Celsius", set_celsius, (output_units.temperature == CELSIUS), + "Fahrenheit", set_fahrenheit, (output_units.temperature == FAHRENHEIT), NULL); gtk_widget_show(dialog); diff --git a/profile.c b/profile.c index 5cd8888..705d90c 100644 --- a/profile.c +++ b/profile.c @@ -357,13 +357,13 @@ static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr, unit = "pascal"; break; case BAR: - start = startp.mbar / 1000; - end = endp.mbar / 1000; + start = (startp.mbar + 500) / 1000; + end = (endp.mbar + 500) / 1000; unit = "bar"; break; case PSI: - start = startp.mbar / 68.95; - end = endp.mbar / 68.95; + start = to_PSI(startp); + end = to_PSI(endp); unit = "psi"; break; } -- 2.45.2