X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=beeb3d0907a5c15bbe84ca0a4939f0b1f02a3f86;hp=ff888f4a65fd40dbafcc8f2d2f28a46c33a60ef7;hb=b21b9cbd70f53e15760467b7c67eddc4a4f01c24;hpb=41cb797b1ae28e992a73bc2c12ba0c05cbb16f72 diff --git a/src/plugins/radar.c b/src/plugins/radar.c index ff888f4..beeb3d0 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andy Spencer + * Copyright (C) 2009-2011 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 @@ -16,12 +16,11 @@ */ #define _XOPEN_SOURCE -#include +#include #include #include #include #include -#include #include #include @@ -41,7 +40,7 @@ static void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new) } static gchar *_find_nearest(time_t time, GList *files, - gsize offset, gchar *format) + gsize offset) { g_debug("RadarSite: find_nearest ..."); time_t nearest_time = 0; @@ -50,7 +49,11 @@ static gchar *_find_nearest(time_t time, GList *files, struct tm tm = {}; for (GList *cur = files; cur; cur = cur->next) { gchar *file = cur->data; - strptime(file+offset, format, &tm); + sscanf(file+offset, "%4d%2d%2d_%2d%2d", + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min); + tm.tm_year -= 1900; + tm.tm_mon -= 1; if (ABS(time - mktime(&tm)) < ABS(time - nearest_time)) { nearest_file = file; @@ -141,10 +144,10 @@ gpointer _site_update_thread(gpointer _site) gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code, "/", "dir.list", NULL); GList *files = grits_http_available(site->http, - "^K\\w{3}_\\d{8}_\\d{4}$", site->city->code, + "^\\w{4}_\\d{8}_\\d{4}$", site->city->code, "\\d+ (.*)", (offline ? NULL : dir_list)); g_free(dir_list); - gchar *nearest = _find_nearest(site->time, files, 5, "%Y%m%d_%H%M"); + gchar *nearest = _find_nearest(site->time, files, 5); g_list_foreach(files, (GFunc)g_free, NULL); g_list_free(files); if (!nearest) { @@ -179,7 +182,7 @@ gpointer _site_update_thread(gpointer _site) } grits_object_hide(GRITS_OBJECT(site->level2), site->hidden); grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2), - GRITS_LEVEL_WORLD, TRUE); + GRITS_LEVEL_WORLD+1, TRUE); out: g_idle_add(_site_update_end, site); @@ -203,7 +206,7 @@ void _site_update(RadarSite *site) /* Remove old volume */ g_debug("RadarSite: update - remove - %s", site->city->code); if (site->level2) { - grits_viewer_remove(site->viewer, site->level2); + grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2)); site->level2 = NULL; } @@ -231,7 +234,7 @@ void radar_site_unload(RadarSite *site) /* Remove radar */ if (site->level2) { - grits_viewer_remove(site->viewer, site->level2); + grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2)); site->level2 = NULL; } @@ -248,6 +251,8 @@ void radar_site_load(RadarSite *site) gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig), site->config, gtk_label_new(site->city->name)); gtk_widget_show_all(site->config); + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(site->pconfig)) == 0) + gtk_notebook_set_current_page(GTK_NOTEBOOK(site->pconfig), -1); /* Set up radar loading */ site->time_id = g_signal_connect_swapped(site->viewer, "time-changed", @@ -300,6 +305,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, "level2" G_DIR_SEPARATOR_S); site->city = city; site->pconfig = pconfig; + site->hidden = TRUE; /* Set initial location */ gdouble lat, lon, elev; @@ -318,7 +324,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, void radar_site_free(RadarSite *site) { radar_site_unload(site); - grits_viewer_remove(site->viewer, site->marker); + grits_viewer_remove(site->viewer, GRITS_OBJECT(site->marker)); if (site->location_id) g_signal_handler_disconnect(site->viewer, site->location_id); grits_http_free(site->http); @@ -373,13 +379,14 @@ static void _conus_update_end_copy(GritsTile *tile, guchar *pixels) glGenTextures(1, tile->data); } + gchar *clear = g_malloc0(2048*2048*4); guint *tex = tile->data; glBindTexture(GL_TEXTURE_2D, *tex); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1); glTexImage2D(GL_TEXTURE_2D, 0, 4, 2048, 2048, 0, - GL_RGBA, GL_UNSIGNED_BYTE, NULL); + GL_RGBA, GL_UNSIGNED_BYTE, clear); glTexSubImage2D(GL_TEXTURE_2D, 0, 1,1, CONUS_WIDTH/2,CONUS_HEIGHT, GL_RGBA, GL_UNSIGNED_BYTE, pixels); tile->coords.n = 1.0/(CONUS_WIDTH/2); @@ -391,6 +398,7 @@ static void _conus_update_end_copy(GritsTile *tile, guchar *pixels) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glFlush(); + g_free(clear); } /* Split the pixbuf into east and west halves (with 2K sides) @@ -493,17 +501,18 @@ gpointer _conus_update_thread(gpointer _conus) if (time(NULL) - conus->time < 60*60*5 && !offline) { /* radar.weather.gov is full of lies. * the index pages get cached and out of date */ - struct tm tm; - gmtime_r(&conus->time, &tm); - time_t onthe8 = conus->time - 60*((tm.tm_min+2)%10); - gmtime_r(&onthe8, &tm); + /* gmtime is not thread safe, but it's not used very often so + * hopefully it'll be alright for now... :-( */ + struct tm *tm = gmtime(&conus->time); + time_t onthe8 = conus->time - 60*((tm->tm_min+1)%10+1); + tm = gmtime(&onthe8); nearest = g_strdup_printf("Conus_%04d%02d%02d_%02d%02d_N0Ronly.gif", - tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, - tm.tm_hour, tm.tm_min); + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min); } else { GList *files = grits_http_available(conus->http, "^Conus_[^\"]*_N0Ronly.gif$", "", NULL, NULL); - nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M"); + nearest = _find_nearest(conus->time, files, 6); g_list_foreach(files, (GFunc)g_free, NULL); g_list_free(files); if (!nearest) { @@ -590,7 +599,7 @@ void radar_conus_free(RadarConus *conus) glDeleteTextures(1, tile->data); g_free(tile->data); } - grits_viewer_remove(conus->viewer, tile); + grits_viewer_remove(conus->viewer, GRITS_OBJECT(tile)); } g_object_unref(conus->viewer); @@ -641,14 +650,14 @@ static void _draw_hud(GritsCallback *callback, GritsOpenGL *opengl, gpointer _se static void _load_colormap(gchar *filename, AWeatherColormap *cm) { g_debug("GritsPluginRadar: _load_colormap - %s", filename); - FILE *file = g_fopen(filename, "r"); + FILE *file = fopen(filename, "r"); if (!file) g_error("GritsPluginRadar: open failed"); guint8 color[4]; GArray *array = g_array_sized_new(FALSE, TRUE, sizeof(color), 256); - fgets(cm->name, sizeof(cm->name), file); - fscanf(file, "%f\n", &cm->scale); - fscanf(file, "%f\n", &cm->shift); + if (!fgets(cm->name, sizeof(cm->name), file)) goto out; + if (!fscanf(file, "%f\n", &cm->scale)) goto out; + if (!fscanf(file, "%f\n", &cm->shift)) goto out; int r, g, b, a; while (fscanf(file, "%d %d %d %d\n", &r, &g, &b, &a) == 4) { color[0] = r; @@ -659,7 +668,9 @@ static void _load_colormap(gchar *filename, AWeatherColormap *cm) } cm->len = (gint )array->len; cm->data = (void*)array->data; +out: g_array_free(array, FALSE); + fclose(file); } static void _update_hidden(GtkNotebook *notebook, @@ -768,7 +779,7 @@ static void grits_plugin_radar_dispose(GObject *gobject) g_debug("GritsPluginRadar: dispose"); GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject); g_signal_handler_disconnect(self->config, self->tab_id); - grits_viewer_remove(self->viewer, self->hud); + grits_viewer_remove(self->viewer, GRITS_OBJECT(self->hud)); radar_conus_free(self->conus); /* Drop references */ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);