X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugin-radar.c;h=5c1c46ef850a8df5eb7b58c21604887f06c674d6;hp=4e4376de7818888c8eb2f4443cf50c6090849de1;hb=cffda44fc89493df2494b57043ba350db20b7fd3;hpb=472b8362101f7d2712a32a30af3c4fd7b5637aa4
diff --git a/src/plugin-radar.c b/src/plugin-radar.c
index 4e4376d..5c1c46e 100644
--- a/src/plugin-radar.c
+++ b/src/plugin-radar.c
@@ -115,32 +115,54 @@ static void load_radar_gui(Radar *radar)
if (child)
gtk_widget_destroy(child);
- GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
- GtkWidget *button = NULL;
- int vi = 0, si = 0;
- for (vi = 0; vi < radar->h.nvolumes; vi++) {
+ guint rows = 1, cols = 1, cur_cols;
+ gchar row_label_str[64], col_label_str[64], button_str[64];
+ GtkWidget *row_label, *col_label, *button = NULL;
+ GtkWidget *table = gtk_table_new(rows, cols, FALSE);
+
+ for (guint vi = 0; vi < radar->h.nvolumes; vi++) {
Volume *vol = radar->v[vi];
if (vol == NULL) continue;
- GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
- for (si = 0; si < vol->h.nsweeps; si++) {
+ rows++; cols = 1;
+
+ /* Row label */
+ g_snprintf(row_label_str, 64, "%s:", vol->h.type_str);
+ row_label = gtk_label_new(row_label_str);
+ gtk_label_set_use_markup(GTK_LABEL(row_label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(row_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(table), row_label,
+ 0,1, rows-1,rows, GTK_FILL,GTK_FILL, 5,0);
+
+ for (guint si = 0; si < vol->h.nsweeps; si++) {
Sweep *sweep = vol->sweep[si];
- if (sweep == NULL) continue;
- char *label = g_strdup_printf("Tilt: %.2f (%s)",
- sweep->h.elev, vol->h.type_str);
- button = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(button), label);
+ if (sweep == NULL || sweep->h.elev == 0) continue;
+ cols++;
+
+ /* Column label */
+ g_object_get(table, "n-columns", &cur_cols, NULL);
+ if (cols > cur_cols) {
+ g_snprintf(col_label_str, 64, "%.2f°", sweep->h.elev);
+ col_label = gtk_label_new(col_label_str);
+ gtk_label_set_use_markup(GTK_LABEL(col_label), TRUE);
+ gtk_widget_set_size_request(col_label, 40, -1);
+ gtk_table_attach(GTK_TABLE(table), col_label,
+ cols-1,cols, 0,1, GTK_FILL,GTK_FILL, 0,0);
+ }
+
+ /* Button */
+ button = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(button));
+ gtk_widget_set_size_request(button, -1, 22);
g_object_set(button, "draw-indicator", FALSE, NULL);
g_signal_connect_swapped(button, "clicked",
G_CALLBACK(load_color_table), vol->h.type_str);
g_signal_connect_swapped(button, "clicked",
G_CALLBACK(load_sweep), sweep);
- gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, TRUE, 0);
- g_free(label);
+ gtk_table_attach(GTK_TABLE(table), button,
+ cols-1,cols, rows-1,rows, GTK_FILL,GTK_FILL, 0,0);
}
- gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
}
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body), hbox);
- gtk_widget_show_all(hbox);
+ gtk_container_add(GTK_CONTAINER(config_body), table);
+ gtk_widget_show_all(table);
}
/* Load a radar from a file */
@@ -191,12 +213,13 @@ static void load_radar_rsl(GPid pid, gint status, gpointer _path)
}
/* decompress a radar file, then chain to the actuall loading function */
-static void load_radar(char *path, gpointer user_data)
+static void load_radar(char *path, gboolean updated, gpointer user_data)
{
char *raw = g_strconcat(path, ".raw", NULL);
- if (g_file_test(raw, G_FILE_TEST_EXISTS)) {
+ if (!updated) {
load_radar_rsl(0, 0, raw);
} else {
+ g_message("File updated, decompressing..");
char *argv[] = {"wsr88ddec", path, raw, NULL};
GPid pid;
GError *error = NULL;
@@ -220,10 +243,50 @@ static void load_radar(char *path, gpointer user_data)
}
}
+static void update_times(char *site, char **last_time)
+{
+ char *list_uri = g_strdup_printf(
+ "http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list",
+ site);
+ GFile *list = g_file_new_for_uri(list_uri);
+ g_free(list_uri);
+
+ gchar *data;
+ gsize length;
+ GError *error = NULL;
+ g_file_load_contents(list, NULL, &data, &length, NULL, &error);
+ g_object_unref(list);
+ if (error) {
+ g_warning("Error loading list for %s: %s", site, error->message);
+ g_error_free(error);
+ return;
+ }
+ gchar **lines = g_strsplit(data, "\n", -1);
+ GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
+ GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
+ gtk_list_store_clear(lstore);
+ GtkTreeIter iter;
+ for (int i = 0; lines[i] && lines[i][0]; i++) {
+ // format: `841907 KABR_20090510_0159'
+ //g_message("\tadding %p [%s]", lines[i], lines[i]);
+ char **parts = g_strsplit(lines[i], " ", 2);
+ char *time = parts[1]+5;
+ gtk_list_store_insert(lstore, &iter, 0);
+ gtk_list_store_set(lstore, &iter, 0, time, -1);
+ g_strfreev(parts);
+ }
+
+ if (last_time)
+ gtk_tree_model_get(GTK_TREE_MODEL(lstore), &iter, 0, last_time, -1);
+
+ g_free(data);
+ g_strfreev(lines);
+}
+
/*************
* Callbacks *
*************/
-static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
+static gboolean on_expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
{
g_message("radar:expose");
if (cur_sweep == NULL)
@@ -239,16 +302,20 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
glDisable(GL_ALPHA_TEST);
glColor4f(1,1,1,1);
glBegin(GL_QUAD_STRIP);
- for (int ri = 0; ri <= sweep->h.nrays+1; ri++) {
- /* Do the first sweep twice to complete the last Quad */
- Ray *ray = sweep->ray[ri % sweep->h.nrays];
-
- /* right and left looking out from radar */
- double left = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0;
- //double right = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0;
+ 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 = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0;
+ } else {
+ /* Do the right side of the last sweep */
+ ray = sweep->ray[ri-1];
+ angle = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0;
+ }
- double lx = sin(left);
- double ly = cos(left);
+ double lx = sin(angle);
+ double ly = cos(angle);
double near_dist = ray->h.range_bin1;
double far_dist = ray->h.nbins*ray->h.gate_size + ray->h.range_bin1;
@@ -299,63 +366,39 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
return FALSE;
}
-static void set_time(AWeatherView *view, char *time, gpointer user_data)
+static void on_time_changed(AWeatherView *view, char *time, gpointer user_data)
{
g_message("radar:setting time");
// format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323
char *site = aweather_view_get_location(view);
char *base = "http://mesonet.agron.iastate.edu/data/";
char *path = g_strdup_printf("nexrd2/raw/K%s/K%s_%s", site, site, time);
- //g_message("caching %s/%s", base, path);
+
+ radar = NULL;
cur_sweep = NULL; // Clear radar
gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
- cache_file(base, path, load_radar, NULL);
+
+ cache_file(base, path, AWEATHER_AUTOMATIC, load_radar, NULL);
g_free(path);
}
-static void set_site(AWeatherView *view, char *site, gpointer user_data)
+static void on_location_changed(AWeatherView *view, char *site, gpointer user_data)
{
g_message("Loading wsr88d list for %s", site);
- cur_sweep = NULL; // Clear radar
+ char *time = NULL;
+ update_times(site, &time);
+ aweather_view_set_time(view, time);
- char *list_uri = g_strdup_printf(
- "http://mesonet.agron.iastate.edu/data/nexrd2/raw/K%s/dir.list",
- site);
- GFile *list = g_file_new_for_uri(list_uri);
- g_free(list_uri);
+ g_free(time);
+}
- gchar *data;
- gsize length;
- GError *error = NULL;
- gtk_widget_queue_draw(aweather_gui_get_widget(gui, "drawing"));
- g_file_load_contents(list, NULL, &data, &length, NULL, &error);
- g_object_unref(list);
- if (error) {
- g_warning("Error loading list for %s: %s", site, error->message);
- g_error_free(error);
- return;
- }
- gchar **lines = g_strsplit(data, "\n", -1);
- GtkTreeView *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
- GtkListStore *lstore = GTK_LIST_STORE(gtk_tree_view_get_model(tview));
- gtk_list_store_clear(lstore);
- radar = NULL;
- GtkTreeIter iter;
- for (int i = 0; lines[i] && lines[i][0]; i++) {
- // format: `841907 KABR_20090510_0159'
- //g_message("\tadding %p [%s]", lines[i], lines[i]);
- char **parts = g_strsplit(lines[i], " ", 2);
- char *time = parts[1]+5;
- gtk_list_store_insert(lstore, &iter, 0);
- gtk_list_store_set(lstore, &iter, 0, time, -1);
- g_strfreev(parts);
- }
+static void on_refresh(AWeatherView *view, gpointer user_data)
+{
+ char *site = aweather_view_get_location(view);
char *time = NULL;
- gtk_tree_model_get(GTK_TREE_MODEL(lstore), &iter, 0, &time, -1);
+ update_times(site, &time);
aweather_view_set_time(view, time);
g_free(time);
- g_free(data);
- g_strfreev(lines);
}
/* Init */
@@ -367,18 +410,16 @@ gboolean radar_init(AWeatherGui *_gui)
AWeatherView *view = aweather_gui_get_view(gui);
/* Add configuration tab */
- config_body = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(config_body),
- gtk_label_new("No radar loaded"));
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(config_body),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_notebook_prepend_page(GTK_NOTEBOOK(config),
- config_body, gtk_label_new("Radar"));
+ config_body = gtk_alignment_new(0, 0, 1, 1);
+ gtk_container_set_border_width(GTK_CONTAINER(config_body), 5);
+ gtk_container_add(GTK_CONTAINER(config_body), gtk_label_new("No radar loaded"));
+ gtk_notebook_prepend_page(GTK_NOTEBOOK(config), config_body, gtk_label_new("Radar"));
/* Set up OpenGL Stuff */
- g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
- g_signal_connect(view, "location-changed", G_CALLBACK(set_site), NULL);
- g_signal_connect(view, "time-changed", G_CALLBACK(set_time), NULL);
+ g_signal_connect(drawing, "expose-event", G_CALLBACK(on_expose), NULL);
+ g_signal_connect(view, "location-changed", G_CALLBACK(on_location_changed), NULL);
+ g_signal_connect(view, "time-changed", G_CALLBACK(on_time_changed), NULL);
+ g_signal_connect(view, "refresh", G_CALLBACK(on_refresh), NULL);
return TRUE;
}