more normal drawing

1 files changed, 80 insertions, 78 deletions

diff --git a/Smoke/gtk_isolines.c b/Smoke/gtk_isolines.c
index 9c5f4b3..d5a6681 100644
--- a/Smoke/gtk_isolines.c
+++ b/Smoke/gtk_isolines.c
@@ -43,119 +43,121 @@ GtkWidget *create_isolines_page(void)
 
   page = gtk_vbox_new(FALSE, 0);
 
-  frame = gtk_frame_new("Scalarset");
+#if 0
+    frame = gtk_frame_new("Scalarset");
 
-    box = gtk_hbox_new(FALSE, 0);
+      box = gtk_hbox_new(FALSE, 0);
 
-      button = gtk_radio_button_new_with_label (NULL, "Rho");
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-      g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_RHO);
-      gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
-      gtk_widget_show(button);
+        button = gtk_radio_button_new_with_label (NULL, "Rho");
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+        g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_RHO);
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+        gtk_widget_show(button);
 
-      dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
+        dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
 
-      button = gtk_radio_button_new_with_label(dataset_group, "Velocity");
-      g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_VEL);
-      gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
-      gtk_widget_show(button);
+        button = gtk_radio_button_new_with_label(dataset_group, "Velocity");
+        g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_VEL);
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+        gtk_widget_show(button);
 
-      button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force");
-      g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_FORCE);
-      gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);      
-      gtk_widget_show(button);
+        button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force");
+        g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_scalar), (gpointer)SCALAR_FORCE);
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);      
+        gtk_widget_show(button);
 
-    gtk_container_add(GTK_CONTAINER(frame), box);
-    gtk_widget_show(box);
+      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("Vectorset");
+    gtk_box_pack_start (GTK_BOX(page), frame, FALSE, TRUE, 0);
+    gtk_widget_show(frame);
+    
+    frame = gtk_frame_new("Vectorset");
 
-    box = gtk_hbox_new(FALSE, 0);
+      box = gtk_hbox_new(FALSE, 0);
 
-      button = gtk_radio_button_new_with_label(NULL, "Velocity");
-     // g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_vector), (gpointer)VECTOR_VEL);
-      gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
-      gtk_widget_show(button);
+        button = gtk_radio_button_new_with_label(NULL, "Velocity");
+       // g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_vector), (gpointer)VECTOR_VEL);
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+        gtk_widget_show(button);
 
-      dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
+        dataset_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(button));
 
-      button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force");
-     // g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_vector), (gpointer)VECTOR_FORCE);
-      gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);      
-      gtk_widget_show(button);
+        button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), "Force");
+       // g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(set_glyph_vector), (gpointer)VECTOR_FORCE);
+        gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);      
+        gtk_widget_show(button);
 
-    gtk_container_add(GTK_CONTAINER(frame), box);
-    gtk_widget_show(box);
+      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);
-  
+    gtk_box_pack_start (GTK_BOX(page), frame, FALSE, TRUE, 0);
+    gtk_widget_show(frame);
+    
 
-  frame = gtk_frame_new("Colors");
+    frame = gtk_frame_new("Colors");
 
-    box = gtk_vbox_new(FALSE, 0);
-      
+      box = gtk_vbox_new(FALSE, 0);
+        
 
-      label = gtk_label_new("Colormap");
+        label = gtk_label_new("Colormap");
 
-      gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
-      gtk_widget_show(label);
+        gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
+        gtk_widget_show(label);
 
 
-      combo = gtk_combo_box_new_text();
+        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_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), isolines_get_colormap());
-        g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);
+          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);
-      gtk_widget_show(combo);
+        gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
+        gtk_widget_show(combo);
 
 
-      label = gtk_label_new("Number of Colors");
+        label = gtk_label_new("Number of Colors");
 
-      gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
-      gtk_widget_show(label);
+        gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
+        gtk_widget_show(label);
 
 
-      color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
-            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);
+        color_adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(
+              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);
 
-      gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0);
-      gtk_widget_show(color_scale);
+        gtk_box_pack_start(GTK_BOX(box), color_scale, FALSE, TRUE, 0);
+        gtk_widget_show(color_scale);
 
-      label = gtk_label_new("Alpha");
+        label = gtk_label_new("Alpha");
 
-      gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
-      gtk_widget_show(label);
+        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);
+        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_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_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);
+    gtk_widget_show(frame);
 
+#endif
 
   return page;
 }