X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=5ea9e1d80a6fbd610393a14d4615f94db83481d3;hb=346ea055f4ea527db079a34fbfe441b9d33749e1;hp=7500080454760e0fa1e40b3b8039aebf2f757f79;hpb=7ea4985dd27c1d11398af41d17745d7b75c6f4d7;p=aweather diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 7500080..5ea9e1d 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -1,16 +1,16 @@ /* * Copyright (C) 2009 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 * 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 . */ @@ -27,6 +27,7 @@ #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]/2; // TESTING if (val == BADVAL || val == RFVAL || val == APFLAG || val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO) { buf[buf_i+3] = 0x00; // transparent @@ -72,8 +73,8 @@ static void _bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colorma /* Load a sweep as the active texture */ static void _load_sweep(GisPluginRadar *self, Sweep *sweep) { - GisOpenGL *opengl = self->opengl; - gis_opengl_begin(opengl); + GisViewer *viewer = self->viewer; + gis_viewer_begin(viewer); self->cur_sweep = sweep; int height, width; guint8 *data; @@ -88,8 +89,8 @@ static void _load_sweep(GisPluginRadar *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(GisPluginRadar *self, gchar *table) @@ -194,7 +195,7 @@ static void _gis_plugin_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, @@ -256,9 +257,9 @@ static void _load_radar(GisPluginRadar *self, gchar *radar_file) for (guint ri = 0; ri+x < sweep0->h.nrays; ri+=x) { //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) { @@ -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; @@ -374,7 +371,7 @@ 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, @@ -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(GisView *view, 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_view_get_site(view); char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time); /* Set up progress bar */ @@ -433,7 +420,7 @@ 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(self->opengl); + gtk_widget_queue_draw(GTK_WIDGET(self->viewer)); /* Start loading the new radar */ if (self->soup) { @@ -441,45 +428,72 @@ static void _on_time_changed(GisView *view, const char *time, gpointer _self) self->soup = NULL; } gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); - if (gis_world_get_offline(self->world)) - self->soup = cache_file(base, path, GIS_ONCE, - _cache_chunk_cb, _cache_done_cb, self); - else + if (gis_viewer_get_offline(self->viewer)) + self->soup = cache_file(base, path, GIS_NEVER, + NULL, _cache_done_cb, self); + else self->soup = cache_file(base, path, GIS_UPDATE, _cache_chunk_cb, _cache_done_cb, self); g_free(path); } -/*********** - * Methods * - ***********/ -GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, 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->world = world; - self->view = view; - self->opengl = opengl; - self->prefs = prefs; - self->time_changed_id = g_signal_connect(view, "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 _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); + 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 void gis_plugin_radar_expose(GisPlugin *_self) +static gpointer _draw_radar(GisCallback *callback, gpointer _self) { GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); - g_debug("GisPluginRadar: expose"); if (self->cur_sweep == NULL) - return; + return NULL; + g_debug("GisPluginRadar: _draw_radar"); Sweep *sweep = self->cur_sweep; #ifdef MARCHING @@ -512,23 +526,25 @@ 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); gdouble elev = h->height; - gis_opengl_center_position(self->opengl, lat, lon, elev); + gis_viewer_center_position(self->viewer, lat, lon, elev); 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; @@ -569,10 +585,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; @@ -584,6 +613,53 @@ 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 *callback; + + callback = gis_callback_new(_draw_radar, self); + gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, TRUE); + + callback = gis_callback_new(_draw_hud, self); + gis_viewer_add(viewer, GIS_OBJECT(callback), 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; } @@ -599,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 */ @@ -619,7 +694,7 @@ static void gis_plugin_radar_dispose(GObject *gobject) { g_debug("GisPluginRadar: dispose"); GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject); - g_signal_handler_disconnect(self->view, self->time_changed_id); + g_signal_handler_disconnect(self->viewer, self->time_changed_id); /* Drop references */ G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject); }