X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=555534f9c9b9c3d528ec0a10f4cf8eba5139d599;hp=22aaa5bf742d9a3a700f48ae9957ebc28527d27d;hb=e8392701f15e8367dc621b3faa42e6a6b4a6de2b;hpb=db17fbaec9bdc9dcb431881354cb0d716dfe3328 diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 22aaa5b..555534f 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -79,7 +78,6 @@ struct _RadarSite { /* Information */ city_t *city; GritsMarker *marker; // Map marker for grits - gpointer *marker_ref; // Reference to maker /* Stuff from the parents */ GritsViewer *viewer; @@ -92,7 +90,6 @@ struct _RadarSite { RadarSiteStatus status; // Loading status for the site GtkWidget *config; AWeatherLevel2 *level2; // The Level2 structure for the current volume - gpointer level2_ref; // GritsViewer reference to the added radar /* Internal data */ time_t time; // Current timestamp of the level2 @@ -144,7 +141,7 @@ 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"); @@ -180,9 +177,9 @@ gpointer _site_update_thread(gpointer _site) site->message = "Load failed"; goto out; } - GRITS_OBJECT(site->level2)->hidden = site->hidden; - site->level2_ref = grits_viewer_add(site->viewer, - GRITS_OBJECT(site->level2), GRITS_LEVEL_WORLD, TRUE); + grits_object_hide(GRITS_OBJECT(site->level2), site->hidden); + grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2), + GRITS_LEVEL_WORLD, TRUE); out: g_idle_add(_site_update_end, site); @@ -205,10 +202,9 @@ void _site_update(RadarSite *site) /* Remove old volume */ g_debug("RadarSite: update - remove - %s", site->city->code); - if (site->level2_ref) { - site->level2 = NULL; - grits_viewer_remove(site->viewer, site->level2_ref); - site->level2_ref = NULL; + if (site->level2) { + grits_viewer_remove(site->viewer, site->level2); + site->level2 = NULL; } /* Fork loading right away so updating the @@ -234,10 +230,9 @@ void radar_site_unload(RadarSite *site) gtk_widget_destroy(site->config); /* Remove radar */ - if (site->level2_ref) { - site->level2 = NULL; - grits_viewer_remove(site->viewer, site->level2_ref); - site->level2_ref = NULL; + if (site->level2) { + grits_viewer_remove(site->viewer, site->level2); + site->level2 = NULL; } site->status = STATUS_UNLOADED; @@ -289,8 +284,8 @@ gboolean _site_add_marker(gpointer _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; - site->marker_ref = grits_viewer_add(site->viewer, - GRITS_OBJECT(site->marker), GRITS_LEVEL_OVERLAY, FALSE); + grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker), + GRITS_LEVEL_OVERLAY, FALSE); return FALSE; } RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, @@ -306,6 +301,11 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, site->city = city; site->pconfig = pconfig; + /* Set initial location */ + gdouble lat, lon, elev; + grits_viewer_get_location(viewer, &lat, &lon, &elev); + _site_on_location_changed(viewer, lat, lon, elev, site); + /* Add marker */ g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL); @@ -318,7 +318,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_ref); + grits_viewer_remove(site->viewer, site->marker); if (site->location_id) g_signal_handler_disconnect(site->viewer, site->location_id); grits_http_free(site->http); @@ -347,7 +347,6 @@ struct _RadarConus { gchar *path; GritsTile *tile[2]; - gpointer *tile_ref[2]; guint time_id; // "time-changed" callback ID guint refresh_id; // "refresh" callback ID @@ -446,7 +445,7 @@ gboolean _conus_update_end(gpointer _conus) GError *error = NULL; GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->path, &error); if (!pixbuf || error) { - g_warning("Conus: update_end - error loading pixbuf"); + g_warning("Conus: update_end - error loading pixbuf: %s", conus->path); _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf")); g_remove(conus->path); goto out; @@ -490,21 +489,34 @@ gpointer _conus_update_thread(gpointer _conus) g_debug("Conus: update_thread - nearest"); gboolean offline = grits_viewer_get_offline(conus->viewer); gchar *conus_url = "http://radar.weather.gov/Conus/RadarImg/"; - GList *files = grits_http_available(conus->http, - "^Conus_[^\"]*_N0Ronly.gif$", "", - NULL, (offline ? NULL : conus_url)); - gchar *nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M"); - g_list_foreach(files, (GFunc)g_free, NULL); - g_list_free(files); - if (!nearest) { - conus->message = "No suitable files"; - goto out; + gchar *nearest; + 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); + 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); + } 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"); + g_list_foreach(files, (GFunc)g_free, NULL); + g_list_free(files); + if (!nearest) { + conus->message = "No suitable files"; + goto out; + } } /* Fetch the image */ g_debug("Conus: update_thread - fetch"); gchar *uri = g_strconcat(conus_url, nearest, NULL); - conus->path = grits_http_fetch(conus->http, uri, nearest, GRITS_ONCE, + conus->path = grits_http_fetch(conus->http, uri, nearest, + offline ? GRITS_LOCAL : GRITS_ONCE, _conus_update_loading, conus); g_free(nearest); g_free(uri); @@ -551,10 +563,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; - conus->tile_ref[0] = grits_viewer_add(viewer, - GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE); - conus->tile_ref[1] = 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, TRUE); + grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE); conus->time_id = g_signal_connect_swapped(viewer, "time-changed", G_CALLBACK(_conus_update), conus); @@ -576,12 +586,11 @@ void radar_conus_free(RadarConus *conus) for (int i = 0; i < 2; i++) { GritsTile *tile = conus->tile[i]; - gpointer ref = conus->tile_ref[i]; if (tile->data) { glDeleteTextures(1, tile->data); g_free(tile->data); } - grits_viewer_remove(conus->viewer, ref); + grits_viewer_remove(conus->viewer, tile); } g_object_unref(conus->viewer); @@ -632,20 +641,27 @@ 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); - while (fscanf(file, "%hhd %hhd %hhd %hhd\n", - &color[0], &color[1], &color[2], &color[3]) == 4) + 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; + color[1] = g; + color[2] = b; + color[3] = a; g_array_append_val(array, color); + } cm->len = (gint )array->len; cm->data = (void*)array->data; +out: g_array_free(array, FALSE); + fclose(file); } static void _update_hidden(GtkNotebook *notebook, @@ -662,12 +678,12 @@ static void _update_hidden(GtkNotebook *notebook, /* Conus */ if (conus) { - GRITS_OBJECT(conus->tile[0])->hidden = is_hidden; - GRITS_OBJECT(conus->tile[1])->hidden = is_hidden; + grits_object_hide(GRITS_OBJECT(conus->tile[0]), is_hidden); + grits_object_hide(GRITS_OBJECT(conus->tile[1]), is_hidden); } else if (site) { site->hidden = is_hidden; if (site->level2) - GRITS_OBJECT(site->level2)->hidden = is_hidden; + grits_object_hide(GRITS_OBJECT(site->level2), is_hidden); } else { g_warning("GritsPluginRadar: _update_hidden - no site or counus found"); } @@ -685,12 +701,12 @@ GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs) self->prefs = prefs; /* Setup page switching */ - g_signal_connect(self->config, "switch-page", + self->tab_id = g_signal_connect(self->config, "switch-page", G_CALLBACK(_update_hidden), viewer); /* Load HUD */ - GritsCallback *hud_cb = grits_callback_new(_draw_hud, self); - self->hud_ref = grits_viewer_add(viewer, GRITS_OBJECT(hud_cb), GRITS_LEVEL_HUD, FALSE); + self->hud = grits_callback_new(_draw_hud, self); + grits_viewer_add(viewer, GRITS_OBJECT(self->hud), GRITS_LEVEL_HUD, FALSE); /* Load Conus */ self->conus = radar_conus_new(self->config, self->viewer, self->conus_http); @@ -747,13 +763,14 @@ static void grits_plugin_radar_init(GritsPluginRadar *self) } /* Need to position on the top because of Win32 bug */ - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_BOTTOM); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_LEFT); } static void grits_plugin_radar_dispose(GObject *gobject) { g_debug("GritsPluginRadar: dispose"); GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject); - grits_viewer_remove(self->viewer, self->hud_ref); + g_signal_handler_disconnect(self->config, self->tab_id); + grits_viewer_remove(self->viewer, self->hud); radar_conus_free(self->conus); /* Drop references */ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);