temporarly abusing flowvis as secondary renderer to test things

1 files changed, 65 insertions, 1 deletions

diff --git a/Smoke/gtk_flowvis.c b/Smoke/gtk_flowvis.c
index 7a56f4f..93d078b 100644
--- a/Smoke/gtk_flowvis.c
+++ b/Smoke/gtk_flowvis.c
@@ -1,9 +1,16 @@
 #include <gtk/gtk.h>
 
+#include <rfftw.h>
+#include "fluids.h"
+
+
+#include "palette.h"
+#include "flowvis.h"
 
 #include "gtk_flowvis.h"
 
 
+
 static gboolean select_colormap(GtkComboBox *combo, gpointer data)
 {
         flowvis_set_colormap(gtk_combo_box_get_active(combo));
@@ -16,14 +23,71 @@ static gboolean select_num_colors(GtkRange *adjustment, gpointer data)
 }
 
 
-
 GtkWidget *create_flowvis_page(void)
 {
   /* in reality a page is really just a vbox filled with other widgets
    */
   GtkWidget *page;
+  GtkWidget *frame;
+  GtkWidget *box;
+  GtkWidget *label;  
+  GtkWidget *button;
+  GtkWidget *combo;  
+  GtkAdjustment *color_adjustment;
+  GtkWidget *color_scale;
+  GSList *dataset_group;
 
   page = gtk_vbox_new(FALSE, 0);
 
+    frame = gtk_frame_new("Colors");
+
+      box = gtk_vbox_new(FALSE, 0);
+        
+
+        label = gtk_label_new("Colormap");
+
+        gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
+        gtk_widget_show(label);
+
+
+        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_set_active(GTK_COMBO_BOX(combo), 0);
+          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);
+
+
+        label = gtk_label_new("Number of Colors");
+
+        gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
+        gtk_widget_show(label);
+
+
+        color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
+              PALETTE_MAXCOLORS, 1, PALETTE_MAXCOLORS +1, 0.5, 5, 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);
+
+
+      gtk_container_add(GTK_CONTAINER(frame), box);
+      gtk_widget_show(box);
+      
+      gtk_box_pack_start(GTK_BOX(page), frame, FALSE, TRUE, 0);
+
+    gtk_widget_show(frame);
+
+
   return page;
 }