/*
- * 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 <math.h>
#include <rsl.h>
-#include <gis/gis.h>
+#include <gis.h>
#include "radar.h"
-#include "marching.h"
#include "../aweather-location.h"
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]/2; // 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
static void _load_sweep(GisPluginRadar *self, Sweep *sweep)
{
GisViewer *viewer = self->viewer;
- gis_viewer_begin(viewer);
self->cur_sweep = sweep;
int height, width;
guint8 *data;
GL_RGBA, GL_UNSIGNED_BYTE, data);
g_free(data);
gtk_widget_queue_draw(GTK_WIDGET(viewer));
- gis_viewer_end(viewer);
}
static void _load_colormap(GisPluginRadar *self, gchar *table)
gtk_widget_show_all(table);
}
-static void _gis_plugin_radar_grid_set(GRIDCELL *grid, int gi, Ray *ray, int bi)
-{
- 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);
-}
-
/* Load a radar from a decompressed file */
static void _load_radar(GisPluginRadar *self, gchar *radar_file)
{
}
g_free(site);
-#ifdef MARCHING
- /* Load the surface */
- if (self->cur_triangles) {
- g_free(self->cur_triangles);
- self->cur_triangles = NULL;
- }
- self->cur_num_triangles = 0;
- int x = 1;
- for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
- if (radar->v[vi] == NULL) continue;
-
- 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);
-
- /* 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;
-
- /* 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)
- }
-#endif
-
/* Load the first sweep by default */
if (radar->h.nvolumes < 1 || radar->v[0]->h.nsweeps < 1) {
g_warning("No sweeps found\n");
g_free(message);
}
g_child_watch_add(pid, _decompressed_cb, udata);
- self->soup = NULL;
}
static void _set_radar(GisPluginRadar *self, const char *site, const char *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);
gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
/* Start loading the new radar */
- if (self->soup) {
- soup_session_abort(self->soup);
- self->soup = NULL;
+ soup_session_abort(self->http->soup);
+ /* 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;
+ gchar *path = gis_http_fetch(self->http, uri, local, mode, _cache_chunk_cb, self);
+ if (path) {
+ _cache_done_cb(path, TRUE, self);
+ g_free(path);
}
- 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);
}
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);
}
/* 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);
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_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
}
projects / aweather / blobdiff