X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.h;h=8227aa15d6cfeeaa61f5086b3218dd18b37697f4;hb=ad96320cf94edc4e0dc74110125ca4c12cbf442d;hp=c4964cb5b88923ecc9a9f915cf3540668370112d;hpb=c45d5a6177fe71ff1028887a1fbb01152de96835;p=aweather

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index c4964cb..8227aa1 100644
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -19,62 +19,49 @@
 #define __RADAR_H__
 
 #include <glib-object.h>
-#include <libsoup/soup.h>
 #include <rsl.h>
 
-#include <gis/gis.h>
+#include <grits.h>
+#include "level2.h"
 
-#include "marching.h"
+#define GRITS_TYPE_PLUGIN_RADAR            (grits_plugin_radar_get_type ())
+#define GRITS_PLUGIN_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadar))
+#define GRITS_IS_PLUGIN_RADAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GRITS_TYPE_PLUGIN_RADAR))
+#define GRITS_PLUGIN_RADAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadarClass))
+#define GRITS_IS_PLUGIN_RADAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GRITS_TYPE_PLUGIN_RADAR))
+#define GRITS_PLUGIN_RADAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadarClass))
 
-/* TODO: convert */
-typedef struct {
-	char *name;
-	guint8 data[256][4];
-} colormap_t;
-extern colormap_t colormaps[];
+typedef struct _GritsPluginRadar      GritsPluginRadar;
+typedef struct _GritsPluginRadarClass GritsPluginRadarClass;
 
-#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))
-#define GIS_IS_PLUGIN_RADAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_PLUGIN_RADAR))
-#define GIS_PLUGIN_RADAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_PLUGIN_RADAR, GisPluginRadarClass))
-#define GIS_IS_PLUGIN_RADAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_PLUGIN_RADAR))
-#define GIS_PLUGIN_RADAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_PLUGIN_RADAR, GisPluginRadarClass))
+typedef struct _RadarConus RadarConus;
+typedef struct _RadarSite  RadarSite;
 
-typedef struct _GisPluginRadar        GisPluginRadar;
-typedef struct _GisPluginRadarClass   GisPluginRadarClass;
-
-struct _GisPluginRadar {
+struct _GritsPluginRadar {
 	GObject parent_instance;
 
 	/* instance members */
-	GisViewer   *viewer;
-	GisPrefs    *prefs;
-	GtkWidget   *config_body;
-	GtkWidget   *progress_bar;
-	GtkWidget   *progress_label;
-	SoupSession *soup;
-	guint        time_changed_id;
-	guint        location_changed_id;
-
-	/* Private data for loading radars */
-	char        *cur_site;
-	char        *cur_time;
-	Radar       *cur_radar;
-	Sweep       *cur_sweep;
-	colormap_t  *cur_colormap;
-	guint        cur_sweep_tex;
-	TRIANGLE    *cur_triangles;
-	guint        cur_num_triangles;
+	GritsViewer *viewer;
+	GritsPrefs  *prefs;
+	GtkWidget   *config;
+	AWeatherColormap *colormap;
+	gpointer    *hud_ref;
+
+	GHashTable  *sites;
+	GritsHttp   *sites_http;
+
+	RadarConus  *conus;
+	GritsHttp   *conus_http;
 };
 
-struct _GisPluginRadarClass {
+struct _GritsPluginRadarClass {
 	GObjectClass parent_class;
 };
 
-GType gis_plugin_radar_get_type();
+GType grits_plugin_radar_get_type();
 
 /* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs);
+GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs);
 
 /* Misc. RSL helpers */
 #define RSL_FOREACH_VOL(radar, volume, count, index) \