X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Faweather-gui.c;h=2e05fc46f048dc31639089edf3f9cf1f44eb88be;hb=0d95586b8b8307f30669083a79fe9d4d63e9a75a;hp=18cc7c87587c7e10a40efd931b9b158e29de60ba;hpb=c6f151670c6e57cabc7aaa500d55cc10a051b139;p=aweather diff --git a/src/aweather-gui.c b/src/aweather-gui.c index 18cc7c8..2e05fc4 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andy Spencer + * Copyright (C) 2009-2010 Andy Spencer * * 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 @@ -20,7 +20,7 @@ #include #include -#include +#include #include "aweather-gui.h" #include "aweather-location.h" @@ -36,7 +36,7 @@ gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *se if (event->keyval == GDK_q) gtk_widget_destroy(GTK_WIDGET(self)); else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK) - gis_world_refresh(self->world); + gis_viewer_refresh(self->viewer); else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) { GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "main_tabs")); gint num_tabs = gtk_notebook_get_n_pages(tabs); @@ -56,17 +56,17 @@ void on_quit(GtkMenuItem *menu, AWeatherGui *self) void on_zoomin(GtkAction *action, AWeatherGui *self) { - gis_view_zoom(self->view, 3./4); + gis_viewer_zoom(self->viewer, 3./4); } void on_zoomout(GtkAction *action, AWeatherGui *self) { - gis_view_zoom(self->view, 4./3); + gis_viewer_zoom(self->viewer, 4./3); } void on_refresh(GtkAction *action, AWeatherGui *self) { - gis_world_refresh(self->world); + gis_viewer_refresh(self->viewer); } void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self) @@ -84,7 +84,6 @@ void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui aweather_gui_attach_plugin(self, name); else aweather_gui_deattach_plugin(self, name); - gis_prefs_set_boolean_v(self->prefs, name, "enabled", state); g_free(name); } @@ -96,7 +95,7 @@ void on_time_changed(GtkTreeView *view, GtkTreePath *path, GtkTreeModel *model = gtk_tree_view_get_model(view); gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get(model, &iter, 0, &time, -1); - gis_view_set_time(self->view, time); + gis_viewer_set_time(self->viewer, time); g_free(time); } @@ -107,7 +106,14 @@ void on_site_changed(GtkComboBox *combo, AWeatherGui *self) GtkTreeModel *model = gtk_combo_box_get_model(combo); gtk_combo_box_get_active_iter(combo, &iter); gtk_tree_model_get(model, &iter, 1, &site, -1); - gis_view_set_site(self->view, site); + city_t *city; + for (city = cities; city->type; city++) + if (city->code && g_str_equal(city->code, site)) { + gis_viewer_set_location(self->viewer, + city->lat, city->lon, EARTH_R/20); + gis_viewer_set_rotation(self->viewer, 0, 0, 0); + break; + } g_free(site); } @@ -134,7 +140,7 @@ static gboolean gtk_tree_model_find_string(GtkTreeModel *model, return FALSE; } -static void update_time_widget(GisView *view, const char *time, AWeatherGui *self) +static void update_time_widget(GisViewer *viewer, const char *time, AWeatherGui *self) { g_debug("AWeatherGui: update_time_widget - time=%s", time); GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time")); @@ -151,7 +157,7 @@ static void update_time_widget(GisView *view, const char *time, AWeatherGui *sel } } -static void update_site_widget(GisView *view, char *site, AWeatherGui *self) +static void update_site_widget(GisViewer *viewer, char *site, AWeatherGui *self) { g_debug("AWeatherGui: update_site_widget - site=%s", site); GtkComboBox *combo = GTK_COMBO_BOX(aweather_gui_get_widget(self, "main_site")); @@ -171,8 +177,7 @@ void on_offline(GtkToggleAction *action, AWeatherGui *self) { gboolean value = gtk_toggle_action_get_active(action); g_debug("AWeatherGui: on_offline - offline=%d", value); - gis_prefs_set_boolean(self->prefs, "gis/offline", value); - gis_world_set_offline(self->world, value); + gis_viewer_set_offline(self->viewer, value); } void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self) @@ -232,6 +237,7 @@ static void prefs_setup(AWeatherGui *self) "Plugin", rend1, "text", 0, NULL); GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes( "Enabled", rend2, "active", 1, NULL); + g_object_set(rend2, "xalign", 0, NULL); gtk_tree_view_append_column(tview, col1); gtk_tree_view_append_column(tview, col2); g_signal_connect(rend2, "toggled", G_CALLBACK(on_plugin_toggled), self); @@ -252,11 +258,11 @@ static void site_setup(AWeatherGui *self) for (int i = 0; cities[i].label; i++) { if (cities[i].type == LOCATION_STATE) { gtk_tree_store_append(store, &state, NULL); - gtk_tree_store_set (store, &state, 0, cities[i].label, + gtk_tree_store_set (store, &state, 0, cities[i].label, 1, cities[i].code, -1); } else { gtk_tree_store_append(store, &city, &state); - gtk_tree_store_set (store, &city, 0, cities[i].label, + gtk_tree_store_set (store, &city, 0, cities[i].label, 1, cities[i].code, -1); } } @@ -265,9 +271,6 @@ static void site_setup(AWeatherGui *self) GObject *renderer = aweather_gui_get_object(self, "main_site_rend"); gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL); - - g_signal_connect(self->view, "site-changed", - G_CALLBACK(update_site_widget), self); } static void time_setup(AWeatherGui *self) @@ -280,7 +283,7 @@ static void time_setup(AWeatherGui *self) gtk_tree_view_append_column(tview, col); g_object_set(rend, "size-points", 8.0, NULL); - g_signal_connect(self->view, "time-changed", + g_signal_connect(self->viewer, "time-changed", G_CALLBACK(update_time_widget), self); } @@ -309,7 +312,7 @@ static void update_times_gtk(AWeatherGui *self, GList *times) } } - gis_view_set_time(self->view, last_time); + gis_viewer_set_time(self->viewer, last_time); g_regex_unref(regex); g_list_foreach(times, (GFunc)g_free, NULL); @@ -332,13 +335,13 @@ static void update_times_online_cb(char *path, gboolean updated, gpointer _self) update_times_gtk(_self, times); } -static void update_times(AWeatherGui *self, GisView *view, char *site) +static void update_times(AWeatherGui *self, GisViewer *viewer, char *site) { g_debug("AWeatherGui: update_times - site=%s", site); - if (gis_world_get_offline(self->world)) { + if (gis_viewer_get_offline(self->viewer)) { GList *times = NULL; gchar *path = g_build_filename(g_get_user_cache_dir(), - "libgis", "nexrd2", "raw", site, NULL); + "libgis", "nexrad", "level2", site, NULL); GDir *dir = g_dir_open(path, 0, NULL); if (dir) { const gchar *name; @@ -350,23 +353,54 @@ static void update_times(AWeatherGui *self, GisView *view, char *site) g_free(path); update_times_gtk(self, times); } else { - gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site); - char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); - cache_file(base, path, GIS_REFRESH, NULL, update_times_online_cb, self); + GisHttp *http = gis_http_new("/nexrad/level2/"); + gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); + gchar *local = g_strdup_printf("%s/dir.list", site); + gchar *uri = g_strconcat(base, "/", local, NULL); + gchar *path = gis_http_fetch(http, uri, local, GIS_REFRESH, NULL, NULL); + update_times_online_cb(path, TRUE, self); + gis_http_free(http); /* update_times_gtk from update_times_online_cb */ } } -static void on_gis_site_changed(GisView *view, char *site, gpointer _self) +/* FIXME: This is redundent with the radar plugin + * Make a shared wsr88d file? */ +static void on_gis_location_changed(GisViewer *viewer, + gdouble lat, gdouble lon, gdouble elev, + gpointer _self) { AWeatherGui *self = AWEATHER_GUI(_self); - g_debug("AWeatherGui: on_site_changed - Loading wsr88d list for %s", site); - update_times(self, view, site); + gdouble min_dist = EARTH_R / 5; + city_t *city, *min_city = NULL; + for (city = cities; city->type; city++) { + if (city->type != LOCATION_CITY) + continue; + gdouble city_loc[3] = {}; + gdouble eye_loc[3] = {lat, lon, elev}; + lle2xyz(city->lat, city->lon, city->elev, + &city_loc[0], &city_loc[1], &city_loc[2]); + lle2xyz(lat, lon, elev, + &eye_loc[0], &eye_loc[1], &eye_loc[2]); + gdouble dist = distd(city_loc, eye_loc); + if (dist < min_dist) { + min_dist = dist; + min_city = city; + } + } + static city_t *last_city = NULL; + if (min_city && min_city != last_city) { + update_site_widget(self->viewer, min_city->code, self); + update_times(self, viewer, min_city->code); + } + last_city = min_city; } -static void on_gis_refresh(GisWorld *world, gpointer _self) +static void on_gis_refresh(GisViewer *viewer, gpointer _self) { AWeatherGui *self = AWEATHER_GUI(_self); - char *site = gis_view_get_site(self->view); - update_times(self, self->view, site); + gdouble lat, lon, elev; + gis_viewer_get_location(self->viewer, &lat, &lon, &elev); + /* Hack to update times */ + on_gis_location_changed(self->viewer, lat, lon, elev, self); } @@ -378,20 +412,10 @@ AWeatherGui *aweather_gui_new() g_debug("AWeatherGui: new"); return g_object_new(AWEATHER_TYPE_GUI, NULL); } -GisWorld *aweather_gui_get_world(AWeatherGui *self) +GisViewer *aweather_gui_get_viewer(AWeatherGui *self) { g_assert(AWEATHER_IS_GUI(self)); - return self->world; -} -GisView *aweather_gui_get_view(AWeatherGui *self) -{ - g_assert(AWEATHER_IS_GUI(self)); - return self->view; -} -GisOpenGL *aweather_gui_get_opengl(AWeatherGui *self) -{ - g_assert(AWEATHER_IS_GUI(self)); - return self->opengl; + return self->viewer; } GtkBuilder *aweather_gui_get_builder(AWeatherGui *self) { @@ -416,8 +440,8 @@ GObject *aweather_gui_get_object(AWeatherGui *self, const gchar *name) } void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name) { - GisPlugin *plugin = gis_plugins_load(self->plugins, name, - self->world, self->view, self->opengl, self->prefs); + GisPlugin *plugin = gis_plugins_enable(self->plugins, name, + self->viewer, self->prefs); GtkWidget *body = gis_plugin_get_config(plugin); if (body) { GtkWidget *config = aweather_gui_get_widget(self, "main_tabs"); @@ -425,7 +449,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name) gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab); gtk_widget_show_all(config); } - gis_opengl_redraw(self->opengl); + gtk_widget_queue_draw(GTK_WIDGET(self->viewer)); } void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name) { @@ -441,8 +465,8 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name) if (tab_name && g_str_equal(name, tab_name)) gtk_notebook_remove_page(GTK_NOTEBOOK(config), i); } - gis_plugins_unload(self->plugins, name); - gis_opengl_redraw(self->opengl); + gis_plugins_disable(self->plugins, name); + gtk_widget_queue_draw(GTK_WIDGET(self->viewer)); } @@ -458,10 +482,8 @@ static void aweather_gui_init(AWeatherGui *self) gchar *config = g_build_filename(g_get_user_config_dir(), PACKAGE, "config.ini", NULL); gchar *defaults = g_build_filename(PKGDATADIR, "defaults.ini", NULL); self->prefs = gis_prefs_new(config, defaults); - self->plugins = gis_plugins_new(PLUGINSDIR); - self->world = gis_world_new(); - self->view = gis_view_new(); - self->opengl = gis_opengl_new(self->world, self->view, self->plugins); + self->plugins = gis_plugins_new(PLUGINSDIR, self->prefs); + self->viewer = gis_opengl_new(self->plugins, self->prefs); g_free(config); g_free(defaults); @@ -473,7 +495,8 @@ static void aweather_gui_init(AWeatherGui *self) gtk_widget_reparent(aweather_gui_get_widget(self, "main_body"), GTK_WIDGET(self)); GtkWidget *paned = aweather_gui_get_widget(self, "main_paned"); gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(paned))); - gtk_paned_pack1(GTK_PANED(paned), GTK_WIDGET(self->opengl), TRUE, FALSE); + gtk_paned_pack1(GTK_PANED(paned), GTK_WIDGET(self->viewer), TRUE, FALSE); + gtk_widget_show_all(GTK_WIDGET(self)); /* Plugins */ GtkTreeIter iter; @@ -481,7 +504,7 @@ static void aweather_gui_init(AWeatherGui *self) for (GList *cur = gis_plugins_available(self->plugins); cur; cur = cur->next) { gchar *name = cur->data; GError *error = NULL; - gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled", &error); + gboolean enabled = gis_prefs_get_boolean_v(self->prefs, "plugins", cur->data, &error); if (error && error->code == G_KEY_FILE_ERROR_GROUP_NOT_FOUND) enabled = TRUE; gtk_list_store_append(self->gtk_plugins, &iter); @@ -499,13 +522,15 @@ static void aweather_gui_init(AWeatherGui *self) gtk_builder_connect_signals(self->builder, self); g_signal_connect(self, "key-press-event", G_CALLBACK(on_gui_key_press), self); - g_signal_connect_swapped(self->world, "offline", + g_signal_connect_swapped(self->viewer, "offline", G_CALLBACK(gtk_toggle_action_set_active), aweather_gui_get_object(self, "offline")); /* deprecated site stuff */ - g_signal_connect(self->view, "site-changed", G_CALLBACK(on_gis_site_changed), self); - g_signal_connect(self->world, "refresh", G_CALLBACK(on_gis_refresh), self); + g_signal_connect(self->viewer, "location-changed", + G_CALLBACK(on_gis_location_changed), self); + g_signal_connect(self->viewer, "refresh", + G_CALLBACK(on_gis_refresh), self); } static GObject *aweather_gui_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties) @@ -526,17 +551,9 @@ static void aweather_gui_dispose(GObject *_self) g_object_unref(self->builder); self->builder = NULL; } - if (self->world) { - g_object_unref(self->world); - self->world = NULL; - } - if (self->view) { - g_object_unref(self->view); - self->view = NULL; - } - if (self->opengl) { - g_object_unref(self->opengl); - self->opengl = NULL; + if (self->viewer) { + g_object_unref(self->viewer); + self->viewer = NULL; } if (self->plugins) { gis_plugins_free(self->plugins);