X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=4efa6cb57a126a408ed0102d078cb67283340286;hb=d4d52d011600b56587a088760b734fbb52f6a588;hp=efdc3f0e10209c37649e761cd5554ac2e21bcf23;hpb=da541e8bb0b757a7e5fb6793c5b3b1f70a5ac507;p=aweather diff --git a/src/plugins/radar.c b/src/plugins/radar.c index efdc3f0..4efa6cb 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andy Spencer + * Copyright (C) 2009-2010 Andy Spencer * * 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 @@ -23,10 +23,11 @@ #include #include -#include +#include #include "radar.h" #include "marching.h" +#include "../aweather-location.h" /************************** @@ -55,7 +56,7 @@ static void _bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colorma buf[buf_i+0] = colormap->data[val][0]; buf[buf_i+1] = colormap->data[val][1]; buf[buf_i+2] = colormap->data[val][2]; - buf[buf_i+3] = colormap->data[val][3]; // TESTING + buf[buf_i+3] = colormap->data[val][3]*0.75; // TESTING if (val == BADVAL || val == RFVAL || val == APFLAG || val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO) { buf[buf_i+3] = 0x00; // transparent @@ -313,10 +314,6 @@ static void _load_radar(GisPluginRadar *self, gchar *radar_file) _load_radar_gui(self, radar); } - -/***************** - * ASync helpers * - *****************/ typedef struct { GisPluginRadar *self; gchar *radar_file; @@ -396,23 +393,13 @@ static void _cache_done_cb(char *path, gboolean updated, gpointer _self) self->soup = NULL; } - -/************* - * Callbacks * - *************/ -static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self) +static void _set_radar(GisPluginRadar *self, const char *site, const char *time) { - 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")); -} + if (!site || !time) + return; + g_debug("GisPluginRadar: set_radar - %s - %s", site, time); -static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self) -{ - 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_viewer_get_site(viewer); char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time); /* Set up progress bar */ @@ -451,33 +438,64 @@ static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self } -/*********** - * Methods * - ***********/ -GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs) +/************* + * Callbacks * + *************/ +static void _on_sweep_clicked(GtkRadioButton *button, gpointer _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; + 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 GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self) +static void _on_time_changed(GisViewer *viewer, const char *time, gpointer _self) { + g_debug("GisPluginRadar: _on_time_changed"); GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); - return self->config_body; + g_free(self->cur_time); + self->cur_time = g_strdup(time); + _set_radar(self, self->cur_site, self->cur_time); } -static void gis_plugin_radar_expose(GisPlugin *_self) +static void _on_location_changed(GisViewer *viewer, + gdouble lat, gdouble lon, gdouble elev, + gpointer _self) { + g_debug("GisPluginRadar: _on_location_changed"); GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); - g_debug("GisPluginRadar: expose"); + 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) { + self->cur_site = min_city->code; + _set_radar(self, self->cur_site, self->cur_time); + } + last_city = min_city; +} + +static gpointer _draw_radar(GisCallback *callback, gpointer _self) +{ + GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); + + /* Draw wsr88d */ if (self->cur_sweep == NULL) - return; + return NULL; + g_debug("GisPluginRadar: _draw_radar"); Sweep *sweep = self->cur_sweep; #ifdef MARCHING @@ -510,7 +528,7 @@ static void gis_plugin_radar_expose(GisPlugin *_self) glPopMatrix(); #endif - g_debug("GisPluginRadar: expose - setting camera"); + g_debug("GisPluginRadar: _draw_radar - 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); @@ -519,14 +537,16 @@ static void gis_plugin_radar_expose(GisPlugin *_self) glDisable(GL_ALPHA_TEST); glDisable(GL_CULL_FACE); - glDisable(GL_DEPTH_TEST); glDisable(GL_LIGHTING); glEnable(GL_TEXTURE_2D); + glEnable(GL_POLYGON_OFFSET_FILL); + glPolygonOffset(1.0, -2.0); glColor4f(1,1,1,1); /* Draw the rays */ glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex); - glBegin(GL_QUAD_STRIP); + g_message("Tex = %d", self->cur_sweep_tex); + glBegin(GL_TRIANGLE_STRIP); for (int ri = 0; ri <= sweep->h.nrays; ri++) { Ray *ray = NULL; double angle = 0; @@ -567,10 +587,23 @@ static void gis_plugin_radar_expose(GisPlugin *_self) //glTexCoord2d( 1., 0.); glVertex3f( 0., 0., 3.); // bot right //glEnd(); + return NULL; +} + +static gpointer _draw_hud(GisCallback *callback, gpointer _self) +{ + GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); + if (self->cur_sweep == NULL) + return NULL; + g_debug("GisPluginRadar: _draw_hud"); + /* Print the color table */ glMatrixMode(GL_MODELVIEW ); glLoadIdentity(); glMatrixMode(GL_PROJECTION); glLoadIdentity(); glDisable(GL_TEXTURE_2D); + glDisable(GL_ALPHA_TEST); + glDisable(GL_CULL_FACE); + glDisable(GL_LIGHTING); glEnable(GL_COLOR_MATERIAL); glBegin(GL_QUADS); int i; @@ -582,6 +615,51 @@ static void gis_plugin_radar_expose(GisPlugin *_self) glVertex3f(-0.9, (float)((i ) - 256/2)/(256/2), 0.0); // bot right } glEnd(); + + return NULL; +} + + +/*********** + * Methods * + ***********/ +GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs) +{ + /* 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); + self->location_changed_id = g_signal_connect(viewer, "location-changed", + G_CALLBACK(_on_location_changed), self); + + for (city_t *city = cities; city->type; city++) { + if (city->type != LOCATION_CITY) + continue; + g_debug("Adding marker for %s %s", city->code, city->label); + GisMarker *marker = gis_marker_new(city->label); + gis_point_set_lle(gis_object_center(GIS_OBJECT(marker)), + city->lat, city->lon, city->elev); + GIS_OBJECT(marker)->lod = EARTH_R/2; + gis_viewer_add(self->viewer, GIS_OBJECT(marker), GIS_LEVEL_OVERLAY, FALSE); + } + + /* Add renderers */ + GisCallback *radar_cb = gis_callback_new(_draw_radar, self); + GisCallback *hud_cb = gis_callback_new(_draw_hud, self); + + gis_viewer_add(viewer, GIS_OBJECT(radar_cb), GIS_LEVEL_WORLD, TRUE); + gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE); + + return self; +} + +static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self) +{ + GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); + return self->config_body; } @@ -597,7 +675,6 @@ 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 */