#include "level2.h"
#include "../aweather-location.h"
+GtkWidget *_gtk_check_label_new(const gchar *text, gboolean state,
+ GCallback on_clicked, gpointer user_data)
+{
+ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
+ GtkWidget *check = gtk_check_button_new();
+ GtkWidget *label = gtk_label_new(text);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), state);
+ g_signal_connect_swapped(check , "clicked",
+ G_CALLBACK(on_clicked), user_data);
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), check , FALSE, FALSE, 0);
+ gtk_widget_show_all(hbox);
+ return hbox;
+}
+
void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
{
GtkWidget *old = gtk_bin_get_child(bin);
GtkWidget *pconfig;
/* When loaded */
+ gboolean hidden;
RadarSiteStatus status; // Loading status for the site
GtkWidget *config;
AWeatherLevel2 *level2; // The Level2 structure for the current volume
gpointer _site_update_thread(gpointer _site)
{
RadarSite *site = _site;
- g_debug("GisPluginRadar: _update - %s", site->city->code);
- site->status = STATUS_LOADING;
+ g_debug("GisPluginRadar: _site_update_thread - %s", site->city->code);
site->message = NULL;
gboolean offline = gis_viewer_get_offline(site->viewer);
gchar *nexrad_url = gis_prefs_get_string(site->prefs,
"aweather/nexrad_url", NULL);
- /* Remove old volume */
- g_debug("GisPluginRadar: _update - remove - %s", site->city->code);
- if (site->level2_ref) {
- gis_viewer_remove(site->viewer, site->level2_ref);
- site->level2_ref = NULL;
- }
-
/* Find nearest volume (temporally) */
- g_debug("GisPluginRadar: _update - find nearest - %s", site->city->code);
+ g_debug("GisPluginRadar: _site_update_thread - find nearest - %s", site->city->code);
gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code,
"/", "dir.list", NULL);
GList *files = gis_http_available(site->http,
}
/* Fetch new volume */
- g_debug("GisPluginRadar: _update - fetch");
+ g_debug("GisPluginRadar: _site_update_thread - fetch");
gchar *local = g_strconcat(site->city->code, "/", nearest, NULL);
gchar *uri = g_strconcat(nexrad_url, "/", local, NULL);
gchar *file = gis_http_fetch(site->http, uri, local,
}
/* Load and add new volume */
- g_debug("GisPluginRadar: _update - load - %s", site->city->code);
+ g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
site->level2 = aweather_level2_new_from_file(
site->viewer, colormaps, file, site->city->code);
g_free(file);
site->message = "Load failed";
goto out;
}
+ GIS_OBJECT(site->level2)->hidden = site->hidden;
site->level2_ref = gis_viewer_add(site->viewer,
GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
}
void _site_update(RadarSite *site)
{
+ if (site->status == STATUS_LOADING)
+ return;
+ site->status = STATUS_LOADING;
+
site->time = gis_viewer_get_time(site->viewer);
- g_debug("GisPluginRadar: _on_time_changed %s - %d",
+ g_debug("GisPluginRadar: _site_update %s - %d",
site->city->code, (gint)site->time);
/* Add a progress bar */
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
_gtk_bin_set_child(GTK_BIN(site->config), progress);
+ /* Remove old volume */
+ g_debug("GisPluginRadar: _site_update - remove - %s", site->city->code);
+ if (site->level2_ref) {
+ gis_viewer_remove(site->viewer, site->level2_ref);
+ site->level2_ref = 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);
site->status = STATUS_UNLOADED;
}
+void radar_site_toggle(RadarSite *site)
+{
+ site->hidden = !site->hidden;
+ if (site->level2) {
+ GIS_OBJECT(site->level2)->hidden = site->hidden;
+ gtk_widget_queue_draw(GTK_WIDGET(site->viewer));
+ }
+}
+
void radar_site_load(RadarSite *site)
{
g_debug("GisPluginRadar: radar_site_load %s", site->city->code);
- site->status = STATUS_LOADING;
/* Add tab page */
site->config = gtk_alignment_new(0, 0, 1, 1);
- GtkWidget *tab = gtk_hbox_new(FALSE, 0);
- GtkWidget *close = gtk_button_new();
- GtkWidget *label = gtk_label_new(site->city->name);
- gtk_container_add(GTK_CONTAINER(close),
- gtk_image_new_from_stock(GTK_STOCK_CLOSE,
- GTK_ICON_SIZE_MENU));
- gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
- g_signal_connect_swapped(close, "clicked",
- G_CALLBACK(radar_site_unload), site);
- gtk_box_pack_start(GTK_BOX(tab), label, TRUE, TRUE, 0);
- gtk_box_pack_end(GTK_BOX(tab), close, FALSE, FALSE, 0);
- gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig),
- site->config, tab);
+ gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig), site->config,
+ _gtk_check_label_new(site->city->name, !site->hidden,
+ G_CALLBACK(radar_site_toggle), site));
gtk_widget_show_all(site->config);
- gtk_widget_show_all(tab);
/* Set up radar loading */
site->time_id = g_signal_connect_swapped(site->viewer, "time-changed",
RadarSite *site = g_new0(RadarSite, 1);
site->viewer = g_object_ref(viewer);
site->prefs = g_object_ref(prefs);
- site->http = http;
+ //site->http = http;
+ site->http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
site->city = city;
site->pconfig = pconfig;
gis_viewer_remove(site->viewer, site->marker_ref);
if (site->location_id)
g_signal_handler_disconnect(site->viewer, site->location_id);
+ gis_http_free(site->http);
g_object_unref(site->viewer);
g_object_unref(site->prefs);
g_free(site);
GtkWidget *config;
time_t time;
const gchar *message;
- gchar *nearest;
+ GStaticMutex loading;
+ gchar *path;
GisTile *tile[2];
gpointer *tile_ref[2];
- guchar *pixels[2];
guint time_id; // "time-changed" callback ID
guint refresh_id; // "refresh" callback ID
g_free(msg);
}
+/* Copy images to graphics memory */
+static void _conus_update_end_copy(GisTile *tile, guchar *pixels)
+{
+ if (!tile->data) {
+ tile->data = g_new0(guint, 1);
+ glGenTextures(1, tile->data);
+ }
+
+ 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);
+ 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);
+ glFlush();
+}
+
+/* Split the pixbuf into east and west halves (with 2K sides)
+ * Also map the pixbuf's alpha values */
+static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
+ gint width, gint height, gint pxsize)
+{
+ g_debug("GisPluginRadar: _conus_update_end_split");
+ guchar *out[] = {west,east};
+ const guchar alphamap[][4] = {
+ {0x04, 0xe9, 0xe7, 0x30},
+ {0x01, 0x9f, 0xf4, 0x60},
+ {0x03, 0x00, 0xf4, 0x90},
+ };
+ for (int y = 0; y < height; y++)
+ for (int x = 0; x < width; x++) {
+ gint subx = x % (width/2);
+ gint idx = x / (width/2);
+ guchar *src = &pixels[(y*width+x)*pxsize];
+ guchar *dst = &out[idx][(y*(width/2)+subx)*4];
+ if (src[0] > 0xe0 &&
+ src[1] > 0xe0 &&
+ src[2] > 0xe0) {
+ dst[3] = 0x00;
+ } else {
+ dst[0] = src[0];
+ dst[1] = src[1];
+ dst[2] = src[2];
+ dst[3] = 0xff;
+ for (int j = 0; j < G_N_ELEMENTS(alphamap); j++)
+ if (src[0] == alphamap[j][0] &&
+ src[1] == alphamap[j][1] &&
+ src[2] == alphamap[j][2])
+ dst[3] = alphamap[j][3];
+ }
+ }
+}
+
gboolean _conus_update_end(gpointer _conus)
{
RadarConus *conus = _conus;
g_debug("GisPluginRadar: _conus_update_end");
- for (int i = 0; i < 2; i++) {
- GisTile *tile = conus->tile[i];
- guchar *pixels = conus->pixels[i];
-
- if (!tile->data) {
- tile->data = g_new0(guint, 1);
- glGenTextures(1, tile->data);
- }
+ /* Check error status */
+ if (conus->message) {
+ g_warning("GisPluginRadar: _conus_update_end - %s", conus->message);
+ _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
+ goto out;
+ }
- 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);
- 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);
- glFlush();
-
- g_free(pixels);
+ /* Load and pixbuf */
+ GError *error = NULL;
+ GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->path, &error);
+ if (!pixbuf || error) {
+ g_warning("GisPluginRadar: _conus_update_end - error loading pixbuf");
+ _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf"));
+ g_remove(conus->path);
+ goto out;
}
- /* finish */
- _gtk_bin_set_child(GTK_BIN(conus->config),
- gtk_label_new(conus->nearest));
+ /* Split pixels into east/west parts */
+ guchar *pixels = gdk_pixbuf_get_pixels(pixbuf);
+ gint width = gdk_pixbuf_get_width(pixbuf);
+ gint height = gdk_pixbuf_get_height(pixbuf);
+ gint pxsize = gdk_pixbuf_get_has_alpha(pixbuf) ? 4 : 3;
+ guchar *pixels_west = g_malloc(4*(width/2)*height);
+ guchar *pixels_east = g_malloc(4*(width/2)*height);
+ _conus_update_end_split(pixels, pixels_west, pixels_east,
+ width, height, pxsize);
+ g_object_unref(pixbuf);
+
+ /* Copy pixels to graphics memory */
+ _conus_update_end_copy(conus->tile[0], pixels_west);
+ _conus_update_end_copy(conus->tile[1], pixels_east);
+ g_free(pixels_west);
+ g_free(pixels_east);
+
+ /* Update GUI */
+ gchar *label = g_path_get_basename(conus->path);
+ _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(label));
gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
- g_free(conus->nearest);
+ g_free(label);
+out:
+ g_free(conus->path);
+ g_static_mutex_unlock(&conus->loading);
return FALSE;
}
gpointer _conus_update_thread(gpointer _conus)
{
RadarConus *conus = _conus;
+ conus->message = NULL;
/* Find nearest */
g_debug("GisPluginRadar: _conus_update_thread - nearest");
GList *files = gis_http_available(conus->http,
"^Conus_[^\"]*_N0Ronly.gif$", "",
NULL, (offline ? NULL : conus_url));
- conus->nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M");
+ 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 (!conus->nearest) {
+ if (!nearest) {
conus->message = "No suitable files";
goto out;
}
/* Fetch the image */
g_debug("GisPluginRadar: _conus_update_thread - fetch");
- gchar *uri = g_strconcat(conus_url, conus->nearest, NULL);
- gchar *path = gis_http_fetch(conus->http, uri, conus->nearest, GIS_ONCE,
+ gchar *uri = g_strconcat(conus_url, nearest, NULL);
+ conus->path = gis_http_fetch(conus->http, uri, nearest, GIS_ONCE,
_conus_update_loading, conus);
+ g_free(nearest);
g_free(uri);
- if (!path) {
+ if (!conus->path) {
conus->message = "Fetch failed";
goto out;
}
- /* Load and split the pixbuf into two 2K data segments */
- g_debug("GisPluginRadar: _conus_update_thread - load");
- GError *error = NULL;
- GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, &error);
- guchar *pixels = gdk_pixbuf_get_pixels(pixbuf);
- gint width = gdk_pixbuf_get_width(pixbuf);
- gint height = gdk_pixbuf_get_height(pixbuf);
- gint pxsize = gdk_pixbuf_get_has_alpha(pixbuf) ? 4 : 3;
- g_free(path);
-
- /* Split the pixbuf into east and west halves (with 2K sides)
- * Also map the pixbuf's alpha values */
- g_debug("GisPluginRadar: _conus_update_thread - split");
- conus->pixels[0] = g_malloc(4*(width/2)*height);
- conus->pixels[1] = g_malloc(4*(width/2)*height);
- const guchar alphamap[][4] = {
- {0x04, 0xe9, 0xe7, 0x30},
- {0x01, 0x9f, 0xf4, 0x60},
- {0x03, 0x00, 0xf4, 0x90},
- };
- for (int y = 0; y < height; y++)
- for (int x = 0; x < width; x++) {
- gint subx = x % (width/2);
- gint idx = x / (width/2);
- guchar *src = &pixels[(y*width+x)*pxsize];
- guchar *dst = &conus->pixels[idx][(y*(width/2)+subx)*4];
- if (src[0] > 0xe0 &&
- src[1] > 0xe0 &&
- src[2] > 0xe0) {
- dst[3] = 0x00;
- } else {
- dst[0] = src[0];
- dst[1] = src[1];
- dst[2] = src[2];
- dst[3] = 0xff;
- for (int j = 0; j < G_N_ELEMENTS(alphamap); j++)
- if (src[0] == alphamap[j][0] &&
- src[1] == alphamap[j][1] &&
- src[2] == alphamap[j][2])
- dst[3] = alphamap[j][3];
- }
- }
- g_object_unref(pixbuf);
-
out:
g_debug("GisPluginRadar: _conus_update_thread - done");
g_idle_add(_conus_update_end, conus);
void _conus_update(RadarConus *conus)
{
+ if (!g_static_mutex_trylock(&conus->loading))
+ return;
conus->time = gis_viewer_get_time(conus->viewer);
g_debug("GisPluginRadar: _conus_update - %d",
(gint)conus->time);
g_thread_create(_conus_update_thread, conus, FALSE, NULL);
}
+void radar_conus_toggle(RadarConus *conus)
+{
+ GIS_OBJECT(conus->tile[0])->hidden =
+ !GIS_OBJECT(conus->tile[0])->hidden;
+ GIS_OBJECT(conus->tile[1])->hidden =
+ !GIS_OBJECT(conus->tile[1])->hidden;
+ gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
+}
+
RadarConus *radar_conus_new(GtkWidget *pconfig,
GisViewer *viewer, GisHttp *http)
{
conus->viewer = g_object_ref(viewer);
conus->http = http;
conus->config = gtk_alignment_new(0, 0, 1, 1);
+ g_static_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->refresh_id = g_signal_connect_swapped(viewer, "refresh",
G_CALLBACK(_conus_update), conus);
- gtk_notebook_append_page(GTK_NOTEBOOK(pconfig), conus->config, gtk_label_new("Conus"));
+ gtk_notebook_append_page(GTK_NOTEBOOK(pconfig), conus->config,
+ _gtk_check_label_new("Conus", TRUE,
+ G_CALLBACK(radar_conus_toggle), conus));
_conus_update(conus);
return conus;
}
/******************
* GisPluginRadar *
******************/
-static void _draw_hud(GisCallback *callback, gpointer _self)
+static void _draw_hud(GisCallback *callback, GisOpenGL *opengl, gpointer _self)
{
- /* TODO */
- GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
- if (!self->colormap)
- return;
+ /* TODO, pick correct colormaps */
+ AWeatherColormap *colormap = &colormaps[0];
g_debug("GisPluginRadar: _draw_hud");
/* Print the color table */
glBegin(GL_QUADS);
int i;
for (i = 0; i < 256; i++) {
- glColor4ubv(self->colormap->data[i]);
+ glColor4ubv(colormap->data[i]);
glVertex3f(-1.0, (float)((i ) - 256/2)/(256/2), 0.0); // bot left
glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
self->sites = g_hash_table_new_full(g_str_hash, g_str_equal,
NULL, (GDestroyNotify)radar_site_free);
self->config = gtk_notebook_new();
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_TOP);
+ /* Need to position on the top because of Win32 bug */
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_BOTTOM);
}
static void gis_plugin_radar_dispose(GObject *gobject)
{
projects / aweather / blobdiff