X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=c4e497d3f3ac32320c82b939b53f45fe52a141ce;hp=555534f9c9b9c3d528ec0a10f4cf8eba5139d599;hb=97fe64bdcc7dfc9c005d822ff236c27171344bbb;hpb=e8392701f15e8367dc621b3faa42e6a6b4a6de2b diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 555534f..c4e497d 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2010 Andy Spencer + * Copyright (C) 2009-2012 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; @@ -117,8 +120,15 @@ gboolean _site_update_end(gpointer _site) RadarSite *site = _site; if (site->message) { g_warning("RadarSite: update_end - %s", site->message); - _gtk_bin_set_child(GTK_BIN(site->config), - gtk_label_new(site->message)); + const char *fmt = "http://forecast.weather.gov/product.php?site=NWS&product=FTM&format=TXT&issuedby=%s"; + char *uri = g_strdup_printf(fmt, site->city->code+1); + GtkWidget *box = gtk_vbox_new(TRUE, 0); + GtkWidget *msg = gtk_label_new(site->message); + GtkWidget *btn = gtk_link_button_new_with_label(uri, "View Radar Status"); + gtk_box_pack_start(GTK_BOX(box), msg, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(box), btn, TRUE, TRUE, 0); + _gtk_bin_set_child(GTK_BIN(site->config), box); + g_free(uri); } else { _gtk_bin_set_child(GTK_BIN(site->config), aweather_level2_get_config(site->level2)); @@ -144,7 +154,7 @@ gpointer _site_update_thread(gpointer _site) "^\\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 +189,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+3, TRUE); out: g_idle_add(_site_update_end, site); @@ -203,13 +213,13 @@ 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; } /* Fork loading right away so updating the * list of times doesn't take too long */ - g_thread_create(_site_update_thread, site, FALSE, NULL); + g_thread_new("site-update-thread", _site_update_thread, site); } /* RadarSite methods */ @@ -231,7 +241,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 +258,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", @@ -278,16 +290,6 @@ void _site_on_location_changed(GritsViewer *viewer, radar_site_unload(site); } -gboolean _site_add_marker(gpointer _site) -{ - RadarSite *site = _site; - site->marker = grits_marker_new(site->city->name); - GRITS_OBJECT(site->marker)->center = site->city->pos; - GRITS_OBJECT(site->marker)->lod = EARTH_R*site->city->lod; - grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker), - GRITS_LEVEL_OVERLAY, FALSE); - return FALSE; -} RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http) { @@ -300,6 +302,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; @@ -307,7 +310,11 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, _site_on_location_changed(viewer, lat, lon, elev, site); /* Add marker */ - g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL); + site->marker = grits_marker_new(site->city->name); + GRITS_OBJECT(site->marker)->center = site->city->pos; + GRITS_OBJECT(site->marker)->lod = EARTH_R*0.75*site->city->lod; + grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker), + GRITS_LEVEL_HUD, FALSE); /* Connect signals */ site->location_id = g_signal_connect(viewer, "location-changed", @@ -318,7 +325,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); @@ -343,7 +350,7 @@ struct _RadarConus { GtkWidget *config; time_t time; const gchar *message; - GStaticMutex loading; + GMutex loading; gchar *path; GritsTile *tile[2]; @@ -373,24 +380,26 @@ 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); tile->coords.w = 1.0/ CONUS_HEIGHT; tile->coords.s = tile->coords.n + CONUS_HEIGHT / 2048.0; tile->coords.e = tile->coords.w + (CONUS_WIDTH/2) / 2048.0; - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glFlush(); + g_free(clear); } /* Split the pixbuf into east and west halves (with 2K sides) @@ -419,7 +428,7 @@ static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east, dst[0] = src[0]; dst[1] = src[1]; dst[2] = src[2]; - dst[3] = 0xff; + dst[3] = 0xff * 0.75; for (int j = 0; j < G_N_ELEMENTS(alphamap); j++) if (src[0] == alphamap[j][0] && src[1] == alphamap[j][1] && @@ -476,7 +485,7 @@ gboolean _conus_update_end(gpointer _conus) out: g_free(conus->path); - g_static_mutex_unlock(&conus->loading); + g_mutex_unlock(&conus->loading); return FALSE; } @@ -493,17 +502,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+1)%10+1); - 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) { @@ -533,7 +543,7 @@ out: void _conus_update(RadarConus *conus) { - if (!g_static_mutex_trylock(&conus->loading)) + if (!g_mutex_trylock(&conus->loading)) return; conus->time = grits_viewer_get_time(conus->viewer); g_debug("Conus: update - %d", @@ -544,7 +554,7 @@ void _conus_update(RadarConus *conus) gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading..."); _gtk_bin_set_child(GTK_BIN(conus->config), progress); - g_thread_create(_conus_update_thread, conus, FALSE, NULL); + g_thread_new("conus-update-thread", _conus_update_thread, conus); } RadarConus *radar_conus_new(GtkWidget *pconfig, @@ -554,7 +564,7 @@ RadarConus *radar_conus_new(GtkWidget *pconfig, conus->viewer = g_object_ref(viewer); conus->http = http; conus->config = gtk_alignment_new(0, 0, 1, 1); - g_static_mutex_init(&conus->loading); + g_mutex_init(&conus->loading); gdouble south = CONUS_NORTH - CONUS_DEG_PER_PX*CONUS_HEIGHT; gdouble east = CONUS_WEST + CONUS_DEG_PER_PX*CONUS_WIDTH; @@ -563,8 +573,8 @@ RadarConus *radar_conus_new(GtkWidget *pconfig, conus->tile[1] = grits_tile_new(NULL, CONUS_NORTH, south, east, mid); conus->tile[0]->zindex = 2; conus->tile[1]->zindex = 1; - grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE); - grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE); + grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD+2, FALSE); + grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD+2, FALSE); conus->time_id = g_signal_connect_swapped(viewer, "time-changed", G_CALLBACK(_conus_update), conus); @@ -590,7 +600,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); @@ -769,9 +779,13 @@ 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); - radar_conus_free(self->conus); + if (self->viewer) { + GritsViewer *viewer = self->viewer; + self->viewer = NULL; + g_signal_handler_disconnect(self->config, self->tab_id); + grits_viewer_remove(viewer, GRITS_OBJECT(self->hud)); + radar_conus_free(self->conus); + } /* Drop references */ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject); }