Win32 fixes and improvements

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 34a260752ab7e7b5c2d9bceef1e6a736bd6b8172..2ed86acb1568c9af3f4935c957364bafb000b8e5 100644 (file)
--- 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))
@@ -43,27 +34,24 @@ extern colormap_t colormaps[];
 typedef struct _GisPluginRadar        GisPluginRadar;
 typedef struct _GisPluginRadarClass   GisPluginRadarClass;
 
+typedef struct _RadarConus RadarConus;
+typedef struct _RadarSite  RadarSite;
+
 struct _GisPluginRadar {
        GObject parent_instance;
 
        /* instance members */
-       GisWorld    *world;
-       GisView     *view;
-       GisOpenGL   *opengl;
-       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;
+       GtkWidget  *config;
+       AWeatherColormap *colormap;
+       gpointer    *hud_ref;
+
+       GHashTable *sites;
+       GisHttp    *sites_http;
+
+       RadarConus *conus;
+       GisHttp    *conus_http;
 };
 
 struct _GisPluginRadarClass {
@@ -73,7 +61,7 @@ struct _GisPluginRadarClass {
 GType gis_plugin_radar_get_type();
 
 /* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs);
 
 /* Misc. RSL helpers */
 #define RSL_FOREACH_VOL(radar, volume, count, index) \