X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.h;h=b61854aa89e61674f88eafa338d72f3c8b674308;hb=c0e52fc233205fb646326a0efd86e4359f51d96c;hp=1aa9cb3b9dc98fa6e591becc3b579a99f0922e12;hpb=88b72a1562c00da25a9e8a3622a82e6452cb42ad;p=aweather

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 1aa9cb3..b61854a 100644
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -19,19 +19,10 @@
 #define __RADAR_H__
 
 #include <glib-object.h>
-#include <libsoup/soup.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
-
-#include "marching.h"
-
-/* TODO: convert */
-typedef struct {
-	char *name;
-	guint8 data[256][4];
-} colormap_t;
-extern colormap_t colormaps[];
+#include <gis.h>
+#include "level2.h"
 
 #define GIS_TYPE_PLUGIN_RADAR            (gis_plugin_radar_get_type ())
 #define GIS_PLUGIN_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_RADAR, GisPluginRadar))
@@ -47,21 +38,24 @@ struct _GisPluginRadar {
 	GObject parent_instance;
 
 	/* instance members */
-	GisViewer   *viewer;
-	GisPrefs    *prefs;
-	GtkWidget   *config_body;
-	GtkWidget   *progress_bar;
-	GtkWidget   *progress_label;
-	SoupSession *soup;
-	guint        time_changed_id;
-
-	/* Private data for loading radars */
-	Radar       *cur_radar;
-	Sweep       *cur_sweep;
-	colormap_t  *cur_colormap;
-	guint        cur_sweep_tex;
-	TRIANGLE    *cur_triangles;
-	guint        cur_num_triangles;
+	GisViewer *viewer;
+	GisPrefs  *prefs;
+	GisHttp   *http;
+
+	/* Signals */
+	guint      time_changed_id;
+	guint      location_changed_id;
+
+	/* Tab area */
+	GtkWidget *config_body;
+	GtkWidget *progress_bar;
+	GtkWidget *progress_label;
+
+	/* Radar lists */
+	AWeatherColormap *colormap;
+	gpointer   radar;
+	gchar     *cur_site;
+	gchar     *cur_time;
 };
 
 struct _GisPluginRadarClass {