]> Pileus Git - aweather/blobdiff - src/plugin-radar.c
* Fixing some async issue (w/ gthread_init)
[aweather] / src / plugin-radar.c
index e021253f9db4409311f28c59a9aca0bd6137b69a..07161c56af8b762f031b6389db114fd122162fc0 100644 (file)
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 #include <math.h>
-
-#include "rsl.h"
+#include <rsl.h>
 
 #include "aweather-gui.h"
 #include "plugin-radar.h"
 #include "data.h"
 
-GtkWidget *drawing;
-GtkWidget *config_body;
-static Sweep *cur_sweep = NULL;  // make this not global
-//static int nred, ngreen, nblue;
-//static char red[256], green[256], blue[256];
-static colormap_t *colormap;
-static guint sweep_tex = 0;
-
-static AWeatherGui *gui = NULL;
-static Radar *radar = NULL;
+/****************
+ * GObject code *
+ ****************/
+static void aweather_radar_plugin_init(AWeatherPluginInterface *iface);
+static void _aweather_radar_expose(AWeatherPlugin *_radar);
+G_DEFINE_TYPE_WITH_CODE(AWeatherRadar, aweather_radar, G_TYPE_OBJECT,
+               G_IMPLEMENT_INTERFACE(AWEATHER_TYPE_PLUGIN,
+                       aweather_radar_plugin_init));
+static void aweather_radar_class_init(AWeatherRadarClass *klass)
+{
+       GObjectClass *object_class = (GObjectClass*)klass;
+}
+static void aweather_radar_plugin_init(AWeatherPluginInterface *iface)
+{
+       /* Add methods to the interface */
+       iface->expose = _aweather_radar_expose;
+}
+static void aweather_radar_init(AWeatherRadar *radar)
+{
+       /* Set defaults */
+       radar->gui = NULL;
+}
 
 /**************************
  * Data loading functions *
  **************************/
 /* Convert a sweep to an 2d array of data points */
-static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
+static void bscan_sweep(AWeatherRadar *self, Sweep *sweep, colormap_t *colormap,
+               guint8 **data, int *width, int *height)
 {
        /* Calculate max number of bins */
        int i, max_bins = 0;
@@ -59,12 +71,16 @@ static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
                for (bi = 0; bi < ray->h.nbins; bi++) {
                        /* copy RGBA into buffer */
                        //guint val   = dz_f(ray->range[bi]);
-                       guint val   = ray->h.f(ray->range[bi]);
-                       guint buf_i = (ri*max_bins+bi)*4;
+                       guint8 val   = (guint8)ray->h.f(ray->range[bi]);
+                       guint  buf_i = (ri*max_bins+bi)*4;
                        buf[buf_i+0] = colormap->data[val][0];
                        buf[buf_i+1] = colormap->data[val][1];
                        buf[buf_i+2] = colormap->data[val][2];
                        buf[buf_i+3] = colormap->data[val][3];
+                       if (val == BADVAL     || val == RFVAL      || val == APFLAG ||
+                           val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO) {
+                               buf[buf_i+3] = 0x00; // transparent
+                       }
                }
        }
 
@@ -74,83 +90,126 @@ static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
        *data   = buf;
 }
 
-static void load_color_table(char *table)
-{
-       for (int i = 0; colormaps[i].name; i++)
-               if (g_str_equal(colormaps[i].name, table))
-                       colormap = &colormaps[i];
-}
-
 /* Load a sweep as the active texture */
-static void load_sweep(Sweep *sweep)
+static void load_sweep(AWeatherRadar *self, Sweep *sweep)
 {
-       aweather_gui_gl_begin(gui);
-       cur_sweep = sweep;
+       aweather_gui_gl_begin(self->gui);
+       self->cur_sweep = sweep;
        int height, width;
        guint8 *data;
-       bscan_sweep(sweep, &data, &width, &height);
-       glGenTextures(1, &sweep_tex);
-       glBindTexture(GL_TEXTURE_2D, sweep_tex);
+       bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height);
+       glDeleteTextures(1, &self->cur_sweep_tex);
+       glGenTextures(1, &self->cur_sweep_tex);
+       glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
        glPixelStorei(GL_PACK_ALIGNMENT, 1);
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
+                       GL_RGBA, GL_UNSIGNED_BYTE, data);
        g_free(data);
-       gdk_window_invalidate_rect(drawing->window, &drawing->allocation, FALSE);
-       gdk_window_process_updates(drawing->window, FALSE);
-       aweather_gui_gl_end(gui);
+       aweather_gui_gl_redraw(self->gui);
+       aweather_gui_gl_end(self->gui);
+}
+
+static void load_colormap(AWeatherRadar *self, gchar *table)
+{
+       /* Set colormap so we can draw it on expose */
+       for (int i = 0; colormaps[i].name; i++)
+               if (g_str_equal(colormaps[i].name, table))
+                       self->cur_colormap = &colormaps[i];
 }
 
 /* Add selectors to the config area for the sweeps */
-static void load_radar_gui(Radar *radar)
+static void on_sweep_clicked(GtkRadioButton *button, gpointer _self);
+static void load_radar_gui(AWeatherRadar *self, Radar *radar)
 {
        /* Clear existing items */
-       GtkWidget *child = gtk_bin_get_child(GTK_BIN(config_body));
+       GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
        if (child)
                gtk_widget_destroy(child);
 
-       GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
-       GtkWidget *button = NULL;
-       int vi = 0, si = 0;
-       for (vi = 0; vi < radar->h.nvolumes; vi++) {
+       gdouble elev;
+       guint rows = 1, cols = 1, cur_cols;
+       gchar row_label_str[64], col_label_str[64], button_str[64];
+       GtkWidget *row_label, *col_label, *button = NULL, *elev_box;
+       GtkWidget *table = gtk_table_new(rows, cols, FALSE);
+
+       for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
                Volume *vol = radar->v[vi];
                if (vol == NULL) continue;
-               GtkWidget *vbox = gtk_vbox_new(TRUE, 0);
-               for (si = vol->h.nsweeps-1; si >= 0; si--) {
+               rows++; cols = 1; elev = 0;
+
+               /* Row label */
+               g_snprintf(row_label_str, 64, "<b>%s:</b>", vol->h.type_str);
+               row_label = gtk_label_new(row_label_str);
+               gtk_label_set_use_markup(GTK_LABEL(row_label), TRUE);
+               gtk_misc_set_alignment(GTK_MISC(row_label), 1, 0.5);
+               gtk_table_attach(GTK_TABLE(table), row_label,
+                               0,1, rows-1,rows, GTK_FILL,GTK_FILL, 5,0);
+
+               for (guint si = 0; si < vol->h.nsweeps; si++) {
                        Sweep *sweep = vol->sweep[si];
-                       if (sweep == NULL) continue;
-                       char *label = g_strdup_printf("Tilt: %.2f (%s)", sweep->h.elev, vol->h.type_str);
-                       button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), label);
+                       if (sweep == NULL || sweep->h.elev == 0) continue;
+                       if (sweep->h.elev != elev) {
+                               cols++;
+                               elev = sweep->h.elev;
+
+                               /* Column label */
+                               g_object_get(table, "n-columns", &cur_cols, NULL);
+                               if (cols >  cur_cols) {
+                                       g_snprintf(col_label_str, 64, "<b>%.2f°</b>", elev);
+                                       col_label = gtk_label_new(col_label_str);
+                                       gtk_label_set_use_markup(GTK_LABEL(col_label), TRUE);
+                                       gtk_widget_set_size_request(col_label, 40, -1);
+                                       gtk_table_attach(GTK_TABLE(table), col_label,
+                                                       cols-1,cols, 0,1, GTK_FILL,GTK_FILL, 0,0);
+                               }
+
+                               elev_box = gtk_hbox_new(TRUE, 0);
+                               gtk_table_attach(GTK_TABLE(table), elev_box,
+                                               cols-1,cols, rows-1,rows, GTK_FILL,GTK_FILL, 0,0);
+                       }
+
+
+                       /* Button */
+                       g_snprintf(button_str, 64, "%3.2f", elev);
+                       button = gtk_radio_button_new_with_label_from_widget(
+                                       GTK_RADIO_BUTTON(button), button_str);
+                       gtk_widget_set_size_request(button, -1, 26);
+                       //button = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(button));
+                       //gtk_widget_set_size_request(button, -1, 22);
                        g_object_set(button, "draw-indicator", FALSE, NULL);
-                       g_signal_connect_swapped(button, "clicked", G_CALLBACK(load_color_table), vol->h.type_str);
-                       g_signal_connect_swapped(button, "clicked", G_CALLBACK(load_sweep), sweep);
-                       gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, TRUE, 0);
-                       g_free(label);
+                       gtk_box_pack_end(GTK_BOX(elev_box), button, TRUE, TRUE, 0);
+
+                       g_object_set_data(G_OBJECT(button), "type",  vol->h.type_str);
+                       g_object_set_data(G_OBJECT(button), "sweep", sweep);
+                       g_signal_connect(button, "clicked", G_CALLBACK(on_sweep_clicked), self);
                }
-               gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-               gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
        }
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body), hbox);
-       gtk_widget_show_all(hbox);
+       gtk_container_add(GTK_CONTAINER(self->config_body), table);
+       gtk_widget_show_all(table);
 }
 
-/* Load a radar from a file */
-static void load_radar_rsl(GPid pid, gint status, gpointer _path)
+/* Load a radar from a decompressed file */
+static void load_radar(AWeatherRadar *self, gchar *radar_file)
 {
-       gchar *path = _path;
-       if (status != 0) {
-               g_warning("wsr88ddec exited with status %d", status);
-               return;
-       }
-       char *site = g_path_get_basename(g_path_get_dirname(path));
-       if (radar) RSL_free_radar(radar);
+       char *dir  = g_path_get_dirname(radar_file);
+       char *site = g_path_get_basename(dir);
+       g_free(dir);
        RSL_read_these_sweeps("all", NULL);
-       radar = RSL_wsr88d_to_radar(path, site);
+       if (self->cur_radar) {
+               g_debug("AWeatherRadar: load_radar - Freeing old radar");
+               RSL_free_radar(self->cur_radar);
+       }
+       g_debug("AWeatherRadar: load_radar - Loading new radar");
+       Radar *radar = self->cur_radar = RSL_wsr88d_to_radar(radar_file, site);
        if (radar == NULL) {
-               g_warning("fail to load radar: path=%s, site=%s", path, site);
+               g_warning("fail to load radar: path=%s, site=%s", radar_file, site);
+               g_free(site);
                return;
        }
+       g_free(site);
 
        /* Load the first sweep by default */
        if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) {
@@ -161,84 +220,229 @@ static void load_radar_rsl(GPid pid, gint status, gpointer _path)
                        if (radar->v[vi]== NULL) continue;
                        for (int si = 0; si < radar->v[vi]->h.nsweeps; si++) {
                                if (radar->v[vi]->sweep[si]== NULL) continue;
-                               load_color_table(radar->v[vi]->h.type_str);
-                               load_sweep(radar->v[vi]->sweep[si]);
+                               load_colormap(self, radar->v[vi]->h.type_str);
+                               load_sweep(self, radar->v[vi]->sweep[si]);
                                break;
                        }
                        break;
                }
        }
 
-       load_radar_gui(radar);
+       load_radar_gui(self, radar);
 }
 
-/* decompress a radar file, then chain to the actuall loading function */
-static void load_radar(char *path, gpointer user_data)
+static void update_times(AWeatherRadar *self, char *site, char **last_time)
 {
-       char *raw  = g_strconcat(path, ".raw", NULL);
-       if (g_file_test(raw, G_FILE_TEST_EXISTS)) {
-               load_radar_rsl(0, 0, raw);
-       } else {
-               char *argv[] = {"wsr88ddec", path, raw, NULL};
-               GPid pid;
-               GError *error = NULL;
-               g_spawn_async(
-                       NULL,    // const gchar *working_directory,
-                       argv,    // gchar **argv,
-                       NULL,    // gchar **envp,
-                       G_SPAWN_SEARCH_PATH|
-                       G_SPAWN_DO_NOT_REAP_CHILD, 
-                                // GSpawnFlags flags,
-                       NULL,    // GSpawnChildSetupFunc child_setup,
-                       NULL,    // gpointer user_data,
-                       &pid,    // GPid *child_pid,
-                       &error); // GError **error
-               if (error)
-                       g_warning("failed to decompress WSR88D data: %s", error->message);
-               g_child_watch_add(pid, load_radar_rsl, raw);
+       char *list_uri = g_strdup_printf(
+                       "http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list",
+                       site);
+       GFile *list    = g_file_new_for_uri(list_uri);
+       g_free(list_uri);
+
+       gchar *data;
+       gsize length;
+       GError *error = NULL;
+       g_file_load_contents(list, NULL, &data, &length, NULL, &error);
+       g_object_unref(list);
+       if (error) {
+               g_warning("Error loading list for %s: %s", site, error->message);
+               g_error_free(error);
+               return;
+       }
+       gchar **lines = g_strsplit(data, "\n", -1);
+       GtkTreeView  *tview  = GTK_TREE_VIEW(aweather_gui_get_widget(self->gui, "time"));
+       GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
+       gtk_list_store_clear(lstore);
+       GtkTreeIter iter;
+       for (int i = 0; lines[i] && lines[i][0]; i++) {
+               // format: `841907 KABR_20090510_0159'
+               //g_message("\tadding %p [%s]", lines[i], lines[i]);
+               char **parts = g_strsplit(lines[i], " ", 2);
+               char *time = parts[1]+5;
+               gtk_list_store_insert(lstore, &iter, 0);
+               gtk_list_store_set(lstore, &iter, 0, time, -1);
+               g_strfreev(parts);
+       }
+
+       if (last_time)
+               gtk_tree_model_get(GTK_TREE_MODEL(lstore), &iter, 0, last_time, -1);
+
+       g_free(data);
+       g_strfreev(lines);
+}
+
+/*****************
+ * ASync helpers *
+ *****************/
+typedef struct {
+       AWeatherRadar *self;
+       gchar *radar_file;
+} decompressed_t;
+
+static void decompressed_cb(GPid pid, gint status, gpointer _self)
+{
+       decompressed_t *udata = _self;
+       if (status != 0) {
+               g_warning("wsr88ddec exited with status %d", status);
+               return;
+       }
+       // TODO: pass cur_file as params? 
+       load_radar(udata->self, udata->radar_file);
+       g_free(udata->radar_file);
+       g_free(udata);
+}
+
+static void cached_cb(char *path, gboolean updated, gpointer _self)
+{
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       char *decompressed = g_strconcat(path, ".raw", NULL);
+       if (!updated) {
+               load_radar(self, decompressed);
+               return;
+       }
+
+       decompressed_t *udata = g_malloc(sizeof(decompressed_t));
+       udata->self       = self;
+       udata->radar_file = decompressed;
+       g_debug("AWeatherRadar: cached_cb - File updated, decompressing..");
+       char *argv[] = {"wsr88ddec", path, decompressed, NULL};
+       GPid pid;
+       GError *error = NULL;
+       g_spawn_async(
+               NULL,    // const gchar *working_directory,
+               argv,    // gchar **argv,
+               NULL,    // gchar **envp,
+               G_SPAWN_SEARCH_PATH|
+               G_SPAWN_DO_NOT_REAP_CHILD, 
+                        // GSpawnFlags flags,
+               NULL,    // GSpawnChildSetupFunc child_setup,
+               NULL,    // gpointer user_data,
+               &pid,    // GPid *child_pid,
+               &error); // GError **error
+       if (error) {
+               g_warning("failed to decompress WSR88D data: %s",
+                               error->message);
+               g_error_free(error);
        }
+       g_child_watch_add(pid, decompressed_cb, udata);
 }
 
 /*************
  * Callbacks *
  *************/
-static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
+static void on_sweep_clicked(GtkRadioButton *button, gpointer _self)
+{
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       load_colormap(self, g_object_get_data(G_OBJECT(button), "type" ));
+       load_sweep   (self, g_object_get_data(G_OBJECT(button), "sweep"));
+}
+
+static void on_time_changed(AWeatherView *view, char *time, gpointer _self)
+{
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       g_debug("AWeatherRadar: on_time_changed - setting time");
+       // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
+       char *site = aweather_view_get_site(view);
+       char *base = "http://mesonet.agron.iastate.edu/data/";
+       char *path = g_strdup_printf("nexrd2/raw/K%s/K%s_%s", site, site, time);
+
+       self->cur_radar = NULL;
+       self->cur_sweep = NULL; // Clear radar
+       aweather_gui_gl_redraw(self->gui);
+
+       cache_file(base, path, AWEATHER_AUTOMATIC, cached_cb, self);
+       g_free(path);
+}
+
+static void on_site_changed(AWeatherView *view, char *site, gpointer _self)
 {
-       g_message("radar:expose");
-       if (cur_sweep == NULL)
-               return FALSE;
-       Sweep *sweep = cur_sweep;
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       g_debug("AWeatherRadar: on_site_changed - Loading wsr88d list for %s", site);
+       char *time = NULL;
+       update_times(self, site, &time);
+       aweather_view_set_time(view, time);
+
+       g_free(time);
+}
+
+static void on_refresh(AWeatherView *view, gpointer user_data, gpointer _self)
+{
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       char *site = aweather_view_get_site(view);
+       char *time = NULL;
+       update_times(self, site, &time);
+       aweather_view_set_time(view, time);
+       g_free(time);
+}
+
+/***********
+ * Methods *
+ ***********/
+AWeatherRadar *aweather_radar_new(AWeatherGui *gui)
+{
+       g_debug("AWeatherRadar: new");
+       AWeatherRadar *self = g_object_new(AWEATHER_TYPE_RADAR, NULL);
+       self->gui = gui;
+
+       GtkWidget    *config  = aweather_gui_get_widget(gui, "tabs");
+       AWeatherView *view    = aweather_gui_get_view(gui);
+
+       /* Add configuration tab */
+       self->config_body = gtk_alignment_new(0, 0, 1, 1);
+       gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
+       gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
+       gtk_notebook_prepend_page(GTK_NOTEBOOK(config), self->config_body, gtk_label_new("Radar"));
+
+       /* Set up OpenGL Stuff */
+       g_signal_connect(view,    "site-changed", G_CALLBACK(on_site_changed), self);
+       g_signal_connect(view,    "time-changed", G_CALLBACK(on_time_changed), self);
+       g_signal_connect(view,    "refresh",      G_CALLBACK(on_refresh),      self);
+
+       return self;
+}
+
+static void _aweather_radar_expose(AWeatherPlugin *_self)
+{
+       AWeatherRadar *self = AWEATHER_RADAR(_self);
+       g_debug("AWeatherRadar: expose");
+       if (self->cur_sweep == NULL)
+               return;
+       Sweep *sweep = self->cur_sweep;
 
        /* Draw the rays */
 
        glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
-       glBindTexture(GL_TEXTURE_2D, sweep_tex);
+       glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
        glEnable(GL_TEXTURE_2D);
        glDisable(GL_ALPHA_TEST);
        glColor4f(1,1,1,1);
        glBegin(GL_QUAD_STRIP);
-       for (int ri = 0; ri <= sweep->h.nrays+1; ri++) {
-               /* Do the first sweep twice to complete the last Quad */
-               Ray *ray = sweep->ray[ri % sweep->h.nrays];
-
-               /* right and left looking out from radar */
-               double left  = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
-               //double right = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
+       for (int ri = 0; ri <= sweep->h.nrays; ri++) {
+               Ray  *ray = NULL;
+               double angle = 0;
+               if (ri < sweep->h.nrays) {
+                       ray = sweep->ray[ri];
+                       angle = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
+               } else {
+                       /* Do the right side of the last sweep */
+                       ray = sweep->ray[ri-1];
+                       angle = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
+               }
 
-               double lx = sin(left);
-               double ly = cos(left);
+               double lx = sin(angle);
+               double ly = cos(angle);
 
                double near_dist = ray->h.range_bin1;
                double far_dist  = ray->h.nbins*ray->h.gate_size + ray->h.range_bin1;
 
                /* (find middle of bin) / scale for opengl */
                // near left
-               glTexCoord2f(0.0, (double)ri/sweep->h.nrays);
+               glTexCoord2f(0.0, (double)ri/sweep->h.nrays-0.01);
                glVertex3f(lx*near_dist, ly*near_dist, 2.0);
 
                // far  left
-               glTexCoord2f(1.0, (double)ri/sweep->h.nrays);
+               glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
                glVertex3f(lx*far_dist,  ly*far_dist,  2.0);
        }
        //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
@@ -247,10 +451,10 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
        /* Texture debug */
        //glBegin(GL_QUADS);
-       //glTexCoord2d( 0.,  0.); glVertex3f(-1.,  0., 0.); // bot left
-       //glTexCoord2d( 0.,  1.); glVertex3f(-1.,  1., 0.); // top left
-       //glTexCoord2d( 1.,  1.); glVertex3f( 0.,  1., 0.); // top right
-       //glTexCoord2d( 1.,  0.); glVertex3f( 0.,  0., 0.); // bot right
+       //glTexCoord2d( 0.,  0.); glVertex3f(-500.,   0., 0.); // bot left
+       //glTexCoord2d( 0.,  1.); glVertex3f(-500., 500., 0.); // top left
+       //glTexCoord2d( 1.,  1.); glVertex3f( 0.,   500., 3.); // top right
+       //glTexCoord2d( 1.,  0.); glVertex3f( 0.,     0., 3.); // bot right
        //glEnd();
 
        /* Print the color table */
@@ -261,10 +465,10 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
        glBegin(GL_QUADS);
        int i;
        for (i = 0; i < 256; i++) {
-               glColor4ub(colormap->data[i][0],
-                          colormap->data[i][1],
-                          colormap->data[i][2],
-                          colormap->data[i][3]);
+               glColor4ub(self->cur_colormap->data[i][0],
+                          self->cur_colormap->data[i][1],
+                          self->cur_colormap->data[i][2],
+                          self->cur_colormap->data[i][3]);
                glVertex3f(-1.0, (float)((i  ) - 256/2)/(256/2), 0.0); // bot left
                glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
                glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
@@ -275,70 +479,4 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
        glEnable(GL_ALPHA_TEST);
         glMatrixMode(GL_PROJECTION); glPopMatrix(); 
        glMatrixMode(GL_MODELVIEW ); glPopMatrix();
-       return FALSE;
-}
-
-static void set_time(AWeatherView *view, char *time, gpointer user_data)
-{
-       g_message("radar:setting time");
-       // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
-       char *site = aweather_view_get_location(view);
-       char *base = "http://mesonet.agron.iastate.edu/data/";
-       char *path = g_strdup_printf("nexrd2/raw/K%s/K%s_%s", site, site, time);
-       //g_message("caching %s/%s", base, path);
-       cache_file(base, path, load_radar, NULL);
-}
-
-static void set_site(AWeatherView *view, char *site, gpointer user_data)
-{
-       g_message("Loading wsr88d list for %s", site);
-       gchar *data;
-       gsize length;
-       GError *error = NULL;
-       char *list_uri = g_strdup_printf("http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list", site);
-       GFile *list    = g_file_new_for_uri(list_uri);
-       g_file_load_contents(list, NULL, &data, &length, NULL, &error);
-       if (error) {
-               g_warning("Error loading list for %s: %s", site, error->message);
-               return;
-       }
-       gchar **lines = g_strsplit(data, "\n", -1);
-       GtkTreeView  *tview  = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
-       GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
-       gtk_list_store_clear(lstore);
-       radar = NULL;
-       char *time = NULL;
-       for (int i = 0; lines[i] && lines[i][0]; i++) {
-               // format: `841907 KABR_20090510_0159'
-               //g_message("\tadding %p [%s]", lines[i], lines[i]);
-               char **parts = g_strsplit(lines[i], " ", 2);
-               time = parts[1]+5;
-               GtkTreeIter iter;
-               gtk_list_store_insert(lstore, &iter, 0);
-               gtk_list_store_set(lstore, &iter, 0, time, -1);
-       }
-       if (time != NULL) 
-               aweather_view_set_time(view, time);
-}
-
-/* Init */
-gboolean radar_init(AWeatherGui *_gui)
-{
-       gui = _gui;
-       drawing = aweather_gui_get_widget(gui, "drawing");
-       GtkNotebook    *config  = GTK_NOTEBOOK(aweather_gui_get_widget(gui, "tabs"));
-       AWeatherView   *view    = aweather_gui_get_view(gui);
-
-       /* Add configuration tab */
-       config_body = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body), gtk_label_new("No radar loaded"));
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(config_body), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_notebook_append_page(GTK_NOTEBOOK(config), config_body, gtk_label_new("Radar"));
-
-       /* Set up OpenGL Stuff */
-       g_signal_connect(drawing, "expose-event",     G_CALLBACK(expose),   NULL);
-       g_signal_connect(view,    "location-changed", G_CALLBACK(set_site), NULL);
-       g_signal_connect(view,    "time-changed",     G_CALLBACK(set_time), NULL);
-
-       return TRUE;
 }