alpha added to gui

1 files changed, 24 insertions, 5 deletions

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);