summaryrefslogtreecommitdiffstats
path: root/Smoke/gtk_flowvis.c
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2007-12-20 12:32:04 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2007-12-20 12:32:04 (GMT)
commit6738787ce32ab3895241efed640cb95cdb3d1e32 (patch)
tree91ec8ee2ed6a6b4fd4ef1f18728d09670717e5c0 /Smoke/gtk_flowvis.c
parent6f19aad735759adc16fe149557d275880250cac1 (diff)
download2iv35-6738787ce32ab3895241efed640cb95cdb3d1e32.zip
2iv35-6738787ce32ab3895241efed640cb95cdb3d1e32.tar.gz
2iv35-6738787ce32ab3895241efed640cb95cdb3d1e32.tar.bz2
alpha added to gui
Diffstat (limited to 'Smoke/gtk_flowvis.c')
-rw-r--r--Smoke/gtk_flowvis.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/Smoke/gtk_flowvis.c b/Smoke/gtk_flowvis.c
index 93d078b..8d944d6 100644
--- a/Smoke/gtk_flowvis.c
+++ b/Smoke/gtk_flowvis.c
@@ -22,6 +22,11 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
flowvis_set_num_colors((int)gtk_range_get_value(adjustment));
}
+static gboolean select_alpha(GtkRange *adjustment, gpointer data)
+{
+ flowvis_set_alpha((float)gtk_range_get_value(adjustment));
+}
+
GtkWidget *create_flowvis_page(void)
{
@@ -58,7 +63,7 @@ GtkWidget *create_flowvis_page(void)
gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Wilrik");
gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Oliver");
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(combo), flowvis_get_colormap());
g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);
gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
@@ -72,15 +77,25 @@ GtkWidget *create_flowvis_page(void)
color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
- PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 1));
+ 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);
+
+ 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(
+ 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);
-
gtk_container_add(GTK_CONTAINER(frame), box);
gtk_widget_show(box);