/*
- * Copyright (C) 2009-201
0 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-201
1 Andy Spencer <andy753421@gmail.com>
*
* 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
*/
#define _XOPEN_SOURCE
-#include <sys/time.h>
+#include <time.h>
#include <config.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <GL/gl.h>
#include <math.h>
#include <rsl.h>
}
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;
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;
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) {
}
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);
/* 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;
}
/* Remove radar */
if (site->level2) {
- grits_viewer_remove(site->viewer, site->level2);
+ grits_viewer_remove(site->viewer, GRITS_OBJECT(site->level2));
site->level2 = NULL;
}
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",
radar_site_unload(site);
}
-gboolean _site_add_marker(gpointer _site)
+gboolean _site_add_marker(RadarSite *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_OBJECT(site->marker)->lod = EARTH_R*0.75*site->city->lod;
grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker),
GRITS_LEVEL_OVERLAY, FALSE);
return FALSE;
"level2" G_DIR_SEPARATOR_S);
site->city = city;
site->pconfig = pconfig;
+ site->hidden = TRUE;
/* Set initial location */
gdouble 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);
+ _site_add_marker(site);
/* Connect signals */
site->location_id = g_signal_connect(viewer, "location-changed",
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);
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);
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)
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] &&
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) {
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);
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);
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;
}
cm->len = (gint )array->len;
cm->data = (void*)array->data;
+out:
g_array_free(array, FALSE);
+ fclose(file);
}
static void _update_hidden(GtkNotebook *notebook,
{
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);
}
projects / aweather / blobdiff