X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.c;h=afe2655d6638ed6d34602a39633038b0eaee2d56;hb=fc67f407d6493f57b5ab0ed32c4902cbf304e96b;hp=078d98a335744cacae8f65275ef60e404be53876;hpb=a2a902d978b6050289f7a92794fb1dc0aa2b5e26;p=grits diff --git a/src/gis-viewer.c b/src/gis-viewer.c index 078d98a..afe2655 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,7 +15,9 @@ * along with this program. If not, see . */ -#include +#include +#include +#include #include "gis-marshal.h" #include "gis-viewer.h" @@ -24,15 +26,8 @@ /* 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, @@ -42,6 +37,9 @@ enum { static guint signals[NUM_SIGNALS]; +/*********** + * Helpers * + ***********/ /* Misc helpers */ static void _gis_viewer_fix_location(GisViewer *self) { @@ -72,11 +70,6 @@ static void _gis_viewer_emit_time_changed(GisViewer *self) g_signal_emit(self, signals[SIG_TIME_CHANGED], 0, self->time); } -static void _gis_viewer_emit_site_changed(GisViewer *self) -{ - g_signal_emit(self, signals[SIG_SITE_CHANGED], 0, - self->site); -} static void _gis_viewer_emit_refresh(GisViewer *self) { g_signal_emit(self, signals[SIG_REFRESH], 0); @@ -87,14 +80,51 @@ static void _gis_viewer_emit_offline(GisViewer *self) self->offline); } +/************* + * Callbacks * + *************/ +static gboolean on_button_press(GisViewer *self, GdkEventButton *event, gpointer _) +{ + 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 * ***********/ -GisViewer *gis_viewer_new() +void gis_viewer_setup(GisViewer *self, GisPlugins *plugins, GisPrefs *prefs) { - g_debug("GisViewer: new"); - return g_object_new(GIS_TYPE_VIEWER, NULL); + self->plugins = plugins; + self->prefs = prefs; + self->offline = gis_prefs_get_boolean(prefs, "gis/offline", NULL); } void gis_viewer_set_time(GisViewer *self, const char *time) @@ -181,23 +211,6 @@ void gis_viewer_rotate(GisViewer *self, gdouble x, gdouble y, gdouble z) _gis_viewer_emit_rotation_changed(self); } -/* To be deprecated, use {get,set}_location */ -void gis_viewer_set_site(GisViewer *self, const gchar *site) -{ - g_assert(GIS_IS_VIEWER(self)); - g_debug("GisViewer: set_site"); - g_free(self->site); - self->site = g_strdup(site); - _gis_viewer_emit_site_changed(self); -} - -gchar *gis_viewer_get_site(GisViewer *self) -{ - g_assert(GIS_IS_VIEWER(self)); - g_debug("GisViewer: get_site - %s", self->site); - return self->site; -} - void gis_viewer_refresh(GisViewer *self) { g_debug("GisViewer: refresh"); @@ -208,6 +221,7 @@ void gis_viewer_set_offline(GisViewer *self, gboolean offline) { g_assert(GIS_IS_VIEWER(self)); g_debug("GisViewer: set_offline - %d", offline); + gis_prefs_set_boolean(self->prefs, "gis/offline", offline); self->offline = offline; _gis_viewer_emit_offline(self); } @@ -219,90 +233,95 @@ gboolean gis_viewer_get_offline(GisViewer *self) 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); +} + +void gis_viewer_project(GisViewer *self, + gdouble lat, gdouble lon, gdouble elev, + gdouble *px, gdouble *py, gdouble *pz) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->project) + g_warning("GisViewer: project - Unimplemented"); + klass->project(self, lat, lon, elev, px, py, pz); +} + +void gis_viewer_clear_height_func(GisViewer *self) +{ + 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_viewer_set_height_func(GisViewer *self, GisTile *tile, + GisHeightFunc height_func, gpointer user_data, + gboolean update) +{ + 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); +} + +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); +} + +GisObject *gis_viewer_remove(GisViewer *self, gpointer ref) +{ + GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self); + if (!klass->remove) + g_warning("GisViewer: remove - Unimplemented"); + return klass->remove(self, ref); +} /**************** * GObject code * ****************/ -G_DEFINE_TYPE(GisViewer, gis_viewer, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE(GisViewer, gis_viewer, GTK_TYPE_DRAWING_AREA); static void gis_viewer_init(GisViewer *self) { 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; -} -static void gis_viewer_dispose(GObject *gobject) -{ - g_debug("GisViewer: dispose"); - /* Drop references to other GObjects */ - G_OBJECT_CLASS(gis_viewer_parent_class)->dispose(gobject); + + 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_viewer_finalize(GObject *gobject) { g_debug("GisViewer: finalize"); GisViewer *self = GIS_VIEWER(gobject); g_free(self->time); - g_free(self->site); G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject); } -static void gis_viewer_set_property(GObject *object, guint property_id, - const GValue *value, GParamSpec *pspec) -{ - g_debug("GisViewer: set_property"); - GisViewer *self = GIS_VIEWER(object); - switch (property_id) { - case PROP_TIME: gis_viewer_set_time (self, g_value_get_string (value)); break; - case PROP_SITE: gis_viewer_set_site (self, g_value_get_string (value)); break; - case PROP_OFFLINE: gis_viewer_set_offline(self, g_value_get_boolean(value)); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - } -} -static void gis_viewer_get_property(GObject *object, guint property_id, - GValue *value, GParamSpec *pspec) -{ - g_debug("GisViewer: get_property"); - GisViewer *self = GIS_VIEWER(object); - switch (property_id) { - case PROP_TIME: g_value_set_string (value, gis_viewer_get_time (self)); break; - case PROP_SITE: g_value_set_string (value, gis_viewer_get_site (self)); break; - case PROP_OFFLINE: g_value_set_boolean(value, gis_viewer_get_offline(self)); break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); - } -} static void gis_viewer_class_init(GisViewerClass *klass) { g_debug("GisViewer: class_init"); GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - gobject_class->dispose = gis_viewer_dispose; gobject_class->finalize = gis_viewer_finalize; - gobject_class->get_property = gis_viewer_get_property; - gobject_class->set_property = gis_viewer_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 viewerport", - "Site of the viewerport. " - "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)); signals[SIG_TIME_CHANGED] = g_signal_new( "time-changed", G_TYPE_FROM_CLASS(gobject_class), @@ -314,17 +333,6 @@ static void gis_viewer_class_init(GisViewerClass *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),