X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugin-radar.c;h=0990858d9087d499385dfc67cfb4ec63746d7ec4;hp=1fe30f6bcc936a96613dfbb088f2a80d029d4af6;hb=93c853165104b5119e17be07e325f9097a5ebdb3;hpb=99863849923de021148ebf371aaeab427ae139e1 diff --git a/src/plugin-radar.c b/src/plugin-radar.c index 1fe30f6..0990858 100644 --- a/src/plugin-radar.c +++ b/src/plugin-radar.c @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2009 Andy Spencer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include #include #include @@ -13,30 +30,17 @@ 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 int nred, ngreen, nblue; +//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 * **************************/ -/* return a GL alpha value for a radar pixle */ -static guint8 get_alpha(guint8 db) -{ - if (db == BADVAL) return 0; - if (db == RFVAL ) return 0; - if (db == APFLAG) return 0; - if (db == NOECHO) return 0; - if (db == 0 ) return 0; - //if (db > 60) return 0; - //else if (db < 10) return 0; - //else if (db < 25) return (db-10)*(255.0/15); - else return 255; -} - /* Convert a sweep to an 2d array of data points */ static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height) { @@ -55,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; - buf[buf_i+0] = red[val]; - buf[buf_i+1] = green[val]; - buf[buf_i+2] = blue[val]; - buf[buf_i+3] = get_alpha(val); + 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 + } } } @@ -70,6 +78,13 @@ 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) { @@ -86,8 +101,7 @@ static void load_sweep(Sweep *sweep) 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); 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); } @@ -105,18 +119,18 @@ 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); + GtkWidget *vbox = gtk_vbox_new(FALSE, 0); for (si = vol->h.nsweeps-1; si >= 0; 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); 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_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); @@ -132,21 +146,18 @@ static void load_radar_rsl(GPid pid, gint status, gpointer _path) return; } char *site = g_path_get_basename(g_path_get_dirname(path)); - if (radar) RSL_free_radar(radar); 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); return; } - /* TODO: replace this with a better color table */ - g_message("loading color table"); - RSL_load_refl_color_table(); - RSL_get_color_table(RSL_RED_TABLE, red, &nred); - RSL_get_color_table(RSL_GREEN_TABLE, green, &ngreen); - RSL_get_color_table(RSL_BLUE_TABLE, blue, &nblue); - /* Load the first sweep by default */ if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) { g_warning("No sweeps found\n"); @@ -156,6 +167,7 @@ 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]); break; } @@ -173,14 +185,16 @@ static void load_radar(char *path, gpointer user_data) if (g_file_test(raw, G_FILE_TEST_EXISTS)) { load_radar_rsl(0, 0, raw); } else { - char *argv[] = {"./wsr88ddec", path, raw, NULL}; + 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_DO_NOT_REAP_CHILD, // GSpawnFlags flags, + G_SPAWN_SEARCH_PATH| + G_SPAWN_DO_NOT_REAP_CHILD, + // GSpawnFlags flags, NULL, // GSpawnChildSetupFunc child_setup, NULL, // gpointer user_data, &pid, // GPid *child_pid, @@ -207,6 +221,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data) glPushMatrix(); glBindTexture(GL_TEXTURE_2D, 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++) { @@ -246,18 +261,24 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data) /* Print the color table */ glDisable(GL_TEXTURE_2D); + glDisable(GL_DEPTH_TEST); glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity(); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); glBegin(GL_QUADS); int i; - for (i = 0; i < nred; i++) { - glColor4ub(red[i], green[i], blue[i], get_alpha(i)); - glVertex3f(-1.0, (float)((i ) - nred/2)/(nred/2), 0.0); // bot left - glVertex3f(-1.0, (float)((i+1) - nred/2)/(nred/2), 0.0); // top left - glVertex3f(-0.9, (float)((i+1) - nred/2)/(nred/2), 0.0); // top right - glVertex3f(-0.9, (float)((i ) - nred/2)/(nred/2), 0.0); // bot right + for (i = 0; i < 256; i++) { + glColor4ub(colormap->data[i][0], + colormap->data[i][1], + colormap->data[i][2], + 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 + glVertex3f(-0.9, (float)((i ) - 256/2)/(256/2), 0.0); // bot right } glEnd(); + glEnable(GL_DEPTH_TEST); + glEnable(GL_ALPHA_TEST); glMatrixMode(GL_PROJECTION); glPopMatrix(); glMatrixMode(GL_MODELVIEW ); glPopMatrix(); return FALSE; @@ -271,7 +292,10 @@ 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) @@ -282,6 +306,9 @@ static void set_site(AWeatherView *view, char *site, gpointer user_data) 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_free(list_uri); + cur_sweep = NULL; // Clear radar + gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing")); g_file_load_contents(list, NULL, &data, &length, NULL, &error); if (error) { g_warning("Error loading list for %s: %s", site, error->message); @@ -304,6 +331,8 @@ static void set_site(AWeatherView *view, char *site, gpointer user_data) } if (time != NULL) aweather_view_set_time(view, time); + g_free(data); + g_strfreev(lines); } /* Init */ @@ -318,7 +347,7 @@ gboolean radar_init(AWeatherGui *_gui) 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_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);