#include <gis/gis.h>
-#include "marching.h"
#include "radar.h"
-#include "radar-misc.h"
-
-/****************
- * GObject code *
- ****************/
-/* Plugin init */
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
-static void gis_plugin_radar_expose(GisPlugin *_radar);
-static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self);
-G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
- gis_plugin_radar_plugin_init));
-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 */
-static void gis_plugin_radar_init(GisPluginRadar *radar)
-{
- g_debug("GisPluginRadar: class_init");
- /* Set defaults */
- radar->soup = NULL;
- radar->cur_triangles = NULL;
- radar->cur_num_triangles = 0;
-}
-static void gis_plugin_radar_dispose(GObject *gobject)
-{
- g_debug("GisPluginRadar: dispose");
- GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
- /* Drop references */
- G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
-}
-static void gis_plugin_radar_finalize(GObject *gobject)
-{
- g_debug("GisPluginRadar: finalize");
- GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
- /* Free data */
- G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
+#include "marching.h"
-}
-static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
-{
- g_debug("GisPluginRadar: class_init");
- GObjectClass *gobject_class = (GObjectClass*)klass;
- gobject_class->dispose = gis_plugin_radar_dispose;
- gobject_class->finalize = gis_plugin_radar_finalize;
-}
/**************************
* 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 */
}
/* 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);
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);
gis_opengl_end(opengl);
}
-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++)
}
/* 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));
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);
{
Range range = ray->range[bi];
- double angle = d2r(ray->h.azimuth);
- double tilt = d2r(ray->h.elev);
+ double angle = deg2rad(ray->h.azimuth);
+ double tilt = deg2rad(ray->h.elev);
double lx = sin(angle);
double ly = cos(angle);
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;
}
/* 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);
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 */
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,
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);
}
+
/*****************
* ASync helpers *
*****************/
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;
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%%",
- cur, total, percent*100);
+ //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));
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;
}
&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;
}
+
/*************
* 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(GisView *view, const char *time, gpointer _self)
{
GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
g_debug("GisPluginRadar: on_time_changed - setting time=%s", time);
soup_session_abort(self->soup);
self->soup = NULL;
}
- gchar *base = gis_prefs_get_string(self->prefs, "general/nexrad_url");
+ 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, AWEATHER_ONCE,
- cache_chunk_cb, cache_done_cb, self);
+ self->soup = cache_file(base, path, GIS_ONCE,
+ _cache_chunk_cb, _cache_done_cb, self);
else
- self->soup = cache_file(base, path, AWEATHER_UPDATE,
- cache_chunk_cb, cache_done_cb, self);
+ self->soup = cache_file(base, path, GIS_UPDATE,
+ _cache_chunk_cb, _cache_done_cb, self);
g_free(path);
}
+
/***********
* Methods *
***********/
self->view = view;
self->opengl = opengl;
self->prefs = prefs;
-
- self->config_body = gtk_alignment_new(0, 0, 1, 1);
- gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
- gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
-
- /* Set up OpenGL Stuff */
- g_signal_connect(view, "time-changed", G_CALLBACK(on_time_changed), self);
-
+ self->time_changed_id = g_signal_connect(view, "time-changed",
+ G_CALLBACK(_on_time_changed), self);
return self;
}
glPopMatrix();
#endif
- /* Draw the rays */
+ g_debug("GisPluginRadar: expose - 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);
+
+ glDisable(GL_ALPHA_TEST);
+ glDisable(GL_CULL_FACE);
+ glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
- glDisable(GL_COLOR_MATERIAL);
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
glEnable(GL_TEXTURE_2D);
- glDisable(GL_ALPHA_TEST);
glColor4f(1,1,1,1);
+
+ /* Draw the rays */
+ glBindTexture(GL_TEXTURE_2D, self->cur_sweep_tex);
glBegin(GL_QUAD_STRIP);
for (int ri = 0; ri <= sweep->h.nrays; ri++) {
Ray *ray = NULL;
double angle = 0;
if (ri < sweep->h.nrays) {
ray = sweep->ray[ri];
- angle = d2r(ray->h.azimuth - ((double)ray->h.beam_width/2.));
+ angle = deg2rad(ray->h.azimuth - ((double)ray->h.beam_width/2.));
} else {
/* Do the right side of the last sweep */
ray = sweep->ray[ri-1];
- angle = d2r(ray->h.azimuth + ((double)ray->h.beam_width/2.));
+ angle = deg2rad(ray->h.azimuth + ((double)ray->h.beam_width/2.));
}
double lx = sin(angle);
// far left
// todo: correct range-height function
- double height = sin(d2r(ray->h.elev)) * far_dist;
+ double height = sin(deg2rad(ray->h.elev)) * far_dist;
glTexCoord2f(1.0, (double)ri/sweep->h.nrays-0.01);
glVertex3f(lx*far_dist, ly*far_dist, height);
}
- //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
glEnd();
- glPopMatrix();
+ //g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
/* Texture debug */
//glBegin(GL_QUADS);
//glEnd();
/* Print the color table */
+ glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
+ glMatrixMode(GL_PROJECTION); glLoadIdentity();
glDisable(GL_TEXTURE_2D);
- glDisable(GL_DEPTH_TEST);
- glMatrixMode(GL_MODELVIEW ); glPushMatrix(); glLoadIdentity();
- glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();
+ glEnable(GL_COLOR_MATERIAL);
glBegin(GL_QUADS);
int i;
for (i = 0; i < 256; i++) {
- glColor4ub(self->cur_colormap->data[i][0],
- self->cur_colormap->data[i][1],
- self->cur_colormap->data[i][2],
- self->cur_colormap->data[i][3]);
+ glColor4ubv(self->cur_colormap->data[i]);
glVertex3f(-1.0, (float)((i ) - 256/2)/(256/2), 0.0); // bot left
glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right
glVertex3f(-0.9, (float)((i ) - 256/2)/(256/2), 0.0); // bot right
}
glEnd();
- glEnable(GL_DEPTH_TEST);
- glEnable(GL_ALPHA_TEST);
- glMatrixMode(GL_PROJECTION); glPopMatrix();
- glMatrixMode(GL_MODELVIEW ); glPopMatrix();
}
+
+
+/****************
+ * GObject code *
+ ****************/
+/* Plugin init */
+static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
+ gis_plugin_radar_plugin_init));
+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 */
+static void gis_plugin_radar_init(GisPluginRadar *self)
+{
+ g_debug("GisPluginRadar: class_init");
+ /* Set defaults */
+ self->soup = NULL;
+ self->cur_triangles = NULL;
+ self->cur_num_triangles = 0;
+
+ self->config_body = gtk_alignment_new(0, 0, 1, 1);
+ gtk_container_set_border_width(GTK_CONTAINER(self->config_body), 5);
+ gtk_container_add(GTK_CONTAINER(self->config_body), gtk_label_new("No radar loaded"));
+}
+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);
+ /* Drop references */
+ G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+}
+static void gis_plugin_radar_finalize(GObject *gobject)
+{
+ g_debug("GisPluginRadar: finalize");
+ GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+ /* Free data */
+ G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
+
+}
+static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+{
+ g_debug("GisPluginRadar: class_init");
+ GObjectClass *gobject_class = (GObjectClass*)klass;
+ gobject_class->dispose = gis_plugin_radar_dispose;
+ gobject_class->finalize = gis_plugin_radar_finalize;
+}
+
projects / aweather / blobdiff