diff options
Diffstat (limited to 'Smoke/gtk_glyphs.c')
| -rw-r--r-- | Smoke/gtk_glyphs.c | 128 |
1 files changed, 110 insertions, 18 deletions
diff --git a/Smoke/gtk_glyphs.c b/Smoke/gtk_glyphs.c index 9d7a3cb..ca392eb 100644 --- a/Smoke/gtk_glyphs.c +++ b/Smoke/gtk_glyphs.c @@ -51,6 +51,22 @@ static gboolean set_dataset_direction(GtkToggleButton *button, gpointer data) } +static gboolean select_sort(GtkComboBox *combo, gpointer data) +{ + glyphs_set_sort(gtk_combo_box_get_active(combo)); + + return TRUE; +} + + +static gboolean select_var_dim(GtkRange *adjustment, gpointer data) +{ + fluids_set_var_dim((int)gtk_range_get_value(adjustment)); + + return TRUE; +} + + GtkWidget *create_glyphs_page(void) { /* in reality a page is really just a vbox filled with other widgets @@ -60,10 +76,11 @@ GtkWidget *create_glyphs_page(void) GtkWidget *box; GtkWidget *label; GtkWidget *button; - GtkWidget *combo; - GtkAdjustment *color_adjustment; - GtkWidget *color_scale; + GtkWidget *combo; + GtkAdjustment *adjustment; + GtkWidget *scale; GSList *dataset_group; + int j = 0 ; page = gtk_vbox_new(FALSE, 0); @@ -141,7 +158,84 @@ GtkWidget *create_glyphs_page(void) gtk_box_pack_start (GTK_BOX(page), frame, FALSE, TRUE, 0); gtk_widget_show(frame); - + + + + //frame = gtk_frame_new("Glyphs"); + + // box = gtk_vbox_new(FALSE, 0); + + // label = gtk_label_new("Parameterize the glyphs"); + + // 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), "Hedgehogs"); + // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Triangles"); + // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "3D Cones"); + // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Arrow images"); + // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Quake"); + + // gtk_combo_box_set_active(GTK_COMBO_BOX(combo), glyphs_get_sort()); + // g_signal_connect(combo, "changed", G_CALLBACK(select_sort), (gpointer)NULL); + + // gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0); + // gtk_widget_show(combo); + + //gtk_widget_show(frame); + + + frame = gtk_frame_new("Glyphs"); + + box = gtk_vbox_new(FALSE, 0); + + + label = gtk_label_new("Parameterize the glyphs"); + + 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), "Hedgehogs"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Triangles"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "3D Cones"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Arrow images"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Quake"); + + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), glyphs_get_sort()); + g_signal_connect(combo, "changed", G_CALLBACK(select_sort), (gpointer)NULL); + + gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0); + gtk_widget_show(combo); + + + + label = gtk_label_new("Change resolution of glyphs"); + + gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(fluids_get_var_dim(), 5, fluids_get_dim() + 25, 0.5, 5, 0)); + scale = gtk_hscale_new(adjustment); + gtk_scale_set_digits(GTK_SCALE(scale), 0); + g_signal_connect(GTK_RANGE(scale), "value-changed", G_CALLBACK(select_var_dim), NULL); + + gtk_box_pack_start(GTK_BOX(box), scale, FALSE, TRUE, 0); + gtk_widget_show(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); + + frame = gtk_frame_new("Colors"); @@ -175,28 +269,27 @@ GtkWidget *create_glyphs_page(void) gtk_widget_show(label); - color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new( - 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); + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(glyphs_get_num_colors(), 1, PALETTE_MAXCOLORS, 0.5, 5, 0.1)); + scale = gtk_hscale_new(adjustment); + gtk_scale_set_digits(GTK_SCALE(scale), 0); + g_signal_connect(GTK_RANGE(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_box_pack_start(GTK_BOX(box), scale, FALSE, TRUE, 0); + gtk_widget_show(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( + 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); + scale = gtk_hscale_new(adjustment); + gtk_scale_set_digits(GTK_SCALE(scale), 1); + g_signal_connect(GTK_RANGE(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_box_pack_start(GTK_BOX(box), scale, FALSE, TRUE, 0); + gtk_widget_show(scale); gtk_container_add(GTK_CONTAINER(frame), box); gtk_widget_show(box); @@ -205,6 +298,5 @@ GtkWidget *create_glyphs_page(void) gtk_widget_show(frame); - return page; } |