X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Faweather-gui.c;h=bd2adb1b6be6efe65649177b2f932033c318117b;hb=c45d5a6177fe71ff1028887a1fbb01152de96835;hp=0c3204d6e15bc40ae763e274ed39d01635e437ac;hpb=d01fb11de5bcf91224348bf41abb6788d0af2545;p=aweather diff --git a/src/aweather-gui.c b/src/aweather-gui.c index 0c3204d..bd2adb1 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 @@ -36,14 +36,14 @@ 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, "tabs")); + GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "main_tabs")); gint num_tabs = gtk_notebook_get_n_pages(tabs); gint cur_tab = gtk_notebook_get_current_page(tabs); if (event->state & GDK_SHIFT_MASK) gtk_notebook_set_current_page(tabs, (cur_tab-1)%num_tabs); - else + else gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs); }; return FALSE; @@ -56,22 +56,22 @@ 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) { - GtkWidget *tview = aweather_gui_get_widget(self, "plugins_view"); + GtkWidget *tview = aweather_gui_get_widget(self, "prefs_plugins_view"); GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tview)); gboolean state; gchar *name; @@ -96,7 +96,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 +107,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,10 +141,10 @@ 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, "time")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time")); GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview)); GtkTreeIter iter; if (gtk_tree_model_find_string(model, &iter, NULL, 0, time)) { @@ -151,10 +158,10 @@ 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, "site")); + GtkComboBox *combo = GTK_COMBO_BOX(aweather_gui_get_widget(self, "main_site")); GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(combo)); GtkTreeIter iter; if (gtk_tree_model_find_string(model, &iter, NULL, 1, site)) { @@ -172,7 +179,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) @@ -209,12 +216,12 @@ int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self) static void prefs_setup(AWeatherGui *self) { /* Set values */ - gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url"); - gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level"); - gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site"); - GtkWidget *nuw = aweather_gui_get_widget(self, "nexrad_url"); - GtkWidget *llw = aweather_gui_get_widget(self, "log_level"); - GtkWidget *isw = aweather_gui_get_widget(self, "initial_site"); + gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url", NULL); + gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level", NULL); + gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site", NULL); + GtkWidget *nuw = aweather_gui_get_widget(self, "prefs_general_url"); + GtkWidget *llw = aweather_gui_get_widget(self, "prefs_general_log"); + GtkWidget *isw = aweather_gui_get_widget(self, "prefs_general_site"); if (nu) gtk_entry_set_text(GTK_ENTRY(nuw), nu), g_free(nu); if (ll) gtk_spin_button_set_value(GTK_SPIN_BUTTON(llw), ll); if (is) { @@ -225,7 +232,7 @@ static void prefs_setup(AWeatherGui *self) } /* Load Plugins */ - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "plugins_view")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "prefs_plugins_view")); GtkCellRenderer *rend1 = gtk_cell_renderer_text_new(); GtkCellRenderer *rend2 = gtk_cell_renderer_toggle_new(); GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes( @@ -252,27 +259,24 @@ 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); } } - GtkWidget *combo = aweather_gui_get_widget(self, "site"); - GObject *renderer = aweather_gui_get_object(self, "site_rend"); + GtkWidget *combo = aweather_gui_get_widget(self, "main_site"); + 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) { - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time")); GtkCellRenderer *rend = gtk_cell_renderer_text_new(); GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes( "Time", rend, "text", 0, NULL); @@ -280,7 +284,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); } @@ -295,7 +299,7 @@ static void update_times_gtk(AWeatherGui *self, GList *times) GRegex *regex = g_regex_new("^[A-Z]{4}_([0-9]{8}_[0-9]{4})$", 0, 0, NULL); // KLSX_20090622_2113 GMatchInfo *info; - GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "time")); + GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time")); GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview)); gtk_list_store_clear(lstore); GtkTreeIter iter; @@ -309,7 +313,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,12 +336,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(), PACKAGE, "nexrd2", "raw", site, NULL); + gchar *path = g_build_filename(g_get_user_cache_dir(), + "libgis", "nexrd2", "raw", site, NULL); GDir *dir = g_dir_open(path, 0, NULL); if (dir) { const gchar *name; @@ -350,22 +355,49 @@ static void update_times(AWeatherGui *self, GisView *view, char *site) 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"); + char *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); cache_file(base, path, GIS_REFRESH, NULL, update_times_online_cb, self); /* 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); } @@ -377,20 +409,10 @@ AWeatherGui *aweather_gui_new() g_debug("AWeatherGui: new"); return g_object_new(AWEATHER_TYPE_GUI, NULL); } -GisWorld *aweather_gui_get_world(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) +GisViewer *aweather_gui_get_viewer(AWeatherGui *self) { g_assert(AWEATHER_IS_GUI(self)); - return self->opengl; + return self->viewer; } GtkBuilder *aweather_gui_get_builder(AWeatherGui *self) { @@ -416,17 +438,19 @@ 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); - GtkWidget *config = aweather_gui_get_widget(self, "tabs"); - GtkWidget *tab = gtk_label_new(name); - GtkWidget *body = gis_plugin_get_config(plugin); - gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab); - gtk_widget_show_all(config); - gis_opengl_redraw(self->opengl); + self->viewer, self->prefs); + GtkWidget *body = gis_plugin_get_config(plugin); + if (body) { + GtkWidget *config = aweather_gui_get_widget(self, "main_tabs"); + GtkWidget *tab = gtk_label_new(name); + gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab); + gtk_widget_show_all(config); + } + gtk_widget_queue_draw(GTK_WIDGET(self->viewer)); } void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name) { - GtkWidget *config = aweather_gui_get_widget(self, "tabs"); + GtkWidget *config = aweather_gui_get_widget(self, "main_tabs"); guint n_pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(config)); for (int i = 0; i < n_pages; i++) { g_debug("testing tab %d", i); @@ -439,7 +463,7 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name) gtk_notebook_remove_page(GTK_NOTEBOOK(config), i); } gis_plugins_unload(self->plugins, name); - gis_opengl_redraw(self->opengl); + gtk_widget_queue_draw(GTK_WIDGET(self->viewer)); } @@ -452,28 +476,34 @@ static void aweather_gui_init(AWeatherGui *self) g_debug("AWeatherGui: init"); /* Simple things */ - self->prefs = gis_prefs_new("aweather"); - self->plugins = gis_plugins_new(); - self->world = gis_world_new(); - self->view = gis_view_new(); - self->opengl = gis_opengl_new(self->world, self->view, self->plugins); + 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->viewer = gis_opengl_new(self->plugins); + g_free(config); + g_free(defaults); /* Setup window */ self->builder = gtk_builder_new(); GError *error = NULL; - if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.ui", &error)) + if (!gtk_builder_add_from_file(self->builder, PKGDATADIR "/main.ui", &error)) g_error("Failed to create gtk builder: %s", error->message); - gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self)); - GtkWidget *hpaned = aweather_gui_get_widget(self, "hpaned"); - gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(hpaned))); - gtk_paned_pack1(GTK_PANED(hpaned), GTK_WIDGET(self->opengl), TRUE, FALSE); + 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->viewer), TRUE, FALSE); + gtk_widget_show_all(GTK_WIDGET(self)); /* Plugins */ GtkTreeIter iter; self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins")); - for (GList *cur = gis_plugins_available(); cur; cur = cur->next) { + for (GList *cur = gis_plugins_available(self->plugins); cur; cur = cur->next) { gchar *name = cur->data; - gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled"); + GError *error = NULL; + gboolean enabled = gis_prefs_get_boolean_v(self->prefs, cur->data, "enabled", &error); + if (error && error->code == G_KEY_FILE_ERROR_GROUP_NOT_FOUND) + enabled = TRUE; gtk_list_store_append(self->gtk_plugins, &iter); gtk_list_store_set(self->gtk_plugins, &iter, 0, name, 1, enabled, -1); if (enabled) @@ -489,13 +519,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) @@ -510,23 +542,15 @@ static void aweather_gui_dispose(GObject *_self) AWeatherGui *self = AWEATHER_GUI(_self); if (self->builder) { /* Reparent to avoid double unrefs */ - GtkWidget *body = aweather_gui_get_widget(self, "body"); + GtkWidget *body = aweather_gui_get_widget(self, "main_body"); GtkWidget *window = aweather_gui_get_widget(self, "main_window"); gtk_widget_reparent(body, window); 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);