X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgis%2Fgis-view.c;h=0caf3f02b04977514afa5a2c10234057ff227ed7;hp=409aa68458337868b62790ec1ffbdc5ac6f4a4bd;hb=d01fb11de5bcf91224348bf41abb6788d0af2545;hpb=372f8b7c6c2f487508fd345a83b92c709c94baa1

diff --git a/src/gis/gis-view.c b/src/gis/gis-view.c
index 409aa68..0caf3f0 100644
--- a/src/gis/gis-view.c
+++ b/src/gis/gis-view.c
@@ -19,10 +19,8 @@
 
 #include "gis-marshal.h"
 #include "gis-view.h"
+#include "gis-world.h"
 
-/****************
- * GObject code *
- ****************/
 /* Constants */
 enum {
 	PROP_0,
@@ -38,126 +36,6 @@ enum {
 };
 static guint signals[NUM_SIGNALS];
 
-/* Class/Object init */
-G_DEFINE_TYPE(GisView, gis_view, G_TYPE_OBJECT);
-static void gis_view_init(GisView *self)
-{
-	g_debug("GisView: init");
-	/* Default values */
-	self->time = g_strdup("");
-	self->site = g_strdup("");
-	self->location[0] = 0;
-	self->location[1] = 0;
-	self->location[2] = -300*1000;
-	self->rotation[0] = 0;
-	self->rotation[1] = 0;
-	self->rotation[2] = 0;
-}
-static void gis_view_dispose(GObject *gobject)
-{
-	g_debug("GisView: dispose");
-	/* Drop references to other GObjects */
-	G_OBJECT_CLASS(gis_view_parent_class)->dispose(gobject);
-}
-static void gis_view_finalize(GObject *gobject)
-{
-	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;
-	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;
-	default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
-	}
-}
-static void gis_view_class_init(GisViewClass *klass)
-{
-	g_debug("GisView: 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));
-	signals[SIG_TIME_CHANGED] = g_signal_new(
-			"time-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_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),
-			G_SIGNAL_RUN_LAST,
-			0,
-			NULL,
-			NULL,
-			gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
-			G_TYPE_NONE,
-			3,
-			G_TYPE_DOUBLE,
-			G_TYPE_DOUBLE,
-			G_TYPE_DOUBLE);
-	signals[SIG_ROTATION_CHANGED] = g_signal_new(
-			"rotation-changed",
-			G_TYPE_FROM_CLASS(gobject_class),
-			G_SIGNAL_RUN_LAST,
-			0,
-			NULL,
-			NULL,
-			gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
-			G_TYPE_NONE,
-			3,
-			G_TYPE_DOUBLE,
-			G_TYPE_DOUBLE,
-			G_TYPE_DOUBLE);
-}
 
 /* Signal helpers */
 static void _gis_view_emit_location_changed(GisView *view)
@@ -211,32 +89,32 @@ gchar *gis_view_get_time(GisView *view)
 	return view->time;
 }
 
-void gis_view_set_location(GisView *view, gdouble x, gdouble y, gdouble z)
+void gis_view_set_location(GisView *view, gdouble lat, gdouble lon, gdouble elev)
 {
 	g_assert(GIS_IS_VIEW(view));
 	g_debug("GisView: set_location");
-	view->location[0] = x;
-	view->location[1] = y;
-	view->location[2] = z;
+	view->location[0] = lat;
+	view->location[1] = lon;
+	view->location[2] = elev;
 	_gis_view_emit_location_changed(view);
 }
 
-void gis_view_get_location(GisView *view, gdouble *x, gdouble *y, gdouble *z)
+void gis_view_get_location(GisView *view, gdouble *lat, gdouble *lon, gdouble *elev)
 {
 	g_assert(GIS_IS_VIEW(view));
-	g_debug("GisView: get_location");
-	*x = view->location[0];
-	*y = view->location[1];
-	*z = view->location[2];
+	//g_debug("GisView: get_location");
+	*lat  = view->location[0];
+	*lon  = view->location[1];
+	*elev = view->location[2];
 }
 
-void gis_view_pan(GisView *view, gdouble x, gdouble y, gdouble z)
+void gis_view_pan(GisView *view, gdouble lat, gdouble lon, gdouble elev)
 {
 	g_assert(GIS_IS_VIEW(view));
-	g_debug("GisView: pan - x=%.0f, y=%.0f, z=%.0f", x, y, z);
-	view->location[0] += x;
-	view->location[1] += y;
-	view->location[2] += z;
+	g_debug("GisView: pan - lat=%8.3f, lon=%8.3f, elev=%8.3f", lat, lon, elev);
+	view->location[0] += lat;
+	view->location[1] += lon;
+	view->location[2] += elev;
 	_gis_view_emit_location_changed(view);
 }
 
@@ -293,3 +171,127 @@ gchar *gis_view_get_site(GisView *view)
 	g_debug("GisView: get_site - %s", view->site);
 	return view->site;
 }
+
+
+/****************
+ * GObject code *
+ ****************/
+G_DEFINE_TYPE(GisView, gis_view, G_TYPE_OBJECT);
+static void gis_view_init(GisView *self)
+{
+	g_debug("GisView: 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_view_dispose(GObject *gobject)
+{
+	g_debug("GisView: dispose");
+	/* Drop references to other GObjects */
+	G_OBJECT_CLASS(gis_view_parent_class)->dispose(gobject);
+}
+static void gis_view_finalize(GObject *gobject)
+{
+	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;
+	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;
+	default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+	}
+}
+static void gis_view_class_init(GisViewClass *klass)
+{
+	g_debug("GisView: 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));
+	signals[SIG_TIME_CHANGED] = g_signal_new(
+			"time-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_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),
+			G_SIGNAL_RUN_LAST,
+			0,
+			NULL,
+			NULL,
+			gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+			G_TYPE_NONE,
+			3,
+			G_TYPE_DOUBLE,
+			G_TYPE_DOUBLE,
+			G_TYPE_DOUBLE);
+	signals[SIG_ROTATION_CHANGED] = g_signal_new(
+			"rotation-changed",
+			G_TYPE_FROM_CLASS(gobject_class),
+			G_SIGNAL_RUN_LAST,
+			0,
+			NULL,
+			NULL,
+			gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+			G_TYPE_NONE,
+			3,
+			G_TYPE_DOUBLE,
+			G_TYPE_DOUBLE,
+			G_TYPE_DOUBLE);
+}