X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=334e0fb6b8f4598ccbaede664d220770e9bd45f2;hb=3a04320e046750af6e0f7962df4c949a0af7e6c6;hp=9c76a57e5bb0a188b2dfa45ce8da309412898a70;hpb=d01fb11de5bcf91224348bf41abb6788d0af2545;p=aweather diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 9c76a57..334e0fb 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 . */ @@ -33,7 +33,7 @@ * Data loading functions * **************************/ /* Convert a sweep to an 2d array of data points */ -static void bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap, +static void _bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap, guint8 **data, int *width, int *height) { /* Calculate max number of bins */ @@ -70,14 +70,14 @@ static void bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap } /* Load a sweep as the active texture */ -static void load_sweep(GisPluginRadar *self, Sweep *sweep) +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; - bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height); + _bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height); glDeleteTextures(1, &self->cur_sweep_tex); glGenTextures(1, &self->cur_sweep_tex); glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex); @@ -88,11 +88,11 @@ 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) +static void _load_colormap(GisPluginRadar *self, gchar *table) { /* Set colormap so we can draw it on expose */ for (int i = 0; colormaps[i].name; i++) @@ -101,8 +101,8 @@ static void load_colormap(GisPluginRadar *self, gchar *table) } /* Add selectors to the config area for the sweeps */ -static void on_sweep_clicked(GtkRadioButton *button, gpointer _self); -static void load_radar_gui(GisPluginRadar *self, Radar *radar) +static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self); +static void _load_radar_gui(GisPluginRadar *self, Radar *radar) { /* Clear existing items */ GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body)); @@ -164,7 +164,7 @@ static void load_radar_gui(GisPluginRadar *self, Radar *radar) g_object_set_data(G_OBJECT(button), "type", vol->h.type_str); g_object_set_data(G_OBJECT(button), "sweep", sweep); - g_signal_connect(button, "clicked", G_CALLBACK(on_sweep_clicked), self); + g_signal_connect(button, "clicked", G_CALLBACK(_on_sweep_clicked), self); } } gtk_container_add(GTK_CONTAINER(self->config_body), table); @@ -183,7 +183,7 @@ static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi) double lz = sin(tilt); double dist = bi*ray->h.gate_size + ray->h.range_bin1; - + grid->p[gi].x = lx*dist; grid->p[gi].y = ly*dist; grid->p[gi].z = lz*dist; @@ -194,7 +194,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, @@ -203,7 +203,7 @@ static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi) } /* Load a radar from a decompressed file */ -static void load_radar(GisPluginRadar *self, gchar *radar_file) +static void _load_radar(GisPluginRadar *self, gchar *radar_file) { char *dir = g_path_get_dirname(radar_file); char *site = g_path_get_basename(dir); @@ -233,7 +233,7 @@ static void load_radar(GisPluginRadar *self, gchar *radar_file) Sweep *sweep0 = radar->v[vi]->sweep[si+0]; Sweep *sweep1 = radar->v[vi]->sweep[si+1]; - //g_debug("_gis_plugin_radar_expose: sweep[%3d-%3d] -- nrays = %d, %d", + //g_debug("GisPluginRadar: load_radar: sweep[%3d-%3d] -- nrays = %d, %d", // si, si+1,sweep0->h.nrays, sweep1->h.nrays); /* Skip super->regular resolution switch for now */ @@ -254,11 +254,11 @@ static void load_radar(GisPluginRadar *self, gchar *radar_file) sweep1->ray[ri]; for (guint ri = 0; ri+x < sweep0->h.nrays; ri+=x) { - //g_debug("_gis_plugin_radar_expose: ray[%3d-%3d] -- nbins = %d, %d, %d, %d", + //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) { @@ -302,15 +302,15 @@ static void load_radar(GisPluginRadar *self, gchar *radar_file) if (radar->v[vi]== NULL) continue; for (int si = 0; si < radar->v[vi]->h.nsweeps; si++) { if (radar->v[vi]->sweep[si]== NULL) continue; - load_colormap(self, radar->v[vi]->h.type_str); - load_sweep(self, radar->v[vi]->sweep[si]); + _load_colormap(self, radar->v[vi]->h.type_str); + _load_sweep(self, radar->v[vi]->sweep[si]); break; } break; } } - load_radar_gui(self, radar); + _load_radar_gui(self, radar); } @@ -322,7 +322,7 @@ typedef struct { gchar *radar_file; } decompressed_t; -static void decompressed_cb(GPid pid, gint status, gpointer _udata) +static void _decompressed_cb(GPid pid, gint status, gpointer _udata) { g_debug("GisPluginRadar: decompressed_cb"); decompressed_t *udata = _udata; @@ -330,18 +330,18 @@ static void decompressed_cb(GPid pid, gint status, gpointer _udata) g_warning("wsr88ddec exited with status %d", status); return; } - load_radar(udata->self, udata->radar_file); + _load_radar(udata->self, udata->radar_file); g_spawn_close_pid(pid); g_free(udata->radar_file); g_free(udata); } -static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self) +static void _cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _self) { GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); double percent = (double)cur/total; - //g_message("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%", + //g_debug("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%", // cur, total, percent*100); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0)); @@ -352,13 +352,13 @@ static void cache_chunk_cb(char *path, goffset cur, goffset total, gpointer _sel g_free(msg); } -static void cache_done_cb(char *path, gboolean updated, gpointer _self) +static void _cache_done_cb(char *path, gboolean updated, gpointer _self) { g_debug("GisPluginRadar: cache_done_cb - updated = %d", updated); GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); char *decompressed = g_strconcat(path, ".raw", NULL); if (!updated && g_file_test(decompressed, G_FILE_TEST_EXISTS)) { - load_radar(self, decompressed); + _load_radar(self, decompressed); return; } @@ -374,18 +374,25 @@ 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, &pid, // GPid *child_pid, &error); // GError **error if (error) { - g_warning("failed to decompress WSR88D data: %s", + gchar *message = g_strdup_printf("Unable to decompress WSR88D data: %s", error->message); + g_warning("%s", message); + GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body)); + if (child) + gtk_widget_destroy(child); + gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new(message)); + gtk_widget_show_all(self->config_body); g_error_free(error); + g_free(message); } - g_child_watch_add(pid, decompressed_cb, udata); + g_child_watch_add(pid, _decompressed_cb, udata); self->soup = NULL; } @@ -393,19 +400,19 @@ static void cache_done_cb(char *path, gboolean updated, gpointer _self) /************* * Callbacks * *************/ -static void on_sweep_clicked(GtkRadioButton *button, gpointer _self) +static void _on_sweep_clicked(GtkRadioButton *button, gpointer _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")); + _load_colormap(self, g_object_get_data(G_OBJECT(button), "type" )); + _load_sweep (self, g_object_get_data(G_OBJECT(button), "sweep")); } -static void on_time_changed(GisView *view, const char *time, gpointer _self) +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_view_get_site(view); + char *site = gis_viewer_get_site(viewer); char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time); /* Set up progress bar */ @@ -426,53 +433,29 @@ 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) { soup_session_abort(self->soup); self->soup = NULL; } - gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url"); - if (gis_world_get_offline(self->world)) - self->soup = cache_file(base, path, GIS_ONCE, - cache_chunk_cb, cache_done_cb, self); - else + gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL); + 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); + _cache_chunk_cb, _cache_done_cb, self); g_free(path); } - -/*********** - * Methods * - ***********/ -GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs) -{ - /* 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; -} - -static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self) +static gpointer _draw_radar(GisCallback *callback, gpointer _self) { GisPluginRadar *self = GIS_PLUGIN_RADAR(_self); - return self->config_body; -} - -static void gis_plugin_radar_expose(GisPlugin *_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 @@ -505,12 +488,12 @@ static void gis_plugin_radar_expose(GisPlugin *_self) glPopMatrix(); #endif - g_message("set 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); @@ -562,10 +545,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; @@ -577,6 +573,39 @@ 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); + /* 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; } @@ -592,7 +621,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 */ @@ -612,7 +640,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); }