X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugin-ridge.c;h=388ee7405c73ba6d32b27267611d9858a249fe63;hp=77bffe93a488a0c54876a02e610f00efadd656f7;hb=5ffc3c31ece77d1debfc619a1e5817b7398209e8;hpb=472b8362101f7d2712a32a30af3c4fd7b5637aa4 diff --git a/src/plugin-ridge.c b/src/plugin-ridge.c index 77bffe9..388ee74 100644 --- a/src/plugin-ridge.c +++ b/src/plugin-ridge.c @@ -23,8 +23,57 @@ #include #include "aweather-gui.h" +#include "plugin-ridge.h" #include "data.h" +/**************** + * 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_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; +} + +/********************* + * Overlay constants * + *********************/ enum { LAYER_TOPO, LAYER_COUNTY, @@ -46,21 +95,22 @@ static layer_t layers[] = { [LAYER_TOPO] = {"Topo", "Overlays/Topo/Short/%s_Topo_Short.jpg", TRUE, 1, 0}, [LAYER_COUNTY] = {"Counties", "Overlays/County/Short/%s_County_Short.gif", TRUE, 3, 0}, [LAYER_RIVERS] = {"Rivers", "Overlays/Rivers/Short/%s_Rivers_Short.gif", FALSE, 4, 0}, - [LAYER_HIGHWAYS] = {"Highways", "Overlays/Highways/Short/%s_Highways_Short.gif", TRUE, 5, 0}, + [LAYER_HIGHWAYS] = {"Highways", "Overlays/Highways/Short/%s_Highways_Short.gif", FALSE, 5, 0}, [LAYER_CITY] = {"Cities", "Overlays/Cities/Short/%s_City_Short.gif", TRUE, 6, 0}, }; -static AWeatherGui *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, gpointer _layer) +void load_texture(AWeatherRidge *self, layer_t *layer, gchar *filename) { - layer_t *layer = _layer; - aweather_gui_gl_begin(gui); + aweather_gui_gl_begin(self->gui); /* Load image */ GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(filename, NULL); @@ -83,63 +133,67 @@ void load_texture(gchar *filename, gpointer _layer) 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(gui); + aweather_gui_gl_end(self->gui); g_object_unref(pixbuf); /* Redraw */ - gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing")); + aweather_gui_gl_redraw(self->gui); } -static void set_site(AWeatherView *view, gchar *site, gpointer user_data) + +/***************** + * ASync helpers * + *****************/ +typedef struct { + AWeatherRidge *self; + layer_t *layer; +} cached_t; +void cached_cb(gchar *filename, gboolean updated, gpointer _udata) { - g_message("location changed to %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, load_texture, &layers[i]); - g_free(path); - } + cached_t *udata = _udata; + load_texture(udata->self, udata->layer, filename); + g_free(udata); } -static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data) +/************* + * callbacks * + *************/ +static void on_site_changed(AWeatherView *view, gchar *site, AWeatherRidge *self) { - g_message("ridge:expose"); - glPushMatrix(); - glEnable(GL_TEXTURE_2D); - glColor4f(1,1,1,1); - + g_debug("AWeatherRidge: on_site_changed - site=%s", site); for (int i = 0; i < LAYER_COUNT; i++) { - if (!layers[i].enabled) - continue; - glBindTexture(GL_TEXTURE_2D, layers[i].tex); - glBegin(GL_POLYGON); - glTexCoord2f(0.0, 0.0); glVertex3f(250*1000*-1.0, 250*1000* 1.0, layers[i].z); - glTexCoord2f(0.0, 1.0); glVertex3f(250*1000*-1.0, 250*1000*-1.0, layers[i].z); - glTexCoord2f(1.0, 1.0); glVertex3f(250*1000* 1.0, 250*1000*-1.0, layers[i].z); - glTexCoord2f(1.0, 0.0); glVertex3f(250*1000* 1.0, 250*1000* 1.0, layers[i].z); - glEnd(); + gchar *base = "http://radar.weather.gov/ridge/"; + gchar *path = g_strdup_printf(layers[i].fmt, site); + 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); } - - glPopMatrix(); - return FALSE; } -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); - gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing")); + aweather_gui_gl_redraw(gui); } -gboolean ridge_init(AWeatherGui *_gui) +/*********** + * Methods * + ***********/ +AWeatherRidge *aweather_ridge_new(AWeatherGui *gui) { - gui = _gui; + AWeatherRidge *ridge = g_object_new(AWEATHER_TYPE_RIDGE, NULL); + ridge->gui = gui; + AWeatherView *view = aweather_gui_get_view(gui); GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing"); GtkWidget *config = aweather_gui_get_widget(gui, "tabs"); @@ -152,14 +206,37 @@ gboolean ridge_init(AWeatherGui *_gui) 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); - /* Set up OpenGL Stuff */ - g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL); - g_signal_connect(view, "location-changed", G_CALLBACK(set_site), NULL); + g_signal_connect(view, "site-changed", G_CALLBACK(on_site_changed), ridge); + + return ridge; +} + +static void aweather_ridge_expose(AWeatherPlugin *_ridge) +{ + AWeatherRidge *ridge = AWEATHER_RIDGE(_ridge); + + g_debug("AWeatherRidge: expose"); + glPushMatrix(); + glEnable(GL_TEXTURE_2D); + glColor4f(1,1,1,1); - return TRUE; + for (int i = 0; i < LAYER_COUNT; i++) { + if (!layers[i].enabled) + continue; + glBindTexture(GL_TEXTURE_2D, layers[i].tex); + glBegin(GL_POLYGON); + glTexCoord2f(0.0, 0.0); glVertex3f(240*1000*-1.0, 282*1000* 1.0, layers[i].z); + glTexCoord2f(0.0, 1.0); glVertex3f(240*1000*-1.0, 282*1000*-1.0, layers[i].z); + glTexCoord2f(1.0, 1.0); glVertex3f(240*1000* 1.0, 282*1000*-1.0, layers[i].z); + glTexCoord2f(1.0, 0.0); glVertex3f(240*1000* 1.0, 282*1000* 1.0, layers[i].z); + glEnd(); + } + + glPopMatrix(); }