/*
- * 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"
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
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)
_load_radar_gui(self, radar);
}
-
-/*****************
- * ASync helpers *
- *****************/
typedef struct {
GisPluginRadar *self;
gchar *radar_file;
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");
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;
self->location_changed_id = g_signal_connect(viewer, "location-changed",
G_CALLBACK(_on_location_changed), self);
- /* Add renderers */
- GisCallback *callback;
+ 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);
+ }
- callback = gis_callback_new(_draw_radar, self);
- gis_viewer_add(viewer, GIS_OBJECT(callback), GIS_LEVEL_WORLD, TRUE);
+ /* Add renderers */
+ GisCallback *radar_cb = gis_callback_new(_draw_radar, self);
+ GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
- 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