/****************
* GObject code *
****************/
+/* Plugin init */
static void aweather_ridge_plugin_init(AWeatherPluginInterface *iface);
static void aweather_ridge_expose(AWeatherPlugin *_ridge);
G_DEFINE_TYPE_WITH_CODE(AWeatherRidge, aweather_ridge, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE(AWEATHER_TYPE_PLUGIN,
aweather_ridge_plugin_init));
-static void aweather_ridge_class_init(AWeatherRidgeClass *klass)
-{
- GObjectClass *object_class = (GObjectClass*)klass;
-}
static void aweather_ridge_plugin_init(AWeatherPluginInterface *iface)
{
+ g_debug("AWeatherRidge: plugin_init");
/* Add methods to the interface */
iface->expose = aweather_ridge_expose;
}
+/* Class/Object init */
static void aweather_ridge_init(AWeatherRidge *ridge)
{
+ g_debug("AWeatherRidge: init");
/* Set defaults */
ridge->gui = NULL;
}
+static void aweather_ridge_dispose(GObject *gobject)
+{
+ g_debug("AWeatherRidge: dispose");
+ AWeatherRidge *self = AWEATHER_RIDGE(gobject);
+ /* Drop references */
+ G_OBJECT_CLASS(aweather_ridge_parent_class)->dispose(gobject);
+}
+static void aweather_ridge_finalize(GObject *gobject)
+{
+ g_debug("AWeatherRidge: finalize");
+ AWeatherRidge *self = AWEATHER_RIDGE(gobject);
+ /* Free data */
+ G_OBJECT_CLASS(aweather_ridge_parent_class)->finalize(gobject);
+}
+static void aweather_ridge_class_init(AWeatherRidgeClass *klass)
+{
+ g_debug("AWeatherRidge: class_init");
+ GObjectClass *gobject_class = (GObjectClass*)klass;
+ gobject_class->dispose = aweather_ridge_dispose;
+ gobject_class->finalize = aweather_ridge_finalize;
+}
-/***********
- * Helpers *
- ***********/
+/*********************
+ * Overlay constants *
+ *********************/
enum {
LAYER_TOPO,
LAYER_COUNTY,
[LAYER_CITY] = {"Cities", "Overlays/Cities/Short/%s_City_Short.gif", TRUE, 6, 0},
};
-/* TODO: Remove this */
-AWeatherGui *old_gui = NULL;
-/**
+/***********
+ * Helpers *
+ ***********/
+/*
* Load an image into an OpenGL texture
* \param filename Path to the image file
* \return The OpenGL identifier for the texture
*/
-void load_texture(gchar *filename, gboolean updated, gpointer _layer)
+void load_texture(AWeatherRidge *self, layer_t *layer, gchar *filename)
{
- layer_t *layer = _layer;
- aweather_gui_gl_begin(old_gui);
+ aweather_gui_gl_begin(self->gui);
/* Load image */
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
char *base = g_path_get_basename(filename);
- g_message("loaded image: w=%-3d h=%-3d fmt=%x px=(%02x,%02x,%02x,%02x) img=%s",
+ g_debug("AWeatherRidge: load_texture - "
+ "w=%-3d h=%-3d fmt=%x px=(%02x,%02x,%02x,%02x) img=%s",
width, height, format, pixels[0], pixels[1], pixels[2], pixels[3],
base);
g_free(base);
- aweather_gui_gl_end(old_gui);
+ aweather_gui_gl_end(self->gui);
g_object_unref(pixbuf);
/* Redraw */
- aweather_gui_gl_redraw(old_gui);
+ aweather_gui_gl_redraw(self->gui);
+}
+
+
+/*****************
+ * ASync helpers *
+ *****************/
+typedef struct {
+ AWeatherRidge *self;
+ layer_t *layer;
+} cached_t;
+void cached_cb(gchar *filename, gboolean updated, gpointer _udata)
+{
+ cached_t *udata = _udata;
+ load_texture(udata->self, udata->layer, filename);
+ g_free(udata);
}
-static void set_site(AWeatherView *view, gchar *site, AWeatherRidge *ridge)
+/*************
+ * callbacks *
+ *************/
+static void on_site_changed(AWeatherView *view, gchar *site, AWeatherRidge *self)
{
- g_message("site changed to %s", site);
+ g_debug("AWeatherRidge: on_site_changed - site=%s", site);
for (int i = 0; i < LAYER_COUNT; i++) {
gchar *base = "http://radar.weather.gov/ridge/";
gchar *path = g_strdup_printf(layers[i].fmt, site);
- cache_file(base, path, AWEATHER_NEVER, load_texture, &layers[i]);
+ cached_t *udata = g_malloc(sizeof(cached_t));
+ udata->self = self;
+ udata->layer = &layers[i];
+ cache_file(base, path, AWEATHER_ONCE, cached_cb, udata);
g_free(path);
}
}
-void toggle_layer(GtkToggleButton *check, gpointer _layer)
+void toggle_layer(GtkToggleButton *check, AWeatherGui *gui)
{
- layer_t *layer = _layer;
+ layer_t *layer = g_object_get_data(G_OBJECT(check), "layer");
layer->enabled = gtk_toggle_button_get_active(check);
- aweather_gui_gl_redraw(old_gui);
+ aweather_gui_gl_redraw(gui);
}
/***********
AWeatherRidge *aweather_ridge_new(AWeatherGui *gui)
{
AWeatherRidge *ridge = g_object_new(AWEATHER_TYPE_RIDGE, NULL);
- ridge->gui = old_gui = gui;
+ ridge->gui = gui;
AWeatherView *view = aweather_gui_get_view(gui);
GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
GtkWidget *check = gtk_check_button_new_with_label(layers[i].name);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), layers[i].enabled);
gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, TRUE, 0);
- g_signal_connect(check, "toggled", G_CALLBACK(toggle_layer), &layers[i]);
+ g_object_set_data(G_OBJECT(check), "layer", &layers[i]);
+ g_signal_connect(check, "toggled", G_CALLBACK(toggle_layer), gui);
}
gtk_container_add(GTK_CONTAINER(body), hbox);
gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
- g_signal_connect(view, "site-changed", G_CALLBACK(set_site), ridge);
+ g_signal_connect(view, "site-changed", G_CALLBACK(on_site_changed), ridge);
return ridge;
}
{
AWeatherRidge *ridge = AWEATHER_RIDGE(_ridge);
- g_message("ridge:expose");
+ g_debug("AWeatherRidge: expose");
glPushMatrix();
glEnable(GL_TEXTURE_2D);
glColor4f(1,1,1,1);
projects / grits / blobdiff