X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugin-radar.c;h=18e92796c0e363cd4fbd579a50e2422011edb3d9;hp=4d75c73db6785810c403e176ad2a9ec7a44ea052;hb=1019fcfe2d612df24355f2597e661c28621b01c3;hpb=d97d97d3896bc8299adf2e7aaa5cc38e2611f395 diff --git a/src/plugin-radar.c b/src/plugin-radar.c index 4d75c73..18e9279 100644 --- a/src/plugin-radar.c +++ b/src/plugin-radar.c @@ -18,31 +18,69 @@ #include #include #include +#include #include #include - -#include "rsl.h" +#include #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 Radar *radar = NULL; +static char *nexrad_base = "http://mesonet.agron.iastate.edu/data/"; + +/**************** + * GObject code * + ****************/ +/* Plugin init */ +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_plugin_init(AWeatherPluginInterface *iface) +{ + g_debug("AWeatherRadar: plugin_init"); + /* Add methods to the interface */ + iface->expose = _aweather_radar_expose; +} +/* Class/Object init */ +static void aweather_radar_init(AWeatherRadar *radar) +{ + g_debug("AWeatherRadar: class_init"); + /* Set defaults */ + radar->gui = NULL; + radar->soup = NULL; +} +static void aweather_radar_dispose(GObject *gobject) +{ + g_debug("AWeatherRadar: dispose"); + AWeatherRadar *self = AWEATHER_RADAR(gobject); + /* Drop references */ + G_OBJECT_CLASS(aweather_radar_parent_class)->dispose(gobject); +} +static void aweather_radar_finalize(GObject *gobject) +{ + g_debug("AWeatherRadar: finalize"); + AWeatherRadar *self = AWEATHER_RADAR(gobject); + /* Free data */ + G_OBJECT_CLASS(aweather_radar_parent_class)->finalize(gobject); -static AWeatherGui *gui = NULL; +} +static void aweather_radar_class_init(AWeatherRadarClass *klass) +{ + g_debug("AWeatherRadar: class_init"); + GObjectClass *gobject_class = (GObjectClass*)klass; + gobject_class->dispose = aweather_radar_dispose; + gobject_class->finalize = aweather_radar_finalize; +} /************************** * 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; @@ -78,96 +116,121 @@ 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); - glDeleteTextures(1, &sweep_tex); - 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); + 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); - gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing")); - 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 = NULL; + 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(FALSE, 0); - for (si = 0; si < vol->h.nsweeps; si++) { + rows++; cols = 1; elev = 0; + + /* Row label */ + g_snprintf(row_label_str, 64, "%s:", 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); + 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, "%.2f°", 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), label); + 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_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 *dir = g_path_get_dirname(path); + char *dir = g_path_get_dirname(radar_file); char *site = g_path_get_basename(dir); g_free(dir); + g_debug("AWeatherRadar: load_radar - Loading new 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); + 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_free(path); + g_warning("fail to load radar: path=%s, site=%s", radar_file, site); g_free(site); return; } - g_free(path); g_free(site); /* Load the first sweep by default */ @@ -179,103 +242,264 @@ 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, gboolean updated, gpointer user_data) +/* TODO: These update times functions are getting ugly... */ +static void update_times_gtk(AWeatherRadar *self, GList *times) { - char *raw = g_strconcat(path, ".raw", NULL); - if (!updated) { - load_radar_rsl(0, 0, raw); - } else { - g_message("File updated, decompressing.."); - 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_error_free(error); + gchar *last_time = NULL; + GRegex *regex = g_regex_new("^[A-Z]{4}_([0-9]{8}_[0-9]{4})$", 0, 0, NULL); // KLSX_20090622_2113 + GMatchInfo *info; + + 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; + times = g_list_reverse(times); + for (GList *cur = times; cur; cur = cur->next) { + g_message("trying time %s", (gchar*)cur->data); + if (g_regex_match(regex, cur->data, 0, &info)) { + gchar *time = g_match_info_fetch(info, 1); + g_message("adding time %s", (gchar*)cur->data); + gtk_list_store_insert(lstore, &iter, 0); + gtk_list_store_set(lstore, &iter, 0, time, -1); + last_time = time; } - g_child_watch_add(pid, load_radar_rsl, raw); } -} -static void update_times(char *site, char **last_time) -{ - 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); + AWeatherView *view = aweather_gui_get_view(self->gui); + aweather_view_set_time(view, last_time); + g_regex_unref(regex); + g_list_foreach(times, (GFunc)g_free, NULL); + g_list_free(times); +} +static void update_times_online_cb(char *path, gboolean updated, gpointer _self) +{ + GList *times = NULL; 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; - } + g_file_get_contents(path, &data, &length, NULL); 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); - 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); + times = g_list_prepend(times, g_strdup(parts[1])); g_strfreev(parts); } + g_strfreev(lines); + g_free(data); - if (last_time) - gtk_tree_model_get(GTK_TREE_MODEL(lstore), &iter, 0, last_time, -1); + update_times_gtk(_self, times); +} +static void update_times(AWeatherRadar *self, AWeatherView *view, char *site) +{ + if (aweather_view_get_offline(view)) { + GList *times = NULL; + gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE, "nexrd2", "raw", site, NULL); + GDir *dir = g_dir_open(path, 0, NULL); + if (dir) { + const gchar *name; + while ((name = g_dir_read_name(dir))) { + times = g_list_prepend(times, g_strdup(name)); + } + g_dir_close(dir); + } + g_free(path); + update_times_gtk(self, times); + } else { + gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site); + cache_file(nexrad_base, path, AWEATHER_REFRESH, NULL, update_times_online_cb, self); + /* update_times_gtk from update_times_online_cb */ + } +} - 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 _udata) +{ + decompressed_t *udata = _udata; + if (status != 0) { + g_warning("wsr88ddec exited with status %d", status); + return; + } + load_radar(udata->self, udata->radar_file); + g_spawn_close_pid(pid); + g_free(udata->radar_file); + g_free(udata); +} + +static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self) +{ + AWeatherRadar *self = AWEATHER_RADAR(_self); + double percent = (double)cur/total; + + g_message("AWeatherRadar: cache_chunk_cb - %lld/%lld = %.2f%%", + cur, total, percent*100); + + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0)); + + gchar *msg = g_strdup_printf("Loading radar... %5.1f%% (%.2f/%.2f MB)", + percent*100, (double)cur/1000000, (double)total/1000000); + gtk_label_set_text(GTK_LABEL(self->progress_label), msg); + g_free(msg); +} + +static void cache_done_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: cache_done_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); + self->soup = NULL; } /************* * Callbacks * *************/ -static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data) +static void on_sweep_clicked(GtkRadioButton *button, gpointer _self) { - g_message("radar:expose"); - if (cur_sweep == NULL) - return FALSE; - Sweep *sweep = cur_sweep; + 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, const char *time, gpointer _self) +{ + AWeatherRadar *self = AWEATHER_RADAR(_self); + g_debug("AWeatherRadar: on_time_changed - setting time=%s", time); + // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 + char *site = aweather_view_get_site(view); + char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time); + + /* Set up progress bar */ + GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body)); + if (child) gtk_widget_destroy(child); + + GtkWidget *vbox = gtk_vbox_new(FALSE, 10); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 10); + self->progress_bar = gtk_progress_bar_new(); + self->progress_label = gtk_label_new("Loading radar..."); + gtk_box_pack_start(GTK_BOX(vbox), self->progress_bar, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), self->progress_label, FALSE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(self->config_body), vbox); + gtk_widget_show_all(self->config_body); + + /* Clear radar */ + if (self->cur_radar) + RSL_free_radar(self->cur_radar); + self->cur_radar = NULL; + self->cur_sweep = NULL; + aweather_gui_gl_redraw(self->gui); + + /* Start loading the new radar */ + if (self->soup) { + soup_session_abort(self->soup); + self->soup = NULL; + } + if (aweather_view_get_offline(view)) + self->soup = cache_file(nexrad_base, path, AWEATHER_ONCE, + cache_chunk_cb, cache_done_cb, self); + else + self->soup = cache_file(nexrad_base, path, AWEATHER_UPDATE, + cache_chunk_cb, cache_done_cb, self); + g_free(path); +} + +static void on_site_changed(AWeatherView *view, char *site, gpointer _self) +{ + AWeatherRadar *self = AWEATHER_RADAR(_self); + g_debug("AWeatherRadar: on_site_changed - Loading wsr88d list for %s", site); + update_times(self, view, site), &time; +} + +static void on_refresh(AWeatherView *view, gpointer _self) +{ + AWeatherRadar *self = AWEATHER_RADAR(_self); + char *site = aweather_view_get_site(view); + update_times(self, view, site); +} + +/*********** + * 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); @@ -300,11 +524,11 @@ static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_da /* (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); @@ -313,10 +537,10 @@ static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_da /* 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 */ @@ -327,10 +551,10 @@ static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_da 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 @@ -341,66 +565,4 @@ static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_da glEnable(GL_ALPHA_TEST); glMatrixMode(GL_PROJECTION); glPopMatrix(); glMatrixMode(GL_MODELVIEW ); glPopMatrix(); - return FALSE; -} - -static void on_time_changed(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); - - radar = NULL; - cur_sweep = NULL; // Clear radar - gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing")); - - cache_file(base, path, AWEATHER_AUTOMATIC, load_radar, NULL); - g_free(path); -} - -static void on_location_changed(AWeatherView *view, char *site, gpointer user_data) -{ - g_message("Loading wsr88d list for %s", site); - char *time = NULL; - update_times(site, &time); - aweather_view_set_time(view, time); - - g_free(time); -} - -static void on_refresh(AWeatherView *view, gpointer user_data) -{ - char *site = aweather_view_get_location(view); - char *time = NULL; - update_times(site, &time); - aweather_view_set_time(view, time); - g_free(time); -} - -/* Init */ -gboolean radar_init(AWeatherGui *_gui) -{ - gui = _gui; - drawing = aweather_gui_get_widget(gui, "drawing"); - 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_prepend_page(GTK_NOTEBOOK(config), - config_body, gtk_label_new("Radar")); - - /* Set up OpenGL Stuff */ - g_signal_connect(drawing, "expose-event", G_CALLBACK(on_expose), NULL); - g_signal_connect(view, "location-changed", G_CALLBACK(on_location_changed), NULL); - g_signal_connect(view, "time-changed", G_CALLBACK(on_time_changed), NULL); - g_signal_connect(view, "refresh", G_CALLBACK(on_refresh), NULL); - - return TRUE; }