X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fplugins%2Fradar.c;h=1f34fb34ba276330a317341769076dccde8bbb16;hb=0710ad564f97bf0e8aa3460fcb79110623d46544;hp=1bb9e340c018a3ab1955973b990ffa51b0291365;hpb=a9b6cd4bb2b4b9a424fa63843a3fbcef05429c88;p=aweather diff --git a/src/plugins/radar.c b/src/plugins/radar.c index 1bb9e34..1f34fb3 100644 --- a/src/plugins/radar.c +++ b/src/plugins/radar.c @@ -32,22 +32,7 @@ #include "level2.h" #include "../aweather-location.h" -GtkWidget *_gtk_check_label_new(const gchar *text, gboolean state, - GCallback on_clicked, gpointer user_data) -{ - GtkWidget *hbox = gtk_hbox_new(FALSE, 0); - GtkWidget *check = gtk_check_button_new(); - GtkWidget *label = gtk_label_new(text); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), state); - g_signal_connect_swapped(check , "clicked", - G_CALLBACK(on_clicked), user_data); - gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); - gtk_box_pack_end(GTK_BOX(hbox), check , FALSE, FALSE, 0); - gtk_widget_show_all(hbox); - return hbox; -} - -void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new) +static void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new) { GtkWidget *old = gtk_bin_get_child(bin); if (old) @@ -94,7 +79,6 @@ struct _RadarSite { /* Information */ city_t *city; GritsMarker *marker; // Map marker for grits - gpointer *marker_ref; // Reference to maker /* Stuff from the parents */ GritsViewer *viewer; @@ -107,7 +91,6 @@ struct _RadarSite { RadarSiteStatus status; // Loading status for the site GtkWidget *config; AWeatherLevel2 *level2; // The Level2 structure for the current volume - gpointer level2_ref; // GritsViewer reference to the added radar /* Internal data */ time_t time; // Current timestamp of the level2 @@ -135,7 +118,8 @@ gboolean _site_update_end(gpointer _site) RadarSite *site = _site; if (site->message) { g_warning("RadarSite: update_end - %s", site->message); - _gtk_bin_set_child(GTK_BIN(site->config), gtk_label_new(site->message)); + _gtk_bin_set_child(GTK_BIN(site->config), + gtk_label_new(site->message)); } else { _gtk_bin_set_child(GTK_BIN(site->config), aweather_level2_get_config(site->level2)); @@ -188,15 +172,15 @@ gpointer _site_update_thread(gpointer _site) /* Load and add new volume */ g_debug("RadarSite: update_thread - load - %s", site->city->code); site->level2 = aweather_level2_new_from_file( - site->viewer, colormaps, file, site->city->code); + file, site->city->code, colormaps); g_free(file); if (!site->level2) { site->message = "Load failed"; goto out; } - GRITS_OBJECT(site->level2)->hidden = site->hidden; - site->level2_ref = grits_viewer_add(site->viewer, - GRITS_OBJECT(site->level2), GRITS_LEVEL_WORLD, TRUE); + grits_object_hide(GRITS_OBJECT(site->level2), site->hidden); + grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2), + GRITS_LEVEL_WORLD, TRUE); out: g_idle_add(_site_update_end, site); @@ -219,9 +203,9 @@ void _site_update(RadarSite *site) /* Remove old volume */ g_debug("RadarSite: update - remove - %s", site->city->code); - if (site->level2_ref) { - grits_viewer_remove(site->viewer, site->level2_ref); - site->level2_ref = NULL; + if (site->level2) { + grits_viewer_remove(site->viewer, site->level2); + site->level2 = NULL; } /* Fork loading right away so updating the @@ -247,32 +231,23 @@ void radar_site_unload(RadarSite *site) gtk_widget_destroy(site->config); /* Remove radar */ - if (site->level2_ref) { - grits_viewer_remove(site->viewer, site->level2_ref); - site->level2_ref = NULL; + if (site->level2) { + grits_viewer_remove(site->viewer, site->level2); + site->level2 = NULL; } site->status = STATUS_UNLOADED; } -void radar_site_toggle(RadarSite *site) -{ - site->hidden = !site->hidden; - if (site->level2) { - GRITS_OBJECT(site->level2)->hidden = site->hidden; - gtk_widget_queue_draw(GTK_WIDGET(site->viewer)); - } -} - void radar_site_load(RadarSite *site) { g_debug("RadarSite: load %s", site->city->code); /* Add tab page */ site->config = gtk_alignment_new(0, 0, 1, 1); + g_object_set_data(G_OBJECT(site->config), "site", site); gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig), site->config, - _gtk_check_label_new(site->city->name, !site->hidden, - G_CALLBACK(radar_site_toggle), site)); + gtk_label_new(site->city->name)); gtk_widget_show_all(site->config); /* Set up radar loading */ @@ -287,7 +262,7 @@ void _site_on_location_changed(GritsViewer *viewer, gdouble lat, gdouble lon, gdouble elev, gpointer _site) { - static gdouble min_dist = EARTH_R / 20; + static gdouble min_dist = EARTH_R / 30; RadarSite *site = _site; /* Calculate distance, could cache xyz values */ @@ -310,8 +285,8 @@ gboolean _site_add_marker(gpointer _site) site->marker = grits_marker_new(site->city->name); GRITS_OBJECT(site->marker)->center = site->city->pos; GRITS_OBJECT(site->marker)->lod = EARTH_R*site->city->lod; - site->marker_ref = grits_viewer_add(site->viewer, - GRITS_OBJECT(site->marker), GRITS_LEVEL_OVERLAY, FALSE); + grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker), + GRITS_LEVEL_OVERLAY, FALSE); return FALSE; } RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, @@ -330,7 +305,6 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, /* Add marker */ g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL); - /* Connect signals */ site->location_id = g_signal_connect(viewer, "location-changed", G_CALLBACK(_site_on_location_changed), site); @@ -340,7 +314,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig, void radar_site_free(RadarSite *site) { radar_site_unload(site); - grits_viewer_remove(site->viewer, site->marker_ref); + grits_viewer_remove(site->viewer, site->marker); if (site->location_id) g_signal_handler_disconnect(site->viewer, site->location_id); grits_http_free(site->http); @@ -369,7 +343,6 @@ struct _RadarConus { gchar *path; GritsTile *tile[2]; - gpointer *tile_ref[2]; guint time_id; // "time-changed" callback ID guint refresh_id; // "refresh" callback ID @@ -557,15 +530,6 @@ void _conus_update(RadarConus *conus) g_thread_create(_conus_update_thread, conus, FALSE, NULL); } -void radar_conus_toggle(RadarConus *conus) -{ - GRITS_OBJECT(conus->tile[0])->hidden = - !GRITS_OBJECT(conus->tile[0])->hidden; - GRITS_OBJECT(conus->tile[1])->hidden = - !GRITS_OBJECT(conus->tile[1])->hidden; - gtk_widget_queue_draw(GTK_WIDGET(conus->viewer)); -} - RadarConus *radar_conus_new(GtkWidget *pconfig, GritsViewer *viewer, GritsHttp *http) { @@ -582,19 +546,18 @@ RadarConus *radar_conus_new(GtkWidget *pconfig, conus->tile[1] = grits_tile_new(NULL, CONUS_NORTH, south, east, mid); conus->tile[0]->zindex = 2; conus->tile[1]->zindex = 1; - conus->tile_ref[0] = grits_viewer_add(viewer, - GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE); - conus->tile_ref[1] = grits_viewer_add(viewer, - GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE); + grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE); + grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE); conus->time_id = g_signal_connect_swapped(viewer, "time-changed", G_CALLBACK(_conus_update), conus); conus->refresh_id = g_signal_connect_swapped(viewer, "refresh", G_CALLBACK(_conus_update), conus); + g_object_set_data(G_OBJECT(conus->config), "conus", conus); gtk_notebook_append_page(GTK_NOTEBOOK(pconfig), conus->config, - _gtk_check_label_new("Conus", TRUE, - G_CALLBACK(radar_conus_toggle), conus)); + gtk_label_new("Conus")); + _conus_update(conus); return conus; } @@ -606,12 +569,11 @@ void radar_conus_free(RadarConus *conus) for (int i = 0; i < 2; i++) { GritsTile *tile = conus->tile[i]; - gpointer ref = conus->tile_ref[i]; if (tile->data) { glDeleteTextures(1, tile->data); g_free(tile->data); } - grits_viewer_remove(conus->viewer, ref); + grits_viewer_remove(conus->viewer, tile); } g_object_unref(conus->viewer); @@ -624,11 +586,8 @@ void radar_conus_free(RadarConus *conus) ********************/ static void _draw_hud(GritsCallback *callback, GritsOpenGL *opengl, gpointer _self) { - /* TODO, pick correct colormaps */ - AWeatherColormap *colormap = &colormaps[0]; - g_debug("GritsPluginRadar: _draw_hud"); - /* Print the color table */ + /* Setup OpenGL */ glMatrixMode(GL_MODELVIEW ); glLoadIdentity(); glMatrixMode(GL_PROJECTION); glLoadIdentity(); glDisable(GL_TEXTURE_2D); @@ -636,16 +595,81 @@ static void _draw_hud(GritsCallback *callback, GritsOpenGL *opengl, gpointer _se glDisable(GL_CULL_FACE); glDisable(GL_LIGHTING); glEnable(GL_COLOR_MATERIAL); - glBegin(GL_QUADS); - int i; - for (i = 0; i < 256; i++) { - glColor4ubv(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 + + GHashTableIter iter; + gpointer name, _site; + GritsPluginRadar *self = GRITS_PLUGIN_RADAR(_self); + g_hash_table_iter_init(&iter, self->sites); + while (g_hash_table_iter_next(&iter, &name, &_site)) { + /* Pick correct colormaps */ + RadarSite *site = _site; + if (site->hidden || !site->level2) + continue; + AWeatherColormap *colormap = site->level2->sweep_colors; + + /* Print the color table */ + glBegin(GL_QUADS); + int len = colormap->len; + for (int i = 0; i < len; i++) { + glColor4ubv(colormap->data[i]); + glVertex3f(-1.0, (float)((i ) - len/2)/(len/2), 0.0); // bot left + glVertex3f(-1.0, (float)((i+1) - len/2)/(len/2), 0.0); // top left + glVertex3f(-0.9, (float)((i+1) - len/2)/(len/2), 0.0); // top right + glVertex3f(-0.9, (float)((i ) - len/2)/(len/2), 0.0); // bot right + } + glEnd(); + } +} + +static void _load_colormap(gchar *filename, AWeatherColormap *cm) +{ + g_debug("GritsPluginRadar: _load_colormap - %s", filename); + FILE *file = g_fopen(filename, "r"); + if (!file) + g_error("GritsPluginRadar: open failed"); + guint8 color[4]; + GArray *array = g_array_sized_new(FALSE, TRUE, sizeof(color), 256); + fgets(cm->name, sizeof(cm->name), file); + fscanf(file, "%f\n", &cm->scale); + fscanf(file, "%f\n", &cm->shift); + int r, g, b, a; + while (fscanf(file, "%d %d %d %d\n", &r, &g, &b, &a) == 4) { + color[0] = r; + color[1] = g; + color[2] = b; + color[3] = a; + g_array_append_val(array, color); + } + cm->len = (gint )array->len; + cm->data = (void*)array->data; + g_array_free(array, FALSE); +} + +static void _update_hidden(GtkNotebook *notebook, + GtkNotebookPage *page, guint page_num, gpointer viewer) +{ + g_debug("GritsPluginRadar: _update_hidden - 0..%d = %d", + gtk_notebook_get_n_pages(notebook), page_num); + + for (gint i = 0; i < gtk_notebook_get_n_pages(notebook); i++) { + gboolean is_hidden = (i != page_num); + GtkWidget *config = gtk_notebook_get_nth_page(notebook, i); + RadarConus *conus = g_object_get_data(G_OBJECT(config), "conus"); + RadarSite *site = g_object_get_data(G_OBJECT(config), "site"); + + /* Conus */ + if (conus) { + grits_object_hide(GRITS_OBJECT(conus->tile[0]), is_hidden); + grits_object_hide(GRITS_OBJECT(conus->tile[1]), is_hidden); + } else if (site) { + site->hidden = is_hidden; + if (site->level2) + grits_object_hide(GRITS_OBJECT(site->level2), is_hidden); + } else { + g_warning("GritsPluginRadar: _update_hidden - no site or counus found"); + } } - glEnd(); + gtk_widget_queue_draw(GTK_WIDGET(viewer)); } /* Methods */ @@ -657,9 +681,13 @@ GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs) self->viewer = viewer; self->prefs = prefs; + /* Setup page switching */ + self->tab_id = g_signal_connect(self->config, "switch-page", + G_CALLBACK(_update_hidden), viewer); + /* Load HUD */ - GritsCallback *hud_cb = grits_callback_new(_draw_hud, self); - self->hud_ref = grits_viewer_add(viewer, GRITS_OBJECT(hud_cb), GRITS_LEVEL_HUD, FALSE); + self->hud = grits_callback_new(_draw_hud, self); + grits_viewer_add(viewer, GRITS_OBJECT(self->hud), GRITS_LEVEL_HUD, FALSE); /* Load Conus */ self->conus = radar_conus_new(self->config, self->viewer, self->conus_http); @@ -706,14 +734,24 @@ static void grits_plugin_radar_init(GritsPluginRadar *self) self->sites = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)radar_site_free); self->config = gtk_notebook_new(); + + /* Load colormaps */ + for (int i = 0; colormaps[i].file; i++) { + gchar *file = g_build_filename(PKGDATADIR, + "colors", colormaps[i].file, NULL); + _load_colormap(file, &colormaps[i]); + g_free(file); + } + /* Need to position on the top because of Win32 bug */ - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_BOTTOM); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_LEFT); } static void grits_plugin_radar_dispose(GObject *gobject) { g_debug("GritsPluginRadar: dispose"); GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject); - grits_viewer_remove(self->viewer, self->hud_ref); + g_signal_handler_disconnect(self->config, self->tab_id); + grits_viewer_remove(self->viewer, self->hud); radar_conus_free(self->conus); /* Drop references */ G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);