Update objects for new Grits expose settings

[aweather] / src / plugins / level2.c

diff --git a/src/plugins/level2.c b/src/plugins/level2.c
index 654465d935b14a1e7af8589f7a9a6f51e38e7e90..7a4bb44559e7fb56183872a81cfc45abc01caf81 100644 (file)
--- a/src/plugins/level2.c
+++ b/src/plugins/level2.c
@@ -17,7 +17,6 @@
 
 #include <config.h>
 #include <math.h>
-#include <GL/gl.h>
 #include <glib/gstdio.h>
 #include <grits.h>
 #include <rsl.h>
@@ -324,7 +323,7 @@ void aweather_level2_set_iso(AWeatherLevel2 *level2, gfloat level)
                vol->disp = GRITS_VOLUME_SURFACE;
                GRITS_OBJECT(vol)->center = GRITS_OBJECT(level2)->center;
                grits_viewer_add(GRITS_OBJECT(level2)->viewer,
-                               GRITS_OBJECT(vol), GRITS_LEVEL_WORLD+1, FALSE);
+                               GRITS_OBJECT(vol), GRITS_LEVEL_WORLD+5, TRUE);
                level2->volume = vol;
        }
        if (ISO_MIN < level && level < ISO_MAX) {
@@ -393,8 +392,8 @@ static void _on_sweep_clicked(GtkRadioButton *button, gpointer _level2)
 {
        AWeatherLevel2 *level2 = _level2;
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-               gint type = (gint)g_object_get_data(G_OBJECT(button), "type");
-               gint elev = (gint)g_object_get_data(G_OBJECT(button), "elev");
+               gint type = (glong)g_object_get_data(G_OBJECT(button), "type");
+               gint elev = (glong)g_object_get_data(G_OBJECT(button), "elev");
                aweather_level2_set_sweep(level2, type, (float)elev/100);
                //level2->colormap = level2->sweep_colors;
        }
@@ -476,9 +475,9 @@ GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
                        g_object_set(button, "draw-indicator", FALSE, NULL);
                        gtk_box_pack_end(GTK_BOX(elev_box), button, TRUE, TRUE, 0);
 
-                       g_object_set_data(G_OBJECT(button), "level2", (gpointer)level2);
-                       g_object_set_data(G_OBJECT(button), "type",   (gpointer)vi);
-                       g_object_set_data(G_OBJECT(button), "elev",   (gpointer)(int)(elev*100));
+                       g_object_set_data(G_OBJECT(button), "level2", level2);
+                       g_object_set_data(G_OBJECT(button), "type", (gpointer)(guintptr)vi);
+                       g_object_set_data(G_OBJECT(button), "elev", (gpointer)(guintptr)(elev*100));
                        g_signal_connect(button, "clicked", G_CALLBACK(_on_sweep_clicked), level2);
                }
        }