Fix Level 2 Markers

[aweather] / src / plugins / radar.c

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index a79afb1c72fee1daec9a4d1605924d7d61e89633..c4e497d3f3ac32320c82b939b53f45fe52a141ce 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -120,8 +120,15 @@ gboolean _site_update_end(gpointer _site)
        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));
@@ -212,7 +219,7 @@ void _site_update(RadarSite *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 */
@@ -283,16 +290,6 @@ void _site_on_location_changed(GritsViewer *viewer,
                radar_site_unload(site);
 }
 
-gboolean _site_add_marker(gpointer _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_viewer_add(site->viewer, GRITS_OBJECT(site->marker),
-                       GRITS_LEVEL_OVERLAY, FALSE);
-       return FALSE;
-}
 RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
                GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http)
 {
@@ -313,7 +310,11 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
        _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);
 
        /* Connect signals */
        site->location_id  = g_signal_connect(viewer, "location-changed",
@@ -349,7 +350,7 @@ struct _RadarConus {
        GtkWidget   *config;
        time_t       time;
        const gchar *message;
-       GStaticMutex loading;
+       GMutex       loading;
 
        gchar       *path;
        GritsTile   *tile[2];
@@ -393,10 +394,10 @@ static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
        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);
 }
@@ -484,7 +485,7 @@ gboolean _conus_update_end(gpointer _conus)
 
 out:
        g_free(conus->path);
-       g_static_mutex_unlock(&conus->loading);
+       g_mutex_unlock(&conus->loading);
        return FALSE;
 }
 
@@ -542,7 +543,7 @@ out:
 
 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",
@@ -553,7 +554,7 @@ void _conus_update(RadarConus *conus)
        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,
@@ -563,7 +564,7 @@ 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;
@@ -778,9 +779,13 @@ static void grits_plugin_radar_dispose(GObject *gobject)
 {
        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);
 }