X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis-viewer.c;h=30464e3deb2a4973f3f5a947f61b4106915bd515;hp=5041d591ffd03911d5b8d4576fc43b53b8505be1;hb=c2e39b9d64035038a19d753129cc2124b4ed1382;hpb=921d317225e75527d6f1d9fdc96b2fd1fb3f6840 diff --git a/src/gis-viewer.c b/src/gis-viewer.c index 5041d59..30464e3 100644 --- a/src/gis-viewer.c +++ b/src/gis-viewer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Andy Spencer + * Copyright (C) 2009-2010 Andy Spencer * * 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 @@ -15,21 +15,19 @@ * along with this program. If not, see . */ -#include +#include +#include +#include #include "gis-marshal.h" -#include "gis-view.h" +#include "gis-viewer.h" + +#include "gis-util.h" + /* Constants */ -enum { - PROP_0, - PROP_TIME, - PROP_SITE, - PROP_OFFLINE, -}; enum { SIG_TIME_CHANGED, - SIG_SITE_CHANGED, SIG_LOCATION_CHANGED, SIG_ROTATION_CHANGED, SIG_REFRESH, @@ -38,8 +36,12 @@ enum { }; static guint signals[NUM_SIGNALS]; + +/*********** + * Helpers * + ***********/ /* Misc helpers */ -static void _gis_view_fix_location(GisView *self) +static void _gis_viewer_fix_location(GisViewer *self) { while (self->location[0] < -90) self->location[0] += 180; while (self->location[0] > 90) self->location[0] -= 180; @@ -49,254 +51,301 @@ static void _gis_view_fix_location(GisView *self) } /* Signal helpers */ -static void _gis_view_emit_location_changed(GisView *self) +static void _gis_viewer_emit_location_changed(GisViewer *self) { g_signal_emit(self, signals[SIG_LOCATION_CHANGED], 0, self->location[0], self->location[1], self->location[2]); } -static void _gis_view_emit_rotation_changed(GisView *self) +static void _gis_viewer_emit_rotation_changed(GisViewer *self) { g_signal_emit(self, signals[SIG_ROTATION_CHANGED], 0, self->rotation[0], self->rotation[1], self->rotation[2]); } -static void _gis_view_emit_time_changed(GisView *self) +static void _gis_viewer_emit_time_changed(GisViewer *self) { g_signal_emit(self, signals[SIG_TIME_CHANGED], 0, self->time); } -static void _gis_view_emit_site_changed(GisView *self) +static void _gis_viewer_emit_refresh(GisViewer *self) { - g_signal_emit(self, signals[SIG_SITE_CHANGED], 0, - self->site); + g_signal_emit(self, signals[SIG_REFRESH], 0); } -static void _gis_world_emit_refresh(GisWorld *world) +static void _gis_viewer_emit_offline(GisViewer *self) { - g_signal_emit(world, signals[SIG_REFRESH], 0); + g_signal_emit(self, signals[SIG_OFFLINE], 0, + self->offline); } -static void _gis_world_emit_offline(GisWorld *world) + +/************* + * Callbacks * + *************/ +static gboolean on_button_press(GisViewer *self, GdkEventButton *event, gpointer _) { - g_signal_emit(world, signals[SIG_OFFLINE], 0, - world->offline); + g_debug("GisViewer: on_button_press - Grabbing focus"); + gtk_widget_grab_focus(GTK_WIDGET(self)); + return TRUE; } +static gboolean on_key_press(GisViewer *self, GdkEventKey *event, gpointer _) +{ + g_debug("GisViewer: on_key_press - key=%x, state=%x, plus=%x", + event->keyval, event->state, GDK_plus); + double lat, lon, elev, pan; + gis_viewer_get_location(self, &lat, &lon, &elev); + pan = MIN(elev/(EARTH_R/2), 30); + guint kv = event->keyval; + gdk_threads_leave(); + if (kv == GDK_Left || kv == GDK_h) gis_viewer_pan(self, 0, -pan, 0); + else if (kv == GDK_Down || kv == GDK_j) gis_viewer_pan(self, -pan, 0, 0); + else if (kv == GDK_Up || kv == GDK_k) gis_viewer_pan(self, pan, 0, 0); + else if (kv == GDK_Right || kv == GDK_l) gis_viewer_pan(self, 0, pan, 0); + else if (kv == GDK_minus || kv == GDK_o) gis_viewer_zoom(self, 10./9); + else if (kv == GDK_plus || kv == GDK_i) gis_viewer_zoom(self, 9./10); + else if (kv == GDK_H) gis_viewer_rotate(self, 0, 0, -2); + else if (kv == GDK_J) gis_viewer_rotate(self, 2, 0, 0); + else if (kv == GDK_K) gis_viewer_rotate(self, -2, 0, 0); + else if (kv == GDK_L) gis_viewer_rotate(self, 0, 0, 2); + return FALSE; +} +static void on_view_changed(GisViewer *self, + gdouble _1, gdouble _2, gdouble _3) +{ + gtk_widget_queue_draw(GTK_WIDGET(self)); +} /*********** * Methods * ***********/ -GisView *gis_view_new() -{ - g_debug("GisView: new"); - return g_object_new(GIS_TYPE_VIEW, NULL); -} - -void gis_view_set_time(GisView *self, const char *time) +void gis_viewer_set_time(GisViewer *self, const char *time) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: set_time - time=%s", time); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: set_time - time=%s", time); g_free(self->time); self->time = g_strdup(time); - _gis_view_emit_time_changed(self); + _gis_viewer_emit_time_changed(self); } -gchar *gis_view_get_time(GisView *self) +gchar *gis_viewer_get_time(GisViewer *self) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: get_time"); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: get_time"); return self->time; } -void gis_view_set_location(GisView *self, gdouble lat, gdouble lon, gdouble elev) +void gis_viewer_set_location(GisViewer *self, gdouble lat, gdouble lon, gdouble elev) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: set_location"); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: set_location"); self->location[0] = lat; self->location[1] = lon; self->location[2] = elev; - _gis_view_fix_location(self); - _gis_view_emit_location_changed(self); + _gis_viewer_fix_location(self); + _gis_viewer_emit_location_changed(self); } -void gis_view_get_location(GisView *self, gdouble *lat, gdouble *lon, gdouble *elev) +void gis_viewer_get_location(GisViewer *self, gdouble *lat, gdouble *lon, gdouble *elev) { - g_assert(GIS_IS_VIEW(self)); - //g_debug("GisView: get_location"); + g_assert(GIS_IS_VIEWER(self)); + //g_debug("GisViewer: get_location"); *lat = self->location[0]; *lon = self->location[1]; *elev = self->location[2]; } -void gis_view_pan(GisView *self, gdouble lat, gdouble lon, gdouble elev) +void gis_viewer_pan(GisViewer *self, gdouble lat, gdouble lon, gdouble elev) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: pan - lat=%8.3f, lon=%8.3f, elev=%8.3f", lat, lon, elev); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: pan - lat=%8.3f, lon=%8.3f, elev=%8.3f", lat, lon, elev); self->location[0] += lat; self->location[1] += lon; self->location[2] += elev; - _gis_view_fix_location(self); - _gis_view_emit_location_changed(self); + _gis_viewer_fix_location(self); + _gis_viewer_emit_location_changed(self); } -void gis_view_zoom(GisView *self, gdouble scale) +void gis_viewer_zoom(GisViewer *self, gdouble scale) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: zoom"); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: zoom"); self->location[2] *= scale; - _gis_view_emit_location_changed(self); + _gis_viewer_emit_location_changed(self); } -void gis_view_set_rotation(GisView *self, gdouble x, gdouble y, gdouble z) +void gis_viewer_set_rotation(GisViewer *self, gdouble x, gdouble y, gdouble z) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: set_rotation"); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: set_rotation"); self->rotation[0] = x; self->rotation[1] = y; self->rotation[2] = z; - _gis_view_emit_rotation_changed(self); + _gis_viewer_emit_rotation_changed(self); } -void gis_view_get_rotation(GisView *self, gdouble *x, gdouble *y, gdouble *z) +void gis_viewer_get_rotation(GisViewer *self, gdouble *x, gdouble *y, gdouble *z) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: get_rotation"); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: get_rotation"); *x = self->rotation[0]; *y = self->rotation[1]; *z = self->rotation[2]; } -void gis_view_rotate(GisView *self, gdouble x, gdouble y, gdouble z) +void gis_viewer_rotate(GisViewer *self, gdouble x, gdouble y, gdouble z) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: rotate - x=%.0f, y=%.0f, z=%.0f", x, y, z); + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: rotate - x=%.0f, y=%.0f, z=%.0f", x, y, z); self->rotation[0] += x; self->rotation[1] += y; self->rotation[2] += z; - _gis_view_emit_rotation_changed(self); + _gis_viewer_emit_rotation_changed(self); +} + +void gis_viewer_refresh(GisViewer *self) +{ + g_debug("GisViewer: refresh"); + _gis_viewer_emit_refresh(self); +} + +void gis_viewer_set_offline(GisViewer *self, gboolean offline) +{ + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: set_offline - %d", offline); + self->offline = offline; + _gis_viewer_emit_offline(self); +} + +gboolean gis_viewer_get_offline(GisViewer *self) +{ + g_assert(GIS_IS_VIEWER(self)); + g_debug("GisViewer: get_offline - %d", self->offline); + return self->offline; +} + +/* To be implemented by subclasses */ +void gis_viewer_center_position(GisViewer *self, + gdouble lat, gdouble lon, gdouble elev) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->center_position) + g_warning("GisViewer: center_position - Unimplemented"); + klass->center_position(self, lat, lon, elev); } -/* To be deprecated, use {get,set}_location */ -void gis_view_set_site(GisView *self, const gchar *site) +void gis_viewer_project(GisViewer *self, + gdouble lat, gdouble lon, gdouble elev, + gdouble *px, gdouble *py, gdouble *pz) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: set_site"); - g_free(self->site); - self->site = g_strdup(site); - _gis_view_emit_site_changed(self); + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->project) + g_warning("GisViewer: project - Unimplemented"); + klass->project(self, lat, lon, elev, px, py, pz); } -gchar *gis_view_get_site(GisView *self) +void gis_viewer_clear_height_func(GisViewer *self) { - g_assert(GIS_IS_VIEW(self)); - g_debug("GisView: get_site - %s", self->site); - return self->site; + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->clear_height_func) + g_warning("GisViewer: clear_height_func - Unimplemented"); + klass->clear_height_func(self); } -void gis_world_refresh(GisWorld *world) +void gis_viewer_set_height_func(GisViewer *self, GisTile *tile, + GisHeightFunc height_func, gpointer user_data, + gboolean update) { - g_debug("GisWorld: refresh"); - _gis_world_emit_refresh(world); + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->set_height_func) + g_warning("GisViewer: set_height_func - Unimplemented"); + klass->set_height_func(self, tile, height_func, user_data, update); } -void gis_world_set_offline(GisWorld *world, gboolean offline) +void gis_viewer_render_tile(GisViewer *self, GisTile *tile) { - g_assert(GIS_IS_WORLD(world)); - g_debug("GisWorld: set_offline - %d", offline); - world->offline = offline; - _gis_world_emit_offline(world); + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->render_tile) + g_warning("GisViewer: render_tile - Unimplemented"); + klass->render_tile(self, tile); } -gboolean gis_world_get_offline(GisWorld *world) +void gis_viewer_render_tiles(GisViewer *self, GisTile *root) { - g_assert(GIS_IS_WORLD(world)); - g_debug("GisWorld: get_offline - %d", world->offline); - return world->offline; + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->render_tiles) + g_warning("GisViewer: render_tiles - Unimplemented"); + klass->render_tiles(self, root); } +void gis_viewer_begin(GisViewer *self) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->begin) + g_warning("GisViewer: begin - Unimplemented"); + klass->begin(self); +} + +void gis_viewer_end(GisViewer *self) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->end) + g_warning("GisViewer: end - Unimplemented"); + klass->end(self); +} + +gpointer gis_viewer_add(GisViewer *self, GisObject *object, + gint level, gboolean sort) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->add) + g_warning("GisViewer: add - Unimplemented"); + return klass->add(self, object, level, sort); +} + +void gis_viewer_remove(GisViewer *self, gpointer ref) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->remove) + g_warning("GisViewer: remove - Unimplemented"); + klass->remove(self, ref); +} /**************** * GObject code * ****************/ -G_DEFINE_TYPE(GisView, gis_view, G_TYPE_OBJECT); -static void gis_view_init(GisView *self) +G_DEFINE_ABSTRACT_TYPE(GisViewer, gis_viewer, GTK_TYPE_DRAWING_AREA); +static void gis_viewer_init(GisViewer *self) { - g_debug("GisView: init"); + g_debug("GisViewer: init"); /* Default values */ self->time = g_strdup(""); - self->site = g_strdup(""); self->location[0] = 40; self->location[1] = -100; self->location[2] = 1.5*EARTH_R; self->rotation[0] = 0; self->rotation[1] = 0; self->rotation[2] = 0; + + g_signal_connect(self, "key-press-event", G_CALLBACK(on_key_press), NULL); + g_signal_connect(self, "button-press-event", G_CALLBACK(on_button_press), NULL); + + g_signal_connect(self, "location-changed", G_CALLBACK(on_view_changed), NULL); + g_signal_connect(self, "rotation-changed", G_CALLBACK(on_view_changed), NULL); } -static void gis_view_dispose(GObject *gobject) +static void gis_viewer_finalize(GObject *gobject) { - g_debug("GisView: dispose"); - /* Drop references to other GObjects */ - G_OBJECT_CLASS(gis_view_parent_class)->dispose(gobject); + g_debug("GisViewer: finalize"); + GisViewer *self = GIS_VIEWER(gobject); + g_free(self->time); + G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject); } -static void gis_view_finalize(GObject *gobject) +static void gis_viewer_class_init(GisViewerClass *klass) { - g_debug("GisView: finalize"); - GisView *self = GIS_VIEW(gobject); - g_free(self->time); - g_free(self->site); - G_OBJECT_CLASS(gis_view_parent_class)->finalize(gobject); -} -static void gis_view_set_property(GObject *object, guint property_id, - const GValue *value, GParamSpec *pspec) -{ - g_debug("GisView: set_property"); - GisView *self = GIS_VIEW(object); - switch (property_id) { - case PROP_TIME: gis_view_set_time(self, g_value_get_string (value)); break; - case PROP_SITE: gis_view_set_site(self, g_value_get_string (value)); break; - case PROP_OFFLINE: gis_view_set_site(self, g_value_get_boolean(value)); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - } -} -static void gis_view_get_property(GObject *object, guint property_id, - GValue *value, GParamSpec *pspec) -{ - g_debug("GisView: get_property"); - GisView *self = GIS_VIEW(object); - switch (property_id) { - case PROP_TIME: g_value_set_string (value, gis_view_get_time(self)); break; - case PROP_SITE: g_value_set_string (value, gis_view_get_site(self)); break; - case PROP_OFFLINE: g_value_set_boolean(value, gis_view_get_site(self)); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - } -} -static void gis_view_class_init(GisViewClass *klass) -{ - g_debug("GisView: class_init"); + g_debug("GisViewer: class_init"); GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - gobject_class->dispose = gis_view_dispose; - gobject_class->finalize = gis_view_finalize; - gobject_class->get_property = gis_view_get_property; - gobject_class->set_property = gis_view_set_property; - g_object_class_install_property(gobject_class, PROP_TIME, - g_param_spec_pointer( - "time", - "time of the current frame", - "(format unknown)", - G_PARAM_READWRITE)); - g_object_class_install_property(gobject_class, PROP_SITE, - g_param_spec_pointer( - "site", - "site seen by the viewport", - "Site of the viewport. Currently this is the name of the radar site.", - G_PARAM_READWRITE)); - g_object_class_install_property(gobject_class, PROP_OFFLINE, - g_param_spec_pointer( - "offline", - "whether the viewer should access the network", - "Offline state of the viewer. If set to true, the viewer will not access the network", - G_PARAM_READWRITE)); + gobject_class->finalize = gis_viewer_finalize; signals[SIG_TIME_CHANGED] = g_signal_new( "time-changed", G_TYPE_FROM_CLASS(gobject_class), @@ -308,17 +357,6 @@ static void gis_view_class_init(GisViewClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING); - signals[SIG_SITE_CHANGED] = g_signal_new( - "site-changed", - G_TYPE_FROM_CLASS(gobject_class), - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, - 1, - G_TYPE_STRING); signals[SIG_LOCATION_CHANGED] = g_signal_new( "location-changed", G_TYPE_FROM_CLASS(gobject_class),