From 54de5aa73a9effad7857f597fba3d6fa99e7f21f Mon Sep 17 00:00:00 2001 From: Oliver Schinagl Date: Wed, 9 Jan 2008 13:08:46 +0000 Subject: code cleanup/fixes --- Smoke/gtk_isolines.c | 61 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/Smoke/gtk_isolines.c b/Smoke/gtk_isolines.c index 54344af..6e9c7a9 100644 --- a/Smoke/gtk_isolines.c +++ b/Smoke/gtk_isolines.c @@ -12,36 +12,48 @@ static gboolean select_colormap(GtkComboBox *combo, gpointer data) { - isolines_set_colormap(gtk_combo_box_get_active(combo)); + isolines_set_colormap(gtk_combo_box_get_active(combo)); + + return TRUE; } static gboolean select_num_colors(GtkRange *adjustment, gpointer data) { - isolines_set_num_colors((int)gtk_range_get_value(adjustment)); + isolines_set_num_colors((int)gtk_range_get_value(adjustment)); + + return TRUE; } static gboolean select_num_isolines(GtkRange *adjustment, gpointer data) { - isolines_set_nr((int)gtk_range_get_value(adjustment)); + isolines_set_nr((int)gtk_range_get_value(adjustment)); + + return TRUE; } static gboolean select_min_threshold(GtkRange *adjustment, gpointer data) { - isolines_set_threshold_min(gtk_range_get_value(adjustment)); + isolines_set_threshold_min(gtk_range_get_value(adjustment)); + + return TRUE; } static gboolean select_max_threshold(GtkRange *adjustment, gpointer data) { - isolines_set_threshold_max(gtk_range_get_value(adjustment)); + isolines_set_threshold_max(gtk_range_get_value(adjustment)); + + return TRUE; } static gboolean select_alpha(GtkRange *adjustment, gpointer data) { - isolines_set_alpha((float)gtk_range_get_value(adjustment)); + isolines_set_alpha((float)gtk_range_get_value(adjustment)); + + return TRUE; } @@ -137,7 +149,21 @@ GtkWidget *create_isolines_page(void) g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL); gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0); - gtk_widget_show(combo); + gtk_widget_show(combo); + + label = gtk_label_new("Alpha"); + + gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( + isolines_get_alpha(), 0, 1, 0.05, 0.05, 0.01)); + scale = gtk_hscale_new(adjustment); + gtk_scale_set_digits(GTK_SCALE(scale), 1); + g_signal_connect(GTK_RANGE(scale), "value-changed", G_CALLBACK(select_alpha), NULL); + + gtk_box_pack_start(GTK_BOX(box), scale, FALSE, TRUE, 0); + gtk_widget_show(scale); gtk_container_add(GTK_CONTAINER(frame), box); gtk_widget_show(box); @@ -146,9 +172,9 @@ GtkWidget *create_isolines_page(void) gtk_widget_show(frame); - frame = gtk_frame_new("Isolines"); + frame = gtk_frame_new("Isolines"); - box = gtk_vbox_new(FALSE, 0); + box = gtk_vbox_new(FALSE, 0); label = gtk_label_new("Number of Colors"); @@ -165,23 +191,6 @@ GtkWidget *create_isolines_page(void) gtk_box_pack_start(GTK_BOX(box), scale, FALSE, TRUE, 0); gtk_widget_show(scale); - //label = gtk_label_new("Alpha"); - - //gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); - //gtk_widget_show(label); - - //color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( - // isolines_get_alpha(), 0, 1, 0.05, 0.05, 0.01)); - //color_scale = gtk_hscale_new(color_adjustment); - // gtk_scale_set_digits(GTK_SCALE(color_scale), 1); - // g_signal_connect(GTK_RANGE(color_scale), "value-changed", G_CALLBACK(select_alpha), NULL); - - //gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0); - //gtk_widget_show(color_scale); - - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_widget_show(frame); - label = gtk_label_new("Number of isolines"); gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); -- cgit v0.12