/*
- * Copyright (C) 2009-2011 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-2012 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
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));
}
grits_object_hide(GRITS_OBJECT(site->level2), site->hidden);
grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2),
- GRITS_LEVEL_WORLD+1, TRUE);
+ GRITS_LEVEL_WORLD+3, TRUE);
out:
g_idle_add(_site_update_end, site);
/* 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 */
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",
GtkWidget *config;
time_t time;
const gchar *message;
- GStaticMutex loading;
+ GMutex loading;
gchar *path;
GritsTile *tile[2];
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)
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] &&
out:
g_free(conus->path);
- g_static_mutex_unlock(&conus->loading);
+ g_mutex_unlock(&conus->loading);
return FALSE;
}
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",
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,
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;
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);
{
g_debug("GritsPluginRadar: dispose");
GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
- g_signal_handler_disconnect(self->config, self->tab_id);
- grits_viewer_remove(self->viewer, GRITS_OBJECT(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);
}