/*
- * 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
*/
#include <config.h>
+#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <gtk/gtkgl.h>
#include <gio/gio.h>
#include <math.h>
#include <rsl.h>
-#include <gis/gis.h>
+#include <gis.h>
#include "radar.h"
-#include "marching.h"
#include "../aweather-location.h"
static void _bscan_sweep(GisPluginRadar *self, Sweep *sweep, colormap_t *colormap,
guint8 **data, int *width, int *height)
{
+ g_debug("GisPluginRadar: _bscan_sweep - %p, %p, %p",
+ sweep, colormap, data);
/* Calculate max number of bins */
int max_bins = 0;
for (int i = 0; i < sweep->h.nrays; i++)
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
}
/* Load a sweep as the active texture */
-static void _load_sweep(GisPluginRadar *self, Sweep *sweep)
+static gboolean _load_sweep(gpointer _self)
{
- GisViewer *viewer = self->viewer;
- gis_viewer_begin(viewer);
- self->cur_sweep = sweep;
+ GisPluginRadar *self = _self;
+ if (!self->cur_sweep)
+ return FALSE;
+ g_debug("GisPluginRadar: _load_sweep - %p", self->cur_sweep);
int height, width;
guint8 *data;
- _bscan_sweep(self, sweep, self->cur_colormap, &data, &width, &height);
+ _bscan_sweep(self, self->cur_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);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
g_free(data);
- gtk_widget_queue_draw(GTK_WIDGET(viewer));
- gis_viewer_end(viewer);
+ gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+ return FALSE;
}
+/* Load the colormap for a sweep */
static void _load_colormap(GisPluginRadar *self, gchar *table)
{
+ g_debug("GisPluginRadar: _load_colormap - %s", table);
/* Set colormap so we can draw it on expose */
for (int i = 0; colormaps[i].name; i++)
if (g_str_equal(colormaps[i].name, table))
self->cur_colormap = &colormaps[i];
}
-/* Add selectors to the config area for the sweeps */
+
+/***************
+ * GUI loading *
+ ***************/
+/* Setup a loading screen in the tab */
+static void _load_gui_pre(GisPluginRadar *self)
+{
+ g_debug("GisPluginRadar: _load_gui_pre");
+
+ gdk_threads_enter();
+ /* Set up progress bar */
+ GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
+ if (child)
+ gtk_widget_destroy(child);
+
+ GtkWidget *vbox = gtk_vbox_new(FALSE, 10);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
+ self->progress_bar = gtk_progress_bar_new();
+ self->progress_label = gtk_label_new("Loading radar...");
+ gtk_box_pack_start(GTK_BOX(vbox), self->progress_bar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), self->progress_label, FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(self->config_body), vbox);
+ gtk_widget_show_all(self->config_body);
+
+ /* Clear radar */
+ if (self->cur_radar)
+ RSL_free_radar(self->cur_radar);
+ self->cur_radar = NULL;
+ self->cur_sweep = NULL;
+ gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+ gdk_threads_leave();
+}
+
+/* Update pogress bar of loading screen */
+static void _load_gui_update(char *path, goffset cur, goffset total, gpointer _self)
+{
+ GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+ double percent = (double)cur/total;
+
+ //g_debug("GisPluginRadar: cache_chunk_cb - %lld/%lld = %.2f%%",
+ // cur, total, percent*100);
+
+ gdk_threads_enter();
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(self->progress_bar), MIN(percent, 1.0));
+
+ gchar *msg = g_strdup_printf("Loading radar... %5.1f%% (%.2f/%.2f MB)",
+ percent*100, (double)cur/1000000, (double)total/1000000);
+ gtk_label_set_text(GTK_LABEL(self->progress_label), msg);
+ gdk_threads_leave();
+ g_free(msg);
+}
+
+/* Update pogress bar of loading screen */
+static void _load_gui_error(GisPluginRadar *self, gchar *error)
+{
+ gchar *msg = g_strdup_printf(
+ "GisPluginRadar: error loading radar - %s", error);
+ g_warning("%s", msg);
+ gdk_threads_enter();
+ 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(msg));
+ gtk_widget_show_all(self->config_body);
+ gdk_threads_leave();
+ g_free(msg);
+}
+
+/* Clear loading screen and add sweep selectors */
static void _on_sweep_clicked(GtkRadioButton *button, gpointer _self);
-static void _load_radar_gui(GisPluginRadar *self, Radar *radar)
+static void _load_gui_success(GisPluginRadar *self, Radar *radar)
{
+ g_debug("GisPluginRadar: _load_gui_success - %p", radar);
/* Clear existing items */
+ gdk_threads_enter();
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), table);
gtk_widget_show_all(table);
+ gdk_threads_leave();
}
-static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
+
+/*****************
+ * Radar caching *
+ *****************/
+/* Download a compressed radar file from the remote server */
+static gchar *_download_radar(GisPluginRadar *self, const gchar *site, const gchar *time)
{
- Range range = ray->range[bi];
-
- 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;
-
- guint8 val = (guint8)ray->h.f(ray->range[bi]);
- if (val == BADVAL || val == RFVAL || val == APFLAG ||
- val == NOTFOUND_H || val == NOTFOUND_V || val == NOECHO ||
- val > 80)
- val = 0;
- grid->val[gi] = (float)val;
- //g_debug("(%.2f,%.2f,%.2f) - (%.0f,%.0f,%.0f) = %d",
- // angle, tilt, dist,
- // grid->p[gi].x,
- // grid->p[gi].y,
- // grid->p[gi].z,
- // val);
+ g_debug("GisPluginRadar: _download_radar - %s, %s", site, time);
+
+ /* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
+ gchar *base = gis_prefs_get_string(self->prefs, "aweather/nexrad_url", NULL);
+ gchar *local = g_strdup_printf("%s/%s_%s", site, site, time);
+ gchar *uri = g_strconcat(base, "/", local, NULL);
+ GisCacheType mode = gis_viewer_get_offline(self->viewer) ? GIS_LOCAL : GIS_UPDATE;
+ return gis_http_fetch(self->http, uri, local, mode, _load_gui_update, self);
}
-/* Load a radar from a decompressed file */
-static void _load_radar(GisPluginRadar *self, gchar *radar_file)
+/* Decompress a radar file using wsr88dec */
+static gchar *_decompress_radar(GisPluginRadar *self, char *compressed)
{
- char *dir = g_path_get_dirname(radar_file);
- char *site = g_path_get_basename(dir);
- g_free(dir);
- g_debug("GisPluginRadar: load_radar - Loading new radar");
- RSL_read_these_sweeps("all", NULL);
- Radar *radar = self->cur_radar = RSL_wsr88d_to_radar(radar_file, site);
- if (radar == NULL) {
- g_warning("fail to load radar: path=%s, site=%s", radar_file, site);
- g_free(site);
- return;
+ char *decompressed = g_strconcat(compressed, ".raw", NULL);
+ if (g_file_test(decompressed, G_FILE_TEST_EXISTS)) {
+ struct stat comp, dec;
+ g_stat(compressed, &comp);
+ g_stat(decompressed, &dec);
+ if (dec.st_mtime >= comp.st_mtime)
+ return decompressed;
}
- g_free(site);
-
-#ifdef MARCHING
- /* Load the surface */
- if (self->cur_triangles) {
- g_free(self->cur_triangles);
- self->cur_triangles = NULL;
+ g_debug("GisPluginRadar: _decompress_radar - %s", decompressed);
+ char *argv[] = {"wsr88ddec", compressed, decompressed, NULL};
+ gint status;
+ GError *error = NULL;
+ g_spawn_sync(
+ NULL, // const gchar *working_directory
+ argv, // gchar **argv
+ NULL, // gchar **envp
+ G_SPAWN_SEARCH_PATH, // GSpawnFlags flags
+ NULL, // GSpawnChildSetupFunc child_setup
+ NULL, // gpointer user_data
+ NULL, // gchar *standard_output
+ NULL, // gchar *standard_output
+ &status, // gint *exit_status
+ &error); // GError **error
+ if (error) {
+ g_warning("GisPluginRadar: _decompress_radar - %s", error->message);
+ g_error_free(error);
+ return NULL;
}
- self->cur_num_triangles = 0;
- int x = 1;
- for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
- if (radar->v[vi] == NULL) continue;
+ if (status != 0) {
+ gchar *msg = g_strdup_printf("wsr88ddec exited with status %d", status);
+ g_warning("GisPluginRadar: _decompress_radar - %s", msg);
+ g_free(msg);
+ return NULL;
+ }
+ return decompressed;
+}
- for (guint si = 0; si+1 < radar->v[vi]->h.nsweeps; si++) {
- Sweep *sweep0 = radar->v[vi]->sweep[si+0];
- Sweep *sweep1 = radar->v[vi]->sweep[si+1];
- //g_debug("GisPluginRadar: load_radar: sweep[%3d-%3d] -- nrays = %d, %d",
- // si, si+1,sweep0->h.nrays, sweep1->h.nrays);
+/****************
+ * Misc helpers *
+ ****************/
+/* Set the radar file based on cur_site andcur_time
+ * This should be run in a separatet hread */
+static gboolean _set_radar_cb(GisPluginRadar *self)
+{
+ g_debug("GisPluginRadar: _set_radar_cb");
- /* Skip super->regular resolution switch for now */
- if (sweep0 == NULL || sweep0->h.elev == 0 ||
- sweep1 == NULL || sweep1->h.elev == 0 ||
- sweep0->h.nrays != sweep1->h.nrays)
- continue;
+ _load_gui_pre(self);
- /* We repack the arrays so that raysX[0] is always north, etc */
- Ray **rays0 = g_malloc0(sizeof(Ray*)*sweep0->h.nrays);
- Ray **rays1 = g_malloc0(sizeof(Ray*)*sweep1->h.nrays);
-
- for (guint ri = 0; ri < sweep0->h.nrays; ri++)
- rays0[(guint)(sweep0->ray[ri]->h.azimuth * sweep0->h.nrays / 360)] =
- sweep0->ray[ri];
- for (guint ri = 0; ri < sweep1->h.nrays; ri++)
- rays1[(guint)(sweep1->ray[ri]->h.azimuth * sweep1->h.nrays / 360)] =
- sweep1->ray[ri];
-
- 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,
- // rays1[ri+1]->h.nbins);
-
- for (guint bi = 0; bi+x < rays1[ri]->h.nbins; bi+=x) {
- GRIDCELL grid = {};
- _gis_plugin_radar_grid_set(&grid, 7, rays0[(ri )%sweep0->h.nrays], bi+x);
- _gis_plugin_radar_grid_set(&grid, 6, rays0[(ri+x)%sweep0->h.nrays], bi+x);
- _gis_plugin_radar_grid_set(&grid, 5, rays0[(ri+x)%sweep0->h.nrays], bi );
- _gis_plugin_radar_grid_set(&grid, 4, rays0[(ri )%sweep0->h.nrays], bi );
- _gis_plugin_radar_grid_set(&grid, 3, rays1[(ri )%sweep0->h.nrays], bi+x);
- _gis_plugin_radar_grid_set(&grid, 2, rays1[(ri+x)%sweep0->h.nrays], bi+x);
- _gis_plugin_radar_grid_set(&grid, 1, rays1[(ri+x)%sweep0->h.nrays], bi );
- _gis_plugin_radar_grid_set(&grid, 0, rays1[(ri )%sweep0->h.nrays], bi );
-
- TRIANGLE tris[10];
- int n = march_one_cube(grid, 40, tris);
-
- self->cur_triangles = g_realloc(self->cur_triangles,
- (self->cur_num_triangles+n)*sizeof(TRIANGLE));
- for (int i = 0; i < n; i++) {
- //g_debug("triangle: ");
- //g_debug("\t(%f,%f,%f)", tris[i].p[0].x, tris[i].p[0].y, tris[i].p[0].z);
- //g_debug("\t(%f,%f,%f)", tris[i].p[1].x, tris[i].p[1].y, tris[i].p[1].z);
- //g_debug("\t(%f,%f,%f)", tris[i].p[2].x, tris[i].p[2].y, tris[i].p[2].z);
- self->cur_triangles[self->cur_num_triangles+i] = tris[i];
- }
- self->cur_num_triangles += n;
- //g_debug(" ");
- }
- }
- }
- break; // Exit after first volume (reflectivity)
+ /* Download and decompress the radar */
+ gchar *compressed = _download_radar(self,
+ self->cur_site, self->cur_time);
+ if (!compressed) {
+ _load_gui_error(self, "Download failed");
+ goto fail;
+ }
+
+ /* Decompress radar */
+ gchar *decompressed = _decompress_radar(self, compressed);
+ g_free(compressed);
+ if (!decompressed) {
+ _load_gui_error(self, "Decompression failed");
+ goto fail;
+ }
+
+ /* Load the radar file */
+ g_debug("GisPluginRadar: _set_radar_cb - loading %s", decompressed);
+ RSL_read_these_sweeps("all", NULL);
+ self->cur_radar = RSL_wsr88d_to_radar(decompressed, self->cur_site);
+ g_free(decompressed);
+ if (!self->cur_radar) {
+ _load_gui_error(self, "Loading failed");
+ goto fail;
}
-#endif
/* Load the first sweep by default */
- if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) {
- g_warning("No sweeps found\n");
- } else {
- /* load first available sweep */
- for (int vi = 0; vi < radar->h.nvolumes; vi++) {
- 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]);
- break;
- }
+ Radar *radar = self->cur_radar;
+ Sweep *sweep = NULL;
+ gchar *type_str = NULL;
+ for (int vi = 0; vi < radar->h.nvolumes; vi++) {
+ 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;
+ sweep = radar->v[vi]->sweep[si];
+ type_str = radar->v[vi]->h.type_str;
break;
}
+ break;
}
-
- _load_radar_gui(self, radar);
-}
-
-
-/*****************
- * ASync helpers *
- *****************/
-typedef struct {
- GisPluginRadar *self;
- gchar *radar_file;
-} decompressed_t;
-
-static void _decompressed_cb(GPid pid, gint status, gpointer _udata)
-{
- g_debug("GisPluginRadar: decompressed_cb");
- decompressed_t *udata = _udata;
- if (status != 0) {
- g_warning("wsr88ddec exited with status %d", status);
- return;
+ if (!type_str) {
+ _load_gui_error(self, "No sweeps found");
+ goto fail;
}
- _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)
-{
- GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
- double percent = (double)cur/total;
-
- //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));
-
- gchar *msg = g_strdup_printf("Loading radar... %5.1f%% (%.2f/%.2f MB)",
- percent*100, (double)cur/1000000, (double)total/1000000);
- gtk_label_set_text(GTK_LABEL(self->progress_label), msg);
- g_free(msg);
-}
+ /* Load weep */
+ g_debug("GisPluginRadar: _set_radar_cb - setting sweep");
+ self->cur_sweep = sweep;
+ _load_colormap(self, type_str);
+ g_idle_add(_load_sweep, self);
+ _load_gui_success(self, radar);
-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);
- return;
- }
+ /* Let other threads go */
+ g_mutex_unlock(self->load_mutex);
+ return TRUE;
- decompressed_t *udata = g_malloc(sizeof(decompressed_t));
- udata->self = self;
- udata->radar_file = decompressed;
- g_debug("GisPluginRadar: cache_done_cb - File updated, decompressing..");
- char *argv[] = {"wsr88ddec", path, decompressed, NULL};
- GPid pid;
- GError *error = NULL;
- g_spawn_async(
- NULL, // const gchar *working_directory,
- argv, // gchar **argv,
- NULL, // gchar **envp,
- G_SPAWN_SEARCH_PATH|
- 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) {
- 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);
- self->soup = NULL;
+fail:
+ g_mutex_unlock(self->load_mutex);
+ return TRUE;
}
-static void _set_radar(GisPluginRadar *self, const char *site, const char *time)
+static void _set_radar(GisPluginRadar *self,
+ gchar *site, gchar *time)
{
- if (!site || !time)
+ if (site) self->cur_site = site;
+ if (time) self->cur_time = time;
+ if (!self->cur_site || !self->cur_time)
return;
- g_debug("GisPluginRadar: set_radar - %s - %s", site, time);
-
- // format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
- char *path = g_strdup_printf("nexrd2/raw/%s/%s_%s", site, site, time);
- /* Set up progress bar */
- GtkWidget *child = gtk_bin_get_child(GTK_BIN(self->config_body));
- if (child) gtk_widget_destroy(child);
-
- GtkWidget *vbox = gtk_vbox_new(FALSE, 10);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
- self->progress_bar = gtk_progress_bar_new();
- self->progress_label = gtk_label_new("Loading radar...");
- gtk_box_pack_start(GTK_BOX(vbox), self->progress_bar, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), self->progress_label, FALSE, FALSE, 0);
- gtk_container_add(GTK_CONTAINER(self->config_body), vbox);
- gtk_widget_show_all(self->config_body);
+ /* Abort any current downloads */
+ soup_session_abort(self->http->soup);
- /* Clear radar */
- if (self->cur_radar)
- RSL_free_radar(self->cur_radar);
- self->cur_radar = NULL;
- self->cur_sweep = NULL;
- gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
+ g_mutex_lock(self->load_mutex);
- /* 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", 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);
- g_free(path);
+ g_thread_create((GThreadFunc)_set_radar_cb, self, FALSE, NULL);
}
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"));
+ self->cur_sweep = g_object_get_data(G_OBJECT(button), "sweep");
+ _load_sweep(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);
- g_free(self->cur_time);
- self->cur_time = g_strdup(time);
- _set_radar(self, self->cur_site, self->cur_time);
+ _set_radar(self, self->cur_site, g_strdup(time));
}
static void _on_location_changed(GisViewer *viewer,
}
}
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);
- }
+ if (min_city && min_city != last_city)
+ _set_radar(self, min_city->code, 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 NULL;
g_debug("GisPluginRadar: _draw_radar");
Sweep *sweep = self->cur_sweep;
-#ifdef MARCHING
- /* Draw the surface */
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glDisable(GL_TEXTURE_2D);
- float light_ambient[] = {0.1f, 0.1f, 0.0f};
- float light_diffuse[] = {0.9f, 0.9f, 0.9f};
- float light_position[] = {-300000.0f, 500000.0f, 400000.0f, 1.0f};
- glLightfv(GL_LIGHT0, GL_AMBIENT, light_ambient);
- glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
- glLightfv(GL_LIGHT0, GL_POSITION, light_position);
- glEnable(GL_LIGHT0);
- glEnable(GL_LIGHTING);
- glEnable(GL_COLOR_MATERIAL);
- glColor4f(1,1,1,0.75);
- g_debug("ntri=%d", self->cur_num_triangles);
- glBegin(GL_TRIANGLES);
- for (int i = 0; i < self->cur_num_triangles; i++) {
- TRIANGLE t = self->cur_triangles[i];
- do_normal(t.p[0].x, t.p[0].y, t.p[0].z,
- t.p[1].x, t.p[1].y, t.p[1].z,
- t.p[2].x, t.p[2].y, t.p[2].z);
- glVertex3f(t.p[0].x, t.p[0].y, t.p[0].z);
- glVertex3f(t.p[1].x, t.p[1].y, t.p[1].z);
- glVertex3f(t.p[2].x, t.p[2].y, t.p[2].z);
- }
- glEnd();
- glPopMatrix();
-#endif
-
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);
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;
}
/* Add renderers */
- GisCallback *callback;
+ GisCallback *radar_cb = gis_callback_new(_draw_radar, self);
+ GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
- 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);
+ 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;
}
{
g_debug("GisPluginRadar: class_init");
/* Set defaults */
- self->soup = NULL;
- self->cur_triangles = NULL;
- self->cur_num_triangles = 0;
-
+ self->http = gis_http_new("/nexrad/level2/");
self->config_body = gtk_alignment_new(0, 0, 1, 1);
+ self->load_mutex = g_mutex_new();
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"));
}
g_debug("GisPluginRadar: finalize");
GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
/* Free data */
+ gis_http_free(self->http);
+ g_mutex_free(self->load_mutex);
G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
}
projects / aweather / blobdiff