/*
- * Copyright (C) 2009-201
0 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2009-201
2 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 <gtk/gtkgl.h>
#include <gio/gio.h>
-#include <GL/gl.h>
#include <math.h>
#include <rsl.h>
#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;
-}
+#include "compat.h"
-void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
+static void aweather_bin_set_child(GtkBin *bin, GtkWidget *new)
{
GtkWidget *old = gtk_bin_get_child(bin);
if (old)
}
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;
/* Information */
city_t *city;
GritsMarker *marker; // Map marker for grits
- gpointer *marker_ref; // Reference to maker
/* Stuff from the parents */
GritsViewer *viewer;
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
guint time_id; // "time-changed" callback ID
guint refresh_id; // "refresh" callback ID
guint location_id; // "locaiton-changed" callback ID
+ guint idle_source; // _site_update_end idle source
};
/* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
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_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ GtkWidget *msg = gtk_label_new(site->message);
+ GtkWidget *btn = gtk_link_button_new_with_label(uri, "View Radar Status");
+ gtk_box_set_homogeneous(GTK_BOX(box), TRUE);
+ gtk_box_pack_start(GTK_BOX(box), msg, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(box), btn, TRUE, TRUE, 0);
+ aweather_bin_set_child(GTK_BIN(site->config), box);
+ g_free(uri);
} else {
- _gtk_bin_set_child(GTK_BIN(site->config),
+ aweather_bin_set_child(GTK_BIN(site->config),
aweather_level2_get_config(site->level2));
}
site->status = STATUS_LOADED;
+ site->idle_source = 0;
return FALSE;
}
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");
+ gchar *nearest = _find_nearest(site->time, files, 5);
g_list_foreach(files, (GFunc)g_free, NULL);
g_list_free(files);
if (!nearest) {
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+3, TRUE);
out:
- g_idle_add(_site_update_end, site);
+ if (!site->idle_source)
+ site->idle_source = g_idle_add(_site_update_end, site);
return NULL;
}
void _site_update(RadarSite *site)
/* Add a progress bar */
GtkWidget *progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
- _gtk_bin_set_child(GTK_BIN(site->config), progress);
+ aweather_bin_set_child(GTK_BIN(site->config), progress);
/* 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, 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 */
g_signal_handler_disconnect(site->viewer, site->time_id);
if (site->refresh_id)
g_signal_handler_disconnect(site->viewer, site->refresh_id);
+ if (site->idle_source)
+ g_source_remove(site->idle_source);
+ site->idle_source = 0;
/* Remove tab */
if (site->config)
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, GRITS_OBJECT(site->level2));
+ site->level2 = NULL;
}
site->status = STATUS_UNLOADED;
}
-void radar_site_toggle(RadarSite *site)
-{
- site->hidden = !site->hidden;
- if (site->level2) {
- GRITS_OBJECT(site->level2)->hidden = site->hidden;
- gtk_widget_queue_draw(GTK_WIDGET(site->viewer));
- }
-}
-
void radar_site_load(RadarSite *site)
{
g_debug("RadarSite: load %s", site->city->code);
/* Add tab page */
site->config = gtk_alignment_new(0, 0, 1, 1);
+ g_object_set_data(G_OBJECT(site->config), "site", site);
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_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)
+static gboolean on_marker_clicked(GritsObject *marker, GdkEvent *event, 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;
- site->marker_ref = grits_viewer_add(site->viewer,
- GRITS_OBJECT(site->marker), GRITS_LEVEL_OVERLAY, FALSE);
- return FALSE;
+ GritsViewer *viewer = site->viewer;
+ GritsPoint center = marker->center;
+ grits_viewer_set_location(viewer, center.lat, center.lon, EARTH_R/35);
+ grits_viewer_set_rotation(viewer, 0, 0, 0);
+ /* Recursivly set notebook tabs */
+ GtkWidget *widget, *parent;
+ for (widget = site->config; widget; widget = parent) {
+ parent = gtk_widget_get_parent(widget);
+ if (GTK_IS_NOTEBOOK(parent)) {
+ gint i = gtk_notebook_page_num(GTK_NOTEBOOK(parent), widget);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(parent), i);
+ }
+ }
+ return TRUE;
}
+
RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http)
{
"level2" G_DIR_SEPARATOR_S);
site->city = city;
site->pconfig = pconfig;
+ site->hidden = TRUE;
+
+ /* 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);
+ 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);
+ g_signal_connect(site->marker, "clicked",
+ G_CALLBACK(on_marker_clicked), site);
+ grits_object_set_cursor(GRITS_OBJECT(site->marker), GDK_HAND2);
/* 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_ref);
+ 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);
GtkWidget *config;
time_t time;
const gchar *message;
- GStaticMutex loading;
+ GMutex loading;
gchar *path;
GritsTile *tile[2];
- gpointer *tile_ref[2];
guint time_id; // "time-changed" callback ID
guint refresh_id; // "refresh" callback ID
+ guint idle_source; // _conus_update_end idle source
};
void _conus_update_loading(gchar *file, goffset cur,
/* Copy images to graphics memory */
static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
{
- if (!tile->data) {
- tile->data = g_new0(guint, 1);
- glGenTextures(1, tile->data);
- }
+ if (!tile->tex)
+ glGenTextures(1, &tile->tex);
- guint *tex = tile->data;
- glBindTexture(GL_TEXTURE_2D, *tex);
+ gchar *clear = g_malloc0(2048*2048*4);
+ glBindTexture(GL_TEXTURE_2D, tile->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] &&
/* Check error status */
if (conus->message) {
g_warning("Conus: update_end - %s", conus->message);
- _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
+ aweather_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
goto out;
}
GError *error = NULL;
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->path, &error);
if (!pixbuf || error) {
- g_warning("Conus: update_end - error loading pixbuf");
- _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf"));
+ g_warning("Conus: update_end - error loading pixbuf: %s", conus->path);
+ aweather_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf"));
g_remove(conus->path);
goto out;
}
/* 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));
+ aweather_bin_set_child(GTK_BIN(conus->config), gtk_label_new(label));
+ grits_viewer_queue_draw(conus->viewer);
g_free(label);
out:
+ conus->idle_source = 0;
g_free(conus->path);
- g_static_mutex_unlock(&conus->loading);
+ g_mutex_unlock(&conus->loading);
return FALSE;
}
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 */
+ /* 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);
+ } else {
+ GList *files = grits_http_available(conus->http,
+ "^Conus_[^\"]*_N0Ronly.gif$", "", NULL, NULL);
+ nearest = _find_nearest(conus->time, files, 6);
+ 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);
out:
g_debug("Conus: update_thread - done");
- g_idle_add(_conus_update_end, conus);
+ if (!conus->idle_source)
+ conus->idle_source = g_idle_add(_conus_update_end, conus);
return NULL;
}
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",
/* Add a progress bar */
GtkWidget *progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "Loading...");
- _gtk_bin_set_child(GTK_BIN(conus->config), progress);
+ aweather_bin_set_child(GTK_BIN(conus->config), progress);
- g_thread_create(_conus_update_thread, conus, FALSE, NULL);
-}
-
-void radar_conus_toggle(RadarConus *conus)
-{
- GRITS_OBJECT(conus->tile[0])->hidden =
- !GRITS_OBJECT(conus->tile[0])->hidden;
- GRITS_OBJECT(conus->tile[1])->hidden =
- !GRITS_OBJECT(conus->tile[1])->hidden;
- gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
+ 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;
- 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+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);
conus->refresh_id = g_signal_connect_swapped(viewer, "refresh",
G_CALLBACK(_conus_update), conus);
+ g_object_set_data(G_OBJECT(conus->config), "conus", conus);
gtk_notebook_append_page(GTK_NOTEBOOK(pconfig), conus->config,
- _gtk_check_label_new("Conus", TRUE,
- G_CALLBACK(radar_conus_toggle), conus));
+ gtk_label_new("Conus"));
+
_conus_update(conus);
return conus;
}
{
g_signal_handler_disconnect(conus->viewer, conus->time_id);
g_signal_handler_disconnect(conus->viewer, conus->refresh_id);
+ if (conus->idle_source)
+ g_source_remove(conus->idle_source);
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, GRITS_OBJECT(tile));
+ g_object_unref(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);
- 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,
+ gpointer _, guint page_num, gpointer viewer)
+{
+ g_debug("GritsPluginRadar: _update_hidden - 0..%d = %d",
+ gtk_notebook_get_n_pages(notebook), page_num);
+
+ for (gint i = 0; i < gtk_notebook_get_n_pages(notebook); i++) {
+ gboolean is_hidden = (i != page_num);
+ GtkWidget *config = gtk_notebook_get_nth_page(notebook, i);
+ RadarConus *conus = g_object_get_data(G_OBJECT(config), "conus");
+ RadarSite *site = g_object_get_data(G_OBJECT(config), "site");
+
+ /* Conus */
+ if (conus) {
+ 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_hide(GRITS_OBJECT(site->level2), is_hidden);
+ } else {
+ g_warning("GritsPluginRadar: _update_hidden - no site or counus found");
+ }
+ }
+ grits_viewer_queue_draw(viewer);
}
/* Methods */
/* TODO: move to constructor if possible */
g_debug("GritsPluginRadar: new");
GritsPluginRadar *self = g_object_new(GRITS_TYPE_PLUGIN_RADAR, NULL);
- self->viewer = viewer;
- self->prefs = prefs;
+ self->viewer = g_object_ref(viewer);
+ self->prefs = g_object_ref(prefs);
+
+ /* Setup page switching */
+ 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);
"conus" G_DIR_SEPARATOR_S);
self->sites = g_hash_table_new_full(g_str_hash, g_str_equal,
NULL, (GDestroyNotify)radar_site_free);
- self->config = gtk_notebook_new();
+ self->config = g_object_ref(gtk_notebook_new());
/* Load colormaps */
for (int i = 0; colormaps[i].file; i++) {
}
/* 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);
- 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);
+ g_hash_table_destroy(self->sites);
+ g_object_unref(self->config);
+ g_object_unref(self->hud);
+ g_object_unref(self->prefs);
+ g_object_unref(viewer);
+ }
/* Drop references */
G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);
}
/* Free data */
grits_http_free(self->conus_http);
grits_http_free(self->sites_http);
- g_hash_table_destroy(self->sites);
gtk_widget_destroy(self->config);
G_OBJECT_CLASS(grits_plugin_radar_parent_class)->finalize(gobject);
projects / aweather / blobdiff