alpha added to gui

7 files changed, 105 insertions, 15 deletions

diff --git a/Smoke/glyphs.c b/Smoke/glyphs.c
index 792c776..7ccf04e 100644
--- a/Smoke/glyphs.c
+++ b/Smoke/glyphs.c
@@ -18,7 +18,7 @@ static int glyphs_num_colors = PALETTE_MAXCOLORS;
 

 static int glyphs_colormap = PALETTE_BLACKWHITE;

 

-static float glyphs_alpha = 1.0f;

+static float glyphs_alpha = 0.5f;

 

 static fftw_real *glyphs_frame;

 

diff --git a/Smoke/gtk_colormap.c b/Smoke/gtk_colormap.c
index 1e60dd1..3d6965f 100644
--- a/Smoke/gtk_colormap.c
+++ b/Smoke/gtk_colormap.c
@@ -14,7 +14,6 @@ static gboolean select_colormap(GtkComboBox *combo, gpointer data)
         colormap_set_colormap(gtk_combo_box_get_active(combo));
 }
 
-
 static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
 {
         colormap_set_num_colors((int)gtk_range_get_value(adjustment));
@@ -28,6 +27,11 @@ static gboolean set_clamping(GtkWidget *button, gpointer data) {
   colormap_set_clamping(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
 
+static gboolean select_alpha(GtkRange *adjustment, gpointer data)
+{
+        colormap_set_alpha((float)gtk_range_get_value(adjustment));
+}
+
 
 GtkWidget *create_colormap_page(void)
 {
@@ -49,13 +53,13 @@ GtkWidget *create_colormap_page(void)
       box = gtk_vbox_new(FALSE, 0);
 
         button = gtk_check_button_new_with_label("Scaling");
-          gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+          gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_scaling());
           g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_scaling), NULL);
           gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
         gtk_widget_show(button);
 
         button = gtk_check_button_new_with_label("Clamping");
-          gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+          gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_clamping());
           g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_clamping), NULL);
           gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
         gtk_widget_show(button);
@@ -87,7 +91,7 @@ GtkWidget *create_colormap_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), colormap_get_colormap());
         g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);
 
       gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
@@ -101,7 +105,7 @@ GtkWidget *create_colormap_page(void)
 
 
       color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
-            PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 1));
+            colormap_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);
@@ -110,6 +114,21 @@ GtkWidget *create_colormap_page(void)
       gtk_widget_show(color_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(
+            colormap_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);
     
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);
       
diff --git a/Smoke/gtk_glyphs.c b/Smoke/gtk_glyphs.c
index b3bebe9..b30a3e3 100644
--- a/Smoke/gtk_glyphs.c
+++ b/Smoke/gtk_glyphs.c
@@ -21,6 +21,11 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
         glyphs_set_num_colors((int)gtk_range_get_value(adjustment));
 }
 
+static gboolean select_alpha(GtkRange *adjustment, gpointer data)
+{
+        glyphs_set_alpha((float)gtk_range_get_value(adjustment));
+}
+
 
 GtkWidget *create_glyphs_page(void)
 {
@@ -108,7 +113,7 @@ GtkWidget *create_glyphs_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), glyphs_get_colormap());
         g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);
 
       gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
@@ -122,7 +127,7 @@ GtkWidget *create_glyphs_page(void)
 
 
       color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
-            PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 1));
+            glyphs_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);
@@ -130,6 +135,19 @@ GtkWidget *create_glyphs_page(void)
       gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0);
       gtk_widget_show(color_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(
+            glyphs_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);
diff --git a/Smoke/gtk_isolines.c b/Smoke/gtk_isolines.c
index 647d393..9c5f4b3 100644
--- a/Smoke/gtk_isolines.c
+++ b/Smoke/gtk_isolines.c
@@ -21,6 +21,11 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
         isolines_set_num_colors((int)gtk_range_get_value(adjustment));
 }
 
+static gboolean select_alpha(GtkRange *adjustment, gpointer data)
+{
+        isolines_set_alpha((float)gtk_range_get_value(adjustment));
+}
+
 
 GtkWidget *create_isolines_page(void)
 {
@@ -108,7 +113,7 @@ GtkWidget *create_isolines_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), isolines_get_colormap());
         g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);
 
       gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
@@ -122,7 +127,7 @@ GtkWidget *create_isolines_page(void)
 
 
       color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
-            PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 1));
+            isolines_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);
@@ -130,6 +135,19 @@ GtkWidget *create_isolines_page(void)
       gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0);
       gtk_widget_show(color_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(box);
diff --git a/Smoke/gtk_streamlines.c b/Smoke/gtk_streamlines.c
index 67a6661..d90c546 100644
--- a/Smoke/gtk_streamlines.c
+++ b/Smoke/gtk_streamlines.c
@@ -22,6 +22,11 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
         streamlines_set_num_colors((int)gtk_range_get_value(adjustment));
 }
 
+static gboolean select_alpha(GtkRange *adjustment, gpointer data)
+{
+        colormap_set_alpha((float)gtk_range_get_value(adjustment));
+}
+
 
 GtkWidget *create_streamlines_page(void)
 {
@@ -58,7 +63,7 @@ GtkWidget *create_streamlines_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), streamlines_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,13 +77,28 @@ GtkWidget *create_streamlines_page(void)
 
 
         color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
-              PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 1));
+              streamlines_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);
 
         gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0);
         gtk_widget_show(color_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(
+              streamlines_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);
diff --git a/Smoke/smoke.bin b/Smoke/smoke.bin
index c9d646e..4bea735 100755
--- a/Smoke/smoke.bin
+++ b/Smoke/smoke.bin