summaryrefslogtreecommitdiffstats
path: root/Smoke/gtk_colormap.c
diff options
context:
space:
mode:
Diffstat (limited to 'Smoke/gtk_colormap.c')
-rw-r--r--Smoke/gtk_colormap.c91
1 files changed, 88 insertions, 3 deletions
diff --git a/Smoke/gtk_colormap.c b/Smoke/gtk_colormap.c
index 657c586..09d04fe 100644
--- a/Smoke/gtk_colormap.c
+++ b/Smoke/gtk_colormap.c
@@ -2,6 +2,7 @@
#include <rfftw.h>
+#include "fluids.h"
#include "palette.h"
#include "colormap.h"
@@ -42,12 +43,21 @@ static gboolean select_alpha(GtkRange *adjustment, gpointer data)
return TRUE;
}
-static gboolean set_autoscaling(GtkToggleButton *button, gpointer data) {
+static gboolean adjust_autoscaling(GtkToggleButton *button, gpointer data) {
colormap_set_autoscaling(gtk_toggle_button_get_active(button));
return TRUE;
}
+static gboolean set_dataset(GtkToggleButton *button, gpointer data)
+{
+ if (gtk_toggle_button_get_active(button)) {
+ smoke_set_dataset((int)data);
+ }
+
+ return TRUE;
+}
+
GtkWidget *create_colormap_page(void)
{
@@ -61,6 +71,7 @@ GtkWidget *create_colormap_page(void)
GtkWidget *combo;
GtkAdjustment *color_adjustment;
GtkWidget *color_scale;
+ GSList *dataset_group;
page = gtk_vbox_new(FALSE, 0);
@@ -87,7 +98,7 @@ GtkWidget *create_colormap_page(void)
button = gtk_check_button_new_with_label("AutoScale");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), colormap_get_autoscaling());
- g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_autoscaling), NULL);
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(adjust_autoscaling), NULL);
gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
gtk_widget_show(button);
@@ -98,6 +109,80 @@ GtkWidget *create_colormap_page(void)
gtk_widget_show(frame);
+ frame = gtk_frame_new("Dataset");
+
+ box = gtk_vbox_new(FALSE, 0);
+
+ box2 = gtk_hbox_new(FALSE, 0);
+
+ button = gtk_radio_button_new_with_label (NULL, "Rho");
+ if (smoke_get_dataset() == DATASET_RHO) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+ }
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_dataset), (gpointer)DATASET_RHO);
+ gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
+ gtk_widget_show(button);
+
+ dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
+
+ button = gtk_radio_button_new_with_label(dataset_group, "Velocity");
+ if (smoke_get_dataset() == DATASET_VEL) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+ }
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_dataset), (gpointer)DATASET_VEL);
+ gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
+ gtk_widget_show(button);
+
+ button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force");
+ if (smoke_get_dataset() == DATASET_FORCE) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+ }
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_dataset), (gpointer)DATASET_FORCE);
+ gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
+ gtk_widget_show(button);
+
+ gtk_box_pack_start(GTK_BOX(box), box2, TRUE, TRUE, 0);
+ gtk_widget_show(box2);
+
+ box2 = gtk_hbox_new(FALSE, 0);
+
+ dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
+
+ button = gtk_radio_button_new_with_label(dataset_group, "Velocity divergence");
+ if (smoke_get_dataset() == DATASET_DIVV) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+ }
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_dataset), (gpointer)DATASET_DIVV);
+ gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
+ gtk_widget_show(button);
+
+ button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force divergence");
+ if (smoke_get_dataset() == DATASET_DIVF) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), FALSE);
+ }
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_dataset), (gpointer)DATASET_DIVF);
+ gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0);
+ gtk_widget_show(button);
+
+
+ gtk_box_pack_start(GTK_BOX(box), box2, TRUE, TRUE, 0);
+ gtk_widget_show(box2);
+
+ 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);
frame = gtk_frame_new("Colors");
@@ -115,7 +200,7 @@ GtkWidget *create_colormap_page(void)
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_GREY_BANDS);
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);