X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=1811ec4bd25b952523a0a5dc1167b2298120f6ec;hb=88b72a1562c00da25a9e8a3622a82e6452cb42ad;hp=ae51128999b3e4d0ba78b2c3e29370fc0c2262da;hpb=f705ad00b5d94f8ddc59575737b79feed191b404;p=aweather

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index ae51128..1811ec4 100644
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -1,16 +1,16 @@
 /*
  * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
- * 
+ *
  * 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
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -23,67 +23,17 @@
 #include <math.h>
 #include <rsl.h>
 
-#include "misc.h"
-#include "aweather-gui.h"
+#include <gis/gis.h>
+
 #include "radar.h"
-#include "data.h"
 #include "marching.h"
 
-static char *nexrad_base = "http://mesonet.agron.iastate.edu/data/";
-
-/****************
- * GObject code *
- ****************/
-/* Plugin init */
-static void aweather_radar_plugin_init(AWeatherPluginInterface *iface);
-static void _aweather_radar_expose(AWeatherPlugin *_radar);
-G_DEFINE_TYPE_WITH_CODE(AWeatherRadar, aweather_radar, G_TYPE_OBJECT,
-		G_IMPLEMENT_INTERFACE(AWEATHER_TYPE_PLUGIN,
-			aweather_radar_plugin_init));
-static void aweather_radar_plugin_init(AWeatherPluginInterface *iface)
-{
-	g_debug("AWeatherRadar: plugin_init");
-	/* Add methods to the interface */
-	iface->expose = _aweather_radar_expose;
-}
-/* Class/Object init */
-static void aweather_radar_init(AWeatherRadar *radar)
-{
-	g_debug("AWeatherRadar: class_init");
-	/* Set defaults */
-	radar->gui           = NULL;
-	radar->soup          = NULL;
-	radar->cur_triangles = NULL;
-	radar->cur_num_triangles = 0;
-}
-static void aweather_radar_dispose(GObject *gobject)
-{
-	g_debug("AWeatherRadar: dispose");
-	AWeatherRadar *self = AWEATHER_RADAR(gobject);
-	/* Drop references */
-	G_OBJECT_CLASS(aweather_radar_parent_class)->dispose(gobject);
-}
-static void aweather_radar_finalize(GObject *gobject)
-{
-	g_debug("AWeatherRadar: finalize");
-	AWeatherRadar *self = AWEATHER_RADAR(gobject);
-	/* Free data */
-	G_OBJECT_CLASS(aweather_radar_parent_class)->finalize(gobject);
-
-}
-static void aweather_radar_class_init(AWeatherRadarClass *klass)
-{
-	g_debug("AWeatherRadar: class_init");
-	GObjectClass *gobject_class = (GObjectClass*)klass;
-	gobject_class->dispose  = aweather_radar_dispose;
-	gobject_class->finalize = aweather_radar_finalize;
-}
 
 /**************************
  * Data loading functions *
  **************************/
 /* Convert a sweep to an 2d array of data points */
-static void bscan_sweep(AWeatherRadar *self, Sweep *sweep, colormap_t *colormap,
+static void _bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap,
 		guint8 **data, int *width, int *height)
 {
 	/* Calculate max number of bins */
@@ -120,14 +70,14 @@ static void bscan_sweep(AWeatherRadar *self, Sweep *sweep, colormap_t *colormap,
 }
 
 /* Load a sweep as the active texture */
-static void load_sweep(AWeatherRadar *self, Sweep *sweep)
+static void _load_sweep(GisPluginRadar *self, Sweep *sweep)
 {
-	GisOpenGL *opengl = aweather_gui_get_opengl(self->gui);
-	gis_opengl_begin(opengl);
+	GisViewer *viewer = self->viewer;
+	gis_viewer_begin(viewer);
 	self->cur_sweep = sweep;
 	int height, width;
 	guint8 *data;
-	bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height);
+	_bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height);
 	glDeleteTextures(1, &self->cur_sweep_tex);
 	glGenTextures(1, &self->cur_sweep_tex);
 	glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
@@ -138,11 +88,11 @@ static void load_sweep(AWeatherRadar *self, Sweep *sweep)
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
 			GL_RGBA, GL_UNSIGNED_BYTE, data);
 	g_free(data);
-	gis_opengl_redraw(opengl);
-	gis_opengl_end(opengl);
+	gtk_widget_queue_draw(GTK_WIDGET(viewer));
+	gis_viewer_end(viewer);
 }
 
-static void load_colormap(AWeatherRadar *self, gchar *table)
+static void _load_colormap(GisPluginRadar *self, gchar *table)
 {
 	/* Set colormap so we can draw it on expose */
 	for (int i = 0; colormaps[i].name; i++)
@@ -151,8 +101,8 @@ static void load_colormap(AWeatherRadar *self, gchar *table)
 }
 
 /* Add selectors to the config area for the sweeps */
-static void on_sweep_clicked(GtkRadioButton *button, gpointer _self);
-static void load_radar_gui(AWeatherRadar *self, Radar *radar)
+static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self);
+static void _load_radar_gui(GisPluginRadar *self, Radar *radar)
 {
 	/* Clear existing items */
 	GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
@@ -214,26 +164,26 @@ static void load_radar_gui(AWeatherRadar *self, Radar *radar)
 
 			g_object_set_data(G_OBJECT(button), "type",  vol->h.type_str);
 			g_object_set_data(G_OBJECT(button), "sweep", sweep);
-			g_signal_connect(button, "clicked", G_CALLBACK(on_sweep_clicked), self);
+			g_signal_connect(button, "clicked", G_CALLBACK(_on_sweep_clicked), self);
 		}
 	}
 	gtk_container_add(GTK_CONTAINER(self->config_body), table);
 	gtk_widget_show_all(table);
 }
 
-static void _aweather_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
+static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
 {
 	Range range = ray->range[bi];
 
-	double angle = d2r(ray->h.azimuth);
-	double tilt  = d2r(ray->h.elev);
+	double angle = deg2rad(ray->h.azimuth);
+	double tilt  = deg2rad(ray->h.elev);
 
 	double lx    = sin(angle);
 	double ly    = cos(angle);
 	double lz    = sin(tilt);
 
 	double dist   = bi*ray->h.gate_size + ray->h.range_bin1;
-		
+
 	grid->p[gi].x = lx*dist;
 	grid->p[gi].y = ly*dist;
 	grid->p[gi].z = lz*dist;
@@ -244,7 +194,7 @@ static void _aweather_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
 	    val > 80)
 		val = 0;
 	grid->val[gi] = (float)val;
-	//g_debug("(%.2f,%.2f,%.2f) - (%.0f,%.0f,%.0f) = %d", 
+	//g_debug("(%.2f,%.2f,%.2f) - (%.0f,%.0f,%.0f) = %d",
 	//	angle, tilt, dist,
 	//	grid->p[gi].x,
 	//	grid->p[gi].y,
@@ -253,12 +203,12 @@ static void _aweather_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
 }
 
 /* Load a radar from a decompressed file */
-static void load_radar(AWeatherRadar *self, gchar *radar_file)
+static void _load_radar(GisPluginRadar *self, gchar *radar_file)
 {
 	char *dir  = g_path_get_dirname(radar_file);
 	char *site = g_path_get_basename(dir);
 	g_free(dir);
-	g_debug("AWeatherRadar: load_radar - Loading new radar");
+	g_debug("GisPluginRadar: load_radar - Loading new radar");
 	RSL_read_these_sweeps("all", NULL);
 	Radar *radar = self->cur_radar = RSL_wsr88d_to_radar(radar_file, site);
 	if (radar == NULL) {
@@ -283,7 +233,7 @@ static void load_radar(AWeatherRadar *self, gchar *radar_file)
 			Sweep *sweep0 = radar->v[vi]->sweep[si+0];
 			Sweep *sweep1 = radar->v[vi]->sweep[si+1];
 
-			//g_debug("_aweather_radar_expose: sweep[%3d-%3d] -- nrays = %d, %d",
+			//g_debug("GisPluginRadar: load_radar: sweep[%3d-%3d] -- nrays = %d, %d",
 			//	si, si+1,sweep0->h.nrays, sweep1->h.nrays);
 
 			/* Skip super->regular resolution switch for now */
@@ -304,23 +254,23 @@ static void load_radar(AWeatherRadar *self, gchar *radar_file)
 					sweep1->ray[ri];
 
 			for (guint ri = 0; ri+x < sweep0->h.nrays; ri+=x) {
-				//g_debug("_aweather_radar_expose: ray[%3d-%3d] -- nbins = %d, %d, %d, %d",
+				//g_debug("GisPluginRadar: load_radar - ray[%3d-%3d] -- nbins = %d, %d, %d, %d",
 				//	ri, ri+x,
-				//	rays0[ri  ]->h.nbins, 
-				//	rays0[ri+1]->h.nbins, 
-				//	rays1[ri  ]->h.nbins, 
+				//	rays0[ri  ]->h.nbins,
+				//	rays0[ri+1]->h.nbins,
+				//	rays1[ri  ]->h.nbins,
 				//	rays1[ri+1]->h.nbins);
 
 				for (guint bi = 0; bi+x < rays1[ri]->h.nbins; bi+=x) {
 					GRIDCELL grid = {};
-					_aweather_radar_grid_set(&grid, 7, rays0[(ri  )%sweep0->h.nrays], bi+x);
-					_aweather_radar_grid_set(&grid, 6, rays0[(ri+x)%sweep0->h.nrays], bi+x);
-					_aweather_radar_grid_set(&grid, 5, rays0[(ri+x)%sweep0->h.nrays], bi  );
-					_aweather_radar_grid_set(&grid, 4, rays0[(ri  )%sweep0->h.nrays], bi  );
-					_aweather_radar_grid_set(&grid, 3, rays1[(ri  )%sweep0->h.nrays], bi+x);
-					_aweather_radar_grid_set(&grid, 2, rays1[(ri+x)%sweep0->h.nrays], bi+x);
-					_aweather_radar_grid_set(&grid, 1, rays1[(ri+x)%sweep0->h.nrays], bi  );
-					_aweather_radar_grid_set(&grid, 0, rays1[(ri  )%sweep0->h.nrays], bi  );
+					_gis_plugin_radar_grid_set(&grid, 7, rays0[(ri  )%sweep0->h.nrays], bi+x);
+					_gis_plugin_radar_grid_set(&grid, 6, rays0[(ri+x)%sweep0->h.nrays], bi+x);
+					_gis_plugin_radar_grid_set(&grid, 5, rays0[(ri+x)%sweep0->h.nrays], bi  );
+					_gis_plugin_radar_grid_set(&grid, 4, rays0[(ri  )%sweep0->h.nrays], bi  );
+					_gis_plugin_radar_grid_set(&grid, 3, rays1[(ri  )%sweep0->h.nrays], bi+x);
+					_gis_plugin_radar_grid_set(&grid, 2, rays1[(ri+x)%sweep0->h.nrays], bi+x);
+					_gis_plugin_radar_grid_set(&grid, 1, rays1[(ri+x)%sweep0->h.nrays], bi  );
+					_gis_plugin_radar_grid_set(&grid, 0, rays1[(ri  )%sweep0->h.nrays], bi  );
 					
 					TRIANGLE tris[10];
 					int n = march_one_cube(grid, 40, tris);
@@ -352,115 +302,47 @@ static void load_radar(AWeatherRadar *self, gchar *radar_file)
 			if (radar->v[vi]== NULL) continue;
 			for (int si = 0; si < radar->v[vi]->h.nsweeps; si++) {
 				if (radar->v[vi]->sweep[si]== NULL) continue;
-				load_colormap(self, radar->v[vi]->h.type_str);
-				load_sweep(self, radar->v[vi]->sweep[si]);
+				_load_colormap(self, radar->v[vi]->h.type_str);
+				_load_sweep(self, radar->v[vi]->sweep[si]);
 				break;
 			}
 			break;
 		}
 	}
 
-	load_radar_gui(self, radar);
-}
-
-/* TODO: These update times functions are getting ugly... */
-static void update_times_gtk(AWeatherRadar *self, GList *times)
-{
-	gchar *last_time = NULL;
-	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->gui, "time"));
-	GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
-	gtk_list_store_clear(lstore);
-	GtkTreeIter iter;
-	times = g_list_reverse(times);
-	for (GList *cur = times; cur; cur = cur->next) {
-		g_message("trying time %s", (gchar*)cur->data);
-		if (g_regex_match(regex, cur->data, 0, &info)) {
-			gchar *time = g_match_info_fetch(info, 1);
-			g_message("adding time %s", (gchar*)cur->data);
-			gtk_list_store_insert(lstore, &iter, 0);
-			gtk_list_store_set(lstore, &iter, 0, time, -1);
-			last_time = time;
-		}
-	}
-
-	GisView *view = aweather_gui_get_view(self->gui);
-	gis_view_set_time(view, last_time);
-
-	g_regex_unref(regex);
-	g_list_foreach(times, (GFunc)g_free, NULL);
-	g_list_free(times);
+	_load_radar_gui(self, radar);
 }
-static void update_times_online_cb(char *path, gboolean updated, gpointer _self)
-{
-	GList *times = NULL;
-	gchar *data;
-	gsize length;
-	g_file_get_contents(path, &data, &length, NULL);
-	gchar **lines = g_strsplit(data, "\n", -1);
-	for (int i = 0; lines[i] && lines[i][0]; i++) {
-		char **parts = g_strsplit(lines[i], " ", 2);
-		times = g_list_prepend(times, g_strdup(parts[1]));
-		g_strfreev(parts);
-	}
-	g_strfreev(lines);
-	g_free(data);
 
-	update_times_gtk(_self, times);
-}
-static void update_times(AWeatherRadar *self, GisView *view, char *site)
-{
-	GisWorld *world = aweather_gui_get_world(self->gui);
-	if (gis_world_get_offline(world)) {
-		GList *times = NULL;
-		gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE, "nexrd2", "raw", site, NULL);
-		GDir *dir = g_dir_open(path, 0, NULL);
-		if (dir) {
-			const gchar *name;
-			while ((name = g_dir_read_name(dir))) {
-				times = g_list_prepend(times, g_strdup(name));
-			}
-			g_dir_close(dir);
-		}
-		g_free(path);
-		update_times_gtk(self, times);
-	} else {
-		gchar *path = g_strdup_printf("nexrd2/raw/%s/dir.list", site);
-		cache_file(nexrad_base, path, AWEATHER_REFRESH, NULL, update_times_online_cb, self);
-		/* update_times_gtk from update_times_online_cb */
-	}
-}
 
 /*****************
  * ASync helpers *
  *****************/
 typedef struct {
-	AWeatherRadar *self;
+	GisPluginRadar *self;
 	gchar *radar_file;
 } decompressed_t;
 
-static void decompressed_cb(GPid pid, gint status, gpointer _udata)
+static void _decompressed_cb(GPid pid, gint status, gpointer _udata)
 {
+	g_debug("GisPluginRadar: decompressed_cb");
 	decompressed_t *udata = _udata;
 	if (status != 0) {
 		g_warning("wsr88ddec exited with status %d", status);
 		return;
 	}
-	load_radar(udata->self, udata->radar_file);
+	_load_radar(udata->self, udata->radar_file);
 	g_spawn_close_pid(pid);
 	g_free(udata->radar_file);
 	g_free(udata);
 }
 
-static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self)
+static void _cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self)
 {
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
 	double percent = (double)cur/total;
 
-	g_message("AWeatherRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
-			cur, total, percent*100);
+	//g_debug("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
+	//		cur, total, percent*100);
 
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0));
 
@@ -470,19 +352,20 @@ static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _sel
 	g_free(msg);
 }
 
-static void cache_done_cb(char *path, gboolean updated, gpointer _self)
+static void _cache_done_cb(char *path, gboolean updated, gpointer _self)
 {
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
+	g_debug("GisPluginRadar: cache_done_cb - updated = %d", updated);
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
 	char *decompressed = g_strconcat(path, ".raw", NULL);
-	if (!updated) {
-		load_radar(self, decompressed);
+	if (!updated && g_file_test(decompressed, G_FILE_TEST_EXISTS)) {
+		_load_radar(self, decompressed);
 		return;
 	}
 
 	decompressed_t *udata = g_malloc(sizeof(decompressed_t));
 	udata->self       = self;
 	udata->radar_file = decompressed;
-	g_debug("AWeatherRadar: cache_done_cb - File updated, decompressing..");
+	g_debug("GisPluginRadar: cache_done_cb - File updated, decompressing..");
 	char *argv[] = {"wsr88ddec", path, decompressed, NULL};
 	GPid pid;
 	GError *error = NULL;
@@ -491,37 +374,45 @@ static void cache_done_cb(char *path, gboolean updated, gpointer _self)
 		argv,    // gchar **argv,
 		NULL,    // gchar **envp,
 		G_SPAWN_SEARCH_PATH|
-		G_SPAWN_DO_NOT_REAP_CHILD, 
+		G_SPAWN_DO_NOT_REAP_CHILD,
 			 // GSpawnFlags flags,
 		NULL,    // GSpawnChildSetupFunc child_setup,
 		NULL,    // gpointer user_data,
 		&pid,    // GPid *child_pid,
 		&error); // GError **error
 	if (error) {
-		g_warning("failed to decompress WSR88D data: %s",
+		gchar *message = g_strdup_printf("Unable to decompress WSR88D data: %s",
 				error->message);
+		g_warning("%s", message);
+		GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
+		if (child)
+			gtk_widget_destroy(child);
+		gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new(message));
+		gtk_widget_show_all(self->config_body);
 		g_error_free(error);
+		g_free(message);
 	}
-	g_child_watch_add(pid, decompressed_cb, udata);
+	g_child_watch_add(pid, _decompressed_cb, udata);
 	self->soup = NULL;
 }
 
+
 /*************
  * Callbacks *
  *************/
-static void on_sweep_clicked(GtkRadioButton *button, gpointer _self)
+static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self)
 {
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
-	load_colormap(self, g_object_get_data(G_OBJECT(button), "type" ));
-	load_sweep   (self, g_object_get_data(G_OBJECT(button), "sweep"));
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+	_load_colormap(self, g_object_get_data(G_OBJECT(button), "type" ));
+	_load_sweep   (self, g_object_get_data(G_OBJECT(button), "sweep"));
 }
 
-static void on_time_changed(GisView *view, const char *time, gpointer _self)
+static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self)
 {
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
-	g_debug("AWeatherRadar: on_time_changed - setting time=%s", time);
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+	g_debug("GisPluginRadar: on_time_changed - setting time=%s", time);
 	// format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
-	char *site = gis_view_get_site(view);
+	char *site = gis_viewer_get_site(viewer);
 	char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time);
 
 	/* Set up progress bar */
@@ -542,70 +433,49 @@ static void on_time_changed(GisView *view, const char *time, gpointer _self)
 		RSL_free_radar(self->cur_radar);
 	self->cur_radar = NULL;
 	self->cur_sweep = NULL;
-	gis_opengl_redraw(aweather_gui_get_opengl(self->gui));
+	gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
 
 	/* Start loading the new radar */
 	if (self->soup) {
 		soup_session_abort(self->soup);
 		self->soup = NULL;
 	}
-	if (gis_world_get_offline(aweather_gui_get_world(self->gui))) 
-		self->soup = cache_file(nexrad_base, path, AWEATHER_ONCE,
-				cache_chunk_cb, cache_done_cb, self);
-	else 
-		self->soup = cache_file(nexrad_base, path, AWEATHER_UPDATE,
-				cache_chunk_cb, cache_done_cb, self);
+	gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
+	if (gis_viewer_get_offline(self->viewer))
+		self->soup = cache_file(base, path, GIS_ONCE,
+				_cache_chunk_cb, _cache_done_cb, self);
+	else
+		self->soup = cache_file(base, path, GIS_UPDATE,
+				_cache_chunk_cb, _cache_done_cb, self);
 	g_free(path);
 }
 
-static void on_site_changed(GisView *view, char *site, gpointer _self)
-{
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
-	g_debug("AWeatherRadar: on_site_changed - Loading wsr88d list for %s", site);
-	update_times(self, view, site);
-}
-
-static void on_refresh(GisWorld *world, gpointer _self)
-{
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
-	GisView *view = aweather_gui_get_view(AWEATHER_RADAR(_self)->gui);
-	char *site = gis_view_get_site(view);
-	update_times(self, view, site);
-}
 
 /***********
  * Methods *
  ***********/
-AWeatherRadar *aweather_radar_new(AWeatherGui *gui)
+GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
 {
-	g_debug("AWeatherRadar: new");
-	AWeatherRadar *self = g_object_new(AWEATHER_TYPE_RADAR, NULL);
-	self->gui  = gui;
-
-	GtkWidget    *config  = aweather_gui_get_widget(gui, "tabs");
-
-	/* Add configuration tab */
-	self->config_body = gtk_alignment_new(0, 0, 1, 1);
-	gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
-	gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
-	gtk_notebook_prepend_page(GTK_NOTEBOOK(config), self->config_body, gtk_label_new("Radar"));
-
-	/* Set up OpenGL Stuff */
-	GisView  *view  = aweather_gui_get_view(gui);
-	GisWorld *world = aweather_gui_get_world(gui);
-	g_signal_connect(view,  "site-changed", G_CALLBACK(on_site_changed), self);
-	g_signal_connect(view,  "time-changed", G_CALLBACK(on_time_changed), self);
-	g_signal_connect(world, "refresh",      G_CALLBACK(on_refresh),      self);
-
-	on_site_changed(view, gis_view_get_site(view), self);
-
+	/* TODO: move to constructor if possible */
+	g_debug("GisPluginRadar: new");
+	GisPluginRadar *self = g_object_new(GIS_TYPE_PLUGIN_RADAR, NULL);
+	self->viewer = viewer;
+	self->prefs  = prefs;
+	self->time_changed_id = g_signal_connect(viewer, "time-changed",
+			G_CALLBACK(_on_time_changed), self);
 	return self;
 }
 
-static void _aweather_radar_expose(AWeatherPlugin *_self)
+static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self)
 {
-	AWeatherRadar *self = AWEATHER_RADAR(_self);
-	g_debug("AWeatherRadar: expose");
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+	return self->config_body;
+}
+
+static void gis_plugin_radar_expose(GisPlugin *_self)
+{
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+	g_debug("GisPluginRadar: expose");
 	if (self->cur_sweep == NULL)
 		return;
 	Sweep *sweep = self->cur_sweep;
@@ -640,26 +510,33 @@ static void _aweather_radar_expose(AWeatherPlugin *_self)
 	glPopMatrix();
 #endif
 
-	/* Draw the rays */
+	g_debug("GisPluginRadar: expose - setting camera");
+	Radar_header *h = &self->cur_radar->h;
+	gdouble lat  = (double)h->latd + (double)h->latm/60 + (double)h->lats/(60*60);
+	gdouble lon  = (double)h->lond + (double)h->lonm/60 + (double)h->lons/(60*60);
+	gdouble elev = h->height;
+	gis_viewer_center_position(self->viewer, lat, lon, elev);
+
+	glDisable(GL_ALPHA_TEST);
+	glDisable(GL_CULL_FACE);
+	glDisable(GL_DEPTH_TEST);
 	glDisable(GL_LIGHTING);
-	glDisable(GL_COLOR_MATERIAL);
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-	glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
 	glEnable(GL_TEXTURE_2D);
-	glDisable(GL_ALPHA_TEST);
 	glColor4f(1,1,1,1);
+
+	/* Draw the rays */
+	glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
 	glBegin(GL_QUAD_STRIP);
 	for (int ri = 0; ri <= sweep->h.nrays; ri++) {
 		Ray  *ray = NULL;
 		double angle = 0;
 		if (ri < sweep->h.nrays) {
 			ray = sweep->ray[ri];
-			angle = d2r(ray->h.azimuth - ((double)ray->h.beam_width/2.));
+			angle = deg2rad(ray->h.azimuth - ((double)ray->h.beam_width/2.));
 		} else {
 			/* Do the right side of the last sweep */
 			ray = sweep->ray[ri-1];
-			angle = d2r(ray->h.azimuth + ((double)ray->h.beam_width/2.));
+			angle = deg2rad(ray->h.azimuth + ((double)ray->h.beam_width/2.));
 		}
 
 		double lx = sin(angle);
@@ -675,13 +552,12 @@ static void _aweather_radar_expose(AWeatherPlugin *_self)
 
 		// far  left
 		// todo: correct range-height function
-		double height = sin(d2r(ray->h.elev)) * far_dist;
+		double height = sin(deg2rad(ray->h.elev)) * far_dist;
 		glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
 		glVertex3f(lx*far_dist,  ly*far_dist, height);
 	}
-	//g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
 	glEnd();
-	glPopMatrix();
+	//g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
 
 	/* Texture debug */
 	//glBegin(GL_QUADS);
@@ -692,25 +568,72 @@ static void _aweather_radar_expose(AWeatherPlugin *_self)
 	//glEnd();
 
 	/* Print the color table */
+	glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
+	glMatrixMode(GL_PROJECTION); glLoadIdentity();
 	glDisable(GL_TEXTURE_2D);
-	glDisable(GL_DEPTH_TEST);
-	glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
-	glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
+	glEnable(GL_COLOR_MATERIAL);
 	glBegin(GL_QUADS);
 	int i;
 	for (i = 0; i < 256; i++) {
-		glColor4ub(self->cur_colormap->data[i][0],
-		           self->cur_colormap->data[i][1],
-		           self->cur_colormap->data[i][2],
-		           self->cur_colormap->data[i][3]);
+		glColor4ubv(self->cur_colormap->data[i]);
 		glVertex3f(-1.0, (float)((i  ) - 256/2)/(256/2), 0.0); // bot left
 		glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
 		glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
 		glVertex3f(-0.9, (float)((i  ) - 256/2)/(256/2), 0.0); // bot right
 	}
 	glEnd();
-	glEnable(GL_DEPTH_TEST);
-	glEnable(GL_ALPHA_TEST);
-        glMatrixMode(GL_PROJECTION); glPopMatrix(); 
-	glMatrixMode(GL_MODELVIEW ); glPopMatrix();
 }
+
+
+/****************
+ * GObject code *
+ ****************/
+/* Plugin init */
+static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
+		G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
+			gis_plugin_radar_plugin_init));
+static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
+{
+	g_debug("GisPluginRadar: plugin_init");
+	/* Add methods to the interface */
+	iface->expose     = gis_plugin_radar_expose;
+	iface->get_config = gis_plugin_radar_get_config;
+}
+/* Class/Object init */
+static void gis_plugin_radar_init(GisPluginRadar *self)
+{
+	g_debug("GisPluginRadar: class_init");
+	/* Set defaults */
+	self->soup          = NULL;
+	self->cur_triangles = NULL;
+	self->cur_num_triangles = 0;
+
+	self->config_body = gtk_alignment_new(0, 0, 1, 1);
+	gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
+	gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
+}
+static void gis_plugin_radar_dispose(GObject *gobject)
+{
+	g_debug("GisPluginRadar: dispose");
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+	g_signal_handler_disconnect(self->viewer, self->time_changed_id);
+	/* Drop references */
+	G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+}
+static void gis_plugin_radar_finalize(GObject *gobject)
+{
+	g_debug("GisPluginRadar: finalize");
+	GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+	/* Free data */
+	G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
+
+}
+static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+{
+	g_debug("GisPluginRadar: class_init");
+	GObjectClass *gobject_class = (GObjectClass*)klass;
+	gobject_class->dispose  = gis_plugin_radar_dispose;
+	gobject_class->finalize = gis_plugin_radar_finalize;
+}
+