/*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
*
* 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
#include <gdk/gdkkeysyms.h>
#include <math.h>
-#include <gis/gis.h>
+#include <gis.h>
#include "aweather-gui.h"
#include "aweather-location.h"
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);
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;
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)
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);
}
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);
}
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);
}
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"));
}
}
-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"));
{
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)
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");
+ 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");
"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);
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);
}
}
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)
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);
}
}
}
- 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);
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;
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);
}
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)
+GisViewer *aweather_gui_get_viewer(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)
{
}
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, "main_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);
+ 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");
+ 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)
{
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));
}
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->prefs);
+ self->viewer = gis_opengl_new(self->plugins, self->prefs);
+ 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, "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;
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, "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);
gtk_list_store_set(self->gtk_plugins, &iter, 0, name, 1, enabled, -1);
if (enabled)
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)
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);
projects / aweather / blobdiff