#include <math.h>
#include <rsl.h>
-#include <gis.h>
+#include <grits.h>
#include "radar.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;
+}
+
void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
{
GtkWidget *old = gtk_bin_get_child(bin);
static gchar *_find_nearest(time_t time, GList *files,
gsize offset, gchar *format)
{
- g_debug("GisPluginRadar: _find_nearest ...");
+ g_debug("RadarSite: find_nearest ...");
time_t nearest_time = 0;
char *nearest_file = NULL;
}
}
- g_debug("GisPluginRadar: _find_nearest = %s", nearest_file);
+ g_debug("RadarSite: find_nearest = %s", nearest_file);
if (nearest_file)
return g_strdup(nearest_file);
else
} RadarSiteStatus;
struct _RadarSite {
/* Information */
- city_t *city;
- GisMarker *marker; // Map marker for libgis
- gpointer *marker_ref; // Reference to maker
+ city_t *city;
+ GritsMarker *marker; // Map marker for grits
+ gpointer *marker_ref; // Reference to maker
/* Stuff from the parents */
- GisViewer *viewer;
- GisHttp *http;
- GisPrefs *prefs;
- GtkWidget *pconfig;
+ GritsViewer *viewer;
+ GritsHttp *http;
+ GritsPrefs *prefs;
+ GtkWidget *pconfig;
/* When loaded */
- RadarSiteStatus status; // Loading status for the site
+ gboolean hidden;
+ RadarSiteStatus status; // Loading status for the site
GtkWidget *config;
- AWeatherLevel2 *level2; // The Level2 structure for the current volume
- gpointer level2_ref; // GisViewer reference to the added radar
+ 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
- gchar *message; // Error message set while updating
- guint time_id; // "time-changed" callback ID
- guint refresh_id; // "refresh" callback ID
- guint location_id; // "locaiton-changed" callback ID
+ time_t time; // Current timestamp of the level2
+ gchar *message; // Error message set while updating
+ guint time_id; // "time-changed" callback ID
+ guint refresh_id; // "refresh" callback ID
+ guint location_id; // "locaiton-changed" callback ID
};
/* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
{
RadarSite *site = _site;
if (site->message) {
- g_warning("GisPluginRadar: _update_end - %s", site->message);
- _gtk_bin_set_child(GTK_BIN(site->config), gtk_label_new(site->message));
+ g_warning("RadarSite: update_end - %s", site->message);
+ _gtk_bin_set_child(GTK_BIN(site->config),
+ gtk_label_new(site->message));
} else {
_gtk_bin_set_child(GTK_BIN(site->config),
aweather_level2_get_config(site->level2));
gpointer _site_update_thread(gpointer _site)
{
RadarSite *site = _site;
- g_debug("GisPluginRadar: _update - %s", site->city->code);
- site->status = STATUS_LOADING;
+ g_debug("RadarSite: 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,
+ gboolean offline = grits_viewer_get_offline(site->viewer);
+ gchar *nexrad_url = grits_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("RadarSite: 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,
+ GList *files = grits_http_available(site->http,
"^K\\w{3}_\\d{8}_\\d{4}$", site->city->code,
"\\d+ (.*)", (offline ? NULL : dir_list));
g_free(dir_list);
}
/* Fetch new volume */
- g_debug("GisPluginRadar: _update - fetch");
+ g_debug("RadarSite: 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,
- offline ? GIS_LOCAL : GIS_UPDATE,
+ gchar *file = grits_http_fetch(site->http, uri, local,
+ offline ? GRITS_LOCAL : GRITS_UPDATE,
_site_update_loading, site);
g_free(nexrad_url);
g_free(nearest);
}
/* Load and add new volume */
- g_debug("GisPluginRadar: _update - load - %s", site->city->code);
+ g_debug("RadarSite: update_thread - load - %s", site->city->code);
site->level2 = aweather_level2_new_from_file(
- site->viewer, colormaps, file, site->city->code);
+ file, site->city->code, colormaps);
g_free(file);
if (!site->level2) {
site->message = "Load failed";
goto out;
}
- site->level2_ref = gis_viewer_add(site->viewer,
- GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
+ GRITS_OBJECT(site->level2)->hidden = site->hidden;
+ site->level2_ref = grits_viewer_add(site->viewer,
+ GRITS_OBJECT(site->level2), GRITS_LEVEL_WORLD, TRUE);
out:
g_idle_add(_site_update_end, site);
}
void _site_update(RadarSite *site)
{
- site->time = gis_viewer_get_time(site->viewer);
- g_debug("GisPluginRadar: _on_time_changed %s - %d",
+ if (site->status == STATUS_LOADING)
+ return;
+ site->status = STATUS_LOADING;
+
+ site->time = grits_viewer_get_time(site->viewer);
+ g_debug("RadarSite: 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("RadarSite: update - remove - %s", site->city->code);
+ if (site->level2_ref) {
+ grits_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);
if (site->status != STATUS_LOADED)
return; // Abort if it's still loading
- g_debug("GisPluginRadar: radar_site_unload %s", site->city->code);
+ g_debug("RadarSite: unload %s", site->city->code);
if (site->time_id)
g_signal_handler_disconnect(site->viewer, site->time_id);
/* Remove radar */
if (site->level2_ref) {
- gis_viewer_remove(site->viewer, site->level2_ref);
+ grits_viewer_remove(site->viewer, site->level2_ref);
site->level2_ref = 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("GisPluginRadar: radar_site_load %s", site->city->code);
- site->status = STATUS_LOADING;
+ g_debug("RadarSite: load %s", site->city->code);
/* 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",
_site_update(site);
}
-void _site_on_location_changed(GisViewer *viewer,
+void _site_on_location_changed(GritsViewer *viewer,
gdouble lat, gdouble lon, gdouble elev,
gpointer _site)
{
- static gdouble min_dist = EARTH_R / 20;
+ static gdouble min_dist = EARTH_R / 30;
RadarSite *site = _site;
/* Calculate distance, could cache xyz values */
gboolean _site_add_marker(gpointer _site)
{
RadarSite *site = _site;
- site->marker = gis_marker_new(site->city->name);
- GIS_OBJECT(site->marker)->center = site->city->pos;
- GIS_OBJECT(site->marker)->lod = EARTH_R*site->city->lod;
- site->marker_ref = gis_viewer_add(site->viewer,
- GIS_OBJECT(site->marker), GIS_LEVEL_OVERLAY, FALSE);
+ 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;
}
RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
- GisViewer *viewer, GisPrefs *prefs, GisHttp *http)
+ GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http)
{
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 = grits_http_new(G_DIR_SEPARATOR_S
+ "nexrad" G_DIR_SEPARATOR_S
+ "level2" G_DIR_SEPARATOR_S);
site->city = city;
site->pconfig = pconfig;
void radar_site_free(RadarSite *site)
{
radar_site_unload(site);
- gis_viewer_remove(site->viewer, site->marker_ref);
+ grits_viewer_remove(site->viewer, site->marker_ref);
if (site->location_id)
g_signal_handler_disconnect(site->viewer, site->location_id);
+ grits_http_free(site->http);
g_object_unref(site->viewer);
g_object_unref(site->prefs);
g_free(site);
#define CONUS_DEG_PER_PX 0.017971305190311
struct _RadarConus {
- GisViewer *viewer;
- GisHttp *http;
+ GritsViewer *viewer;
+ GritsHttp *http;
GtkWidget *config;
time_t time;
const gchar *message;
+ GStaticMutex loading;
gchar *path;
- GisTile *tile[2];
+ GritsTile *tile[2];
gpointer *tile_ref[2];
guint time_id; // "time-changed" callback ID
}
/* Copy images to graphics memory */
-static void _conus_update_end_copy(GisTile *tile, guchar *pixels)
+static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
{
if (!tile->data) {
tile->data = g_new0(guint, 1);
static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
gint width, gint height, gint pxsize)
{
- g_debug("GisPluginRadar: _conus_update_thread - split");
+ g_debug("Conus: update_end_split");
guchar *out[] = {west,east};
const guchar alphamap[][4] = {
{0x04, 0xe9, 0xe7, 0x30},
gboolean _conus_update_end(gpointer _conus)
{
RadarConus *conus = _conus;
- g_debug("GisPluginRadar: _conus_update_end");
+ g_debug("Conus: update_end");
/* Check error status */
if (conus->message) {
- g_warning("GisPluginRadar: _conus_update_end - %s", conus->message);
+ g_warning("Conus: update_end - %s", conus->message);
_gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
- return FALSE;
+ goto out;
}
/* Load and pixbuf */
GError *error = NULL;
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->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;
+ 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_remove(conus->path);
+ goto out;
+ }
/* 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,
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->path);
g_free(label);
+out:
+ g_free(conus->path);
+ g_static_mutex_unlock(&conus->loading);
return FALSE;
}
conus->message = NULL;
/* Find nearest */
- g_debug("GisPluginRadar: _conus_update_thread - nearest");
- gboolean offline = gis_viewer_get_offline(conus->viewer);
+ 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 = gis_http_available(conus->http,
+ 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");
}
/* Fetch the image */
- g_debug("GisPluginRadar: _conus_update_thread - fetch");
+ g_debug("Conus: update_thread - fetch");
gchar *uri = g_strconcat(conus_url, nearest, NULL);
- conus->path = gis_http_fetch(conus->http, uri, nearest, GIS_ONCE,
+ conus->path = grits_http_fetch(conus->http, uri, nearest, GRITS_ONCE,
_conus_update_loading, conus);
g_free(nearest);
g_free(uri);
}
out:
- g_debug("GisPluginRadar: _conus_update_thread - done");
+ g_debug("Conus: update_thread - done");
g_idle_add(_conus_update_end, conus);
return NULL;
}
void _conus_update(RadarConus *conus)
{
- conus->time = gis_viewer_get_time(conus->viewer);
- g_debug("GisPluginRadar: _conus_update - %d",
+ if (!g_static_mutex_trylock(&conus->loading))
+ return;
+ conus->time = grits_viewer_get_time(conus->viewer);
+ g_debug("Conus: update - %d",
(gint)conus->time);
/* Add a progress bar */
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));
+}
+
RadarConus *radar_conus_new(GtkWidget *pconfig,
- GisViewer *viewer, GisHttp *http)
+ GritsViewer *viewer, GritsHttp *http)
{
RadarConus *conus = g_new0(RadarConus, 1);
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;
gdouble mid = CONUS_WEST + CONUS_DEG_PER_PX*CONUS_WIDTH/2;
- conus->tile[0] = gis_tile_new(NULL, CONUS_NORTH, south, mid, CONUS_WEST);
- conus->tile[1] = gis_tile_new(NULL, CONUS_NORTH, south, east, mid);
+ conus->tile[0] = grits_tile_new(NULL, CONUS_NORTH, south, mid, CONUS_WEST);
+ 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] = gis_viewer_add(viewer,
- GIS_OBJECT(conus->tile[0]), GIS_LEVEL_WORLD, TRUE);
- conus->tile_ref[1] = gis_viewer_add(viewer,
- GIS_OBJECT(conus->tile[1]), GIS_LEVEL_WORLD, TRUE);
+ 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);
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);
- 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;
}
g_signal_handler_disconnect(conus->viewer, conus->refresh_id);
for (int i = 0; i < 2; i++) {
- GisTile *tile = conus->tile[i];
- gpointer ref = conus->tile_ref[i];
+ GritsTile *tile = conus->tile[i];
+ gpointer ref = conus->tile_ref[i];
if (tile->data) {
glDeleteTextures(1, tile->data);
g_free(tile->data);
}
- gis_viewer_remove(conus->viewer, ref);
+ grits_viewer_remove(conus->viewer, ref);
}
g_object_unref(conus->viewer);
}
-/******************
- * GisPluginRadar *
- ******************/
-static void _draw_hud(GisCallback *callback, gpointer _self)
+/********************
+ * GritsPluginRadar *
+ ********************/
+static void _draw_hud(GritsCallback *callback, GritsOpenGL *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");
+ g_debug("GritsPluginRadar: _draw_hud");
/* Print the color table */
glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
glMatrixMode(GL_PROJECTION); glLoadIdentity();
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
}
/* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
+GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs)
{
/* TODO: move to constructor if possible */
- g_debug("GisPluginRadar: new");
- GisPluginRadar *self = g_object_new(GIS_TYPE_PLUGIN_RADAR, NULL);
+ g_debug("GritsPluginRadar: new");
+ GritsPluginRadar *self = g_object_new(GRITS_TYPE_PLUGIN_RADAR, NULL);
self->viewer = viewer;
self->prefs = prefs;
/* Load HUD */
- GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
- self->hud_ref = gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE);
+ GritsCallback *hud_cb = grits_callback_new(_draw_hud, self);
+ self->hud_ref = grits_viewer_add(viewer, GRITS_OBJECT(hud_cb), GRITS_LEVEL_HUD, FALSE);
/* Load Conus */
self->conus = radar_conus_new(self->config, self->viewer, self->conus_http);
return self;
}
-static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self)
+static GtkWidget *grits_plugin_radar_get_config(GritsPlugin *_self)
{
- GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+ GritsPluginRadar *self = GRITS_PLUGIN_RADAR(_self);
return self->config;
}
/* GObject code */
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
- gis_plugin_radar_plugin_init));
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
+static void grits_plugin_radar_plugin_init(GritsPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GritsPluginRadar, grits_plugin_radar, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN,
+ grits_plugin_radar_plugin_init));
+static void grits_plugin_radar_plugin_init(GritsPluginInterface *iface)
{
- g_debug("GisPluginRadar: plugin_init");
+ g_debug("GritsPluginRadar: plugin_init");
/* Add methods to the interface */
- iface->get_config = gis_plugin_radar_get_config;
+ iface->get_config = grits_plugin_radar_get_config;
}
-static void gis_plugin_radar_init(GisPluginRadar *self)
+static void grits_plugin_radar_init(GritsPluginRadar *self)
{
- g_debug("GisPluginRadar: class_init");
+ g_debug("GritsPluginRadar: class_init");
/* Set defaults */
- self->sites_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
- self->conus_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "conus" G_DIR_SEPARATOR_S);
+ self->sites_http = grits_http_new(G_DIR_SEPARATOR_S
+ "nexrad" G_DIR_SEPARATOR_S
+ "level2" G_DIR_SEPARATOR_S);
+ self->conus_http = grits_http_new(G_DIR_SEPARATOR_S
+ "nexrad" G_DIR_SEPARATOR_S
+ "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();
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_LEFT);
+ /* 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)
+static void grits_plugin_radar_dispose(GObject *gobject)
{
- g_debug("GisPluginRadar: dispose");
- GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
- gis_viewer_remove(self->viewer, self->hud_ref);
+ g_debug("GritsPluginRadar: dispose");
+ GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
+ grits_viewer_remove(self->viewer, self->hud_ref);
radar_conus_free(self->conus);
/* Drop references */
- G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);
}
-static void gis_plugin_radar_finalize(GObject *gobject)
+static void grits_plugin_radar_finalize(GObject *gobject)
{
- g_debug("GisPluginRadar: finalize");
- GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+ g_debug("GritsPluginRadar: finalize");
+ GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
/* Free data */
- gis_http_free(self->conus_http);
- gis_http_free(self->sites_http);
+ 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(gis_plugin_radar_parent_class)->finalize(gobject);
+ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->finalize(gobject);
}
-static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+static void grits_plugin_radar_class_init(GritsPluginRadarClass *klass)
{
- g_debug("GisPluginRadar: class_init");
+ g_debug("GritsPluginRadar: class_init");
GObjectClass *gobject_class = (GObjectClass*)klass;
- gobject_class->dispose = gis_plugin_radar_dispose;
- gobject_class->finalize = gis_plugin_radar_finalize;
+ gobject_class->dispose = grits_plugin_radar_dispose;
+ gobject_class->finalize = grits_plugin_radar_finalize;
}