]> Pileus Git - grits/blobdiff - src/plugin-radar.c
adding rsl ebuild, gtk suppressions for valgrind
[grits] / src / plugin-radar.c
index e021253f9db4409311f28c59a9aca0bd6137b69a..4e4376de7818888c8eb2f4443cf50c6090849de1 100644 (file)
@@ -34,9 +34,9 @@ static Sweep *cur_sweep = NULL;  // make this not global
 //static char red[256], green[256], blue[256];
 static colormap_t *colormap;
 static guint sweep_tex = 0;
+static Radar *radar = NULL;
 
 static AWeatherGui *gui = NULL;
-static Radar *radar = NULL;
 
 /**************************
  * Data loading functions *
@@ -59,12 +59,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
+                       }
                }
        }
 
@@ -89,16 +93,17 @@ static void load_sweep(Sweep *sweep)
        int height, width;
        guint8 *data;
        bscan_sweep(sweep, &data, &width, &height);
+       glDeleteTextures(1, &sweep_tex);
        glGenTextures(1, &sweep_tex);
        glBindTexture(GL_TEXTURE_2D, 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);
+       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);
+       gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
        aweather_gui_gl_end(gui);
 }
 
@@ -116,19 +121,22 @@ static void load_radar_gui(Radar *radar)
        for (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--) {
+               GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+               for (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);
+                       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);
                        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);
+                       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_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);
@@ -143,14 +151,24 @@ static void load_radar_rsl(GPid pid, gint status, gpointer _path)
                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(path);
+       char *site = g_path_get_basename(dir);
+       g_free(dir);
        RSL_read_these_sweeps("all", NULL);
+       if (radar) {
+               g_message("Freeing radar");
+               RSL_free_radar(radar);
+       }
+       g_message("Allocating radar");
        radar = RSL_wsr88d_to_radar(path, site);
        if (radar == NULL) {
                g_warning("fail to load radar: path=%s, site=%s", path, site);
+               g_free(path);
+               g_free(site);
                return;
        }
+       g_free(path);
+       g_free(site);
 
        /* Load the first sweep by default */
        if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) {
@@ -193,8 +211,11 @@ static void load_radar(char *path, gpointer user_data)
                        NULL,    // gpointer user_data,
                        &pid,    // GPid *child_pid,
                        &error); // GError **error
-               if (error)
-                       g_warning("failed to decompress WSR88D data: %s", error->message);
+               if (error) {
+                       g_warning("failed to decompress WSR88D data: %s",
+                                       error->message);
+                       g_error_free(error);
+               }
                g_child_watch_add(pid, load_radar_rsl, raw);
        }
 }
@@ -286,20 +307,32 @@ static void set_time(AWeatherView *view, char *time, gpointer user_data)
        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);
+       cur_sweep = NULL; // Clear radar
+       gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
        cache_file(base, path, load_radar, NULL);
+       g_free(path);
 }
 
 static void set_site(AWeatherView *view, char *site, gpointer user_data)
 {
        g_message("Loading wsr88d list for %s", site);
+       cur_sweep = NULL; // Clear radar
+
+       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;
-       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);
+       gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
        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);
@@ -307,18 +340,22 @@ static void set_site(AWeatherView *view, char *site, gpointer user_data)
        GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
        gtk_list_store_clear(lstore);
        radar = NULL;
-       char *time = NULL;
+       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);
-               time = parts[1]+5;
-               GtkTreeIter iter;
+               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 (time != NULL) 
-               aweather_view_set_time(view, time);
+       char *time = NULL;
+       gtk_tree_model_get(GTK_TREE_MODEL(lstore), &iter, 0, &time, -1);
+       aweather_view_set_time(view, time);
+       g_free(time);
+       g_free(data);
+       g_strfreev(lines);
 }
 
 /* Init */
@@ -326,14 +363,17 @@ 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);
+       GtkWidget    *config  = 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"));
+       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_prepend_page(GTK_NOTEBOOK(config),
+                       config_body, gtk_label_new("Radar"));
 
        /* Set up OpenGL Stuff */
        g_signal_connect(drawing, "expose-event",     G_CALLBACK(expose),   NULL);