diff options
Diffstat (limited to 'Smoke/gtk_flowvis.c')
| -rw-r--r-- | Smoke/gtk_flowvis.c | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/Smoke/gtk_flowvis.c b/Smoke/gtk_flowvis.c index 8d944d6..ef78326 100644 --- a/Smoke/gtk_flowvis.c +++ b/Smoke/gtk_flowvis.c @@ -14,17 +14,23 @@ static gboolean select_colormap(GtkComboBox *combo, gpointer data) { flowvis_set_colormap(gtk_combo_box_get_active(combo)); + + return TRUE; } static gboolean select_num_colors(GtkRange *adjustment, gpointer data) { flowvis_set_num_colors((int)gtk_range_get_value(adjustment)); + + return TRUE; } static gboolean select_alpha(GtkRange *adjustment, gpointer data) { flowvis_set_alpha((float)gtk_range_get_value(adjustment)); + + return TRUE; } @@ -36,11 +42,9 @@ GtkWidget *create_flowvis_page(void) GtkWidget *frame; GtkWidget *box; GtkWidget *label; - GtkWidget *button; GtkWidget *combo; - GtkAdjustment *color_adjustment; - GtkWidget *color_scale; - GSList *dataset_group; + GtkAdjustment *adjustment; + GtkWidget *scale; page = gtk_vbox_new(FALSE, 0); @@ -57,11 +61,15 @@ GtkWidget *create_flowvis_page(void) combo = gtk_combo_box_new_text(); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Black & White"); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Rainbow"); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Bands"); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Wilrik"); - gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Oliver"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLACKWHITE); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_RAINBOW); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BANDS); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLUE_GREEN_RED); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_WILRIK); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_OLIVER); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_RED); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_GREEN); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLUE); gtk_combo_box_set_active(GTK_COMBO_BOX(combo), flowvis_get_colormap()); g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL); @@ -76,11 +84,11 @@ GtkWidget *create_flowvis_page(void) gtk_widget_show(label); - color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( flowvis_get_num_colors(), 1, PALETTE_MAXCOLORS, 0.5, 5, 0.1)); - color_scale = gtk_hscale_new(color_adjustment); - gtk_scale_set_digits(GTK_SCALE(color_scale), 0); - g_signal_connect(GTK_RANGE(color_scale), "value-changed", G_CALLBACK(select_num_colors), NULL); + scale = gtk_hscale_new(adjustment); + gtk_scale_set_digits(GTK_SCALE(scale), 0); + g_signal_connect(GTK_RANGE(scale), "value-changed", G_CALLBACK(select_num_colors), NULL); label = gtk_label_new("Alpha"); @@ -88,13 +96,13 @@ GtkWidget *create_flowvis_page(void) gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); gtk_widget_show(label); - color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( flowvis_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); + 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); |