X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fplugins%2Ftest.c;h=49939389ceb2a8b5b2abb2a962e001312ef51bd5;hp=94995b01f7979623922b38ff8fb1bba8c80d51c4;hb=b87064909e6d20e1ee2995adae0c1ce5cb692d7e;hpb=a15a1829ffbf0176930601ee9ac7cc0c07fa2d06

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 94995b0..4993938 100644
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * 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
@@ -29,65 +29,15 @@
 GisPluginTest *gis_plugin_test_new(GisViewer *viewer)
 {
 	g_debug("GisPluginTest: new");
-	GisPluginTest *self = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
-	self->viewer = viewer;
-	return self;
-}
-
-static void gis_plugin_test_expose(GisPlugin *_self)
-{
-	GisPluginTest *self = GIS_PLUGIN_TEST(_self);
-	g_debug("GisPluginTest: expose");
-
-	double width  = GTK_WIDGET(self->viewer)->allocation.width;
-	double height = GTK_WIDGET(self->viewer)->allocation.height;
-
-	// St. Charles
-	// lat =  38.841847
-	// lon = -90.491982
-	gdouble px, py, pz;
-	gis_viewer_project(self->viewer,
-		38.841847, -90.491982, 0, &px, &py, &pz);
-	py = height-py;
+	GisPluginTest *test = g_object_new(GIS_TYPE_PLUGIN_TEST, NULL);
+	test->viewer = g_object_ref(viewer);
 
-	//cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
-	//cairo_t *cairo = cairo_create(surface);
-	//cairo_set_source_rgba(cairo, 1, 1, 1, 1);
-	//cairo_arc(cairo, px, py, 4, 0, 2*G_PI);
-	//cairo_fill(cairo);
-	//cairo_move_to(cairo, px+4, py-8);
-	//cairo_set_font_size(cairo, 10);
-	//cairo_show_text(cairo, "Marker!");
+	GisMarker *marker = gis_marker_new("St. Charles");
+	gis_point_set_lle(gis_object_center(marker), 38.841847, -90.491982, 0);
+	GIS_OBJECT(marker)->lod = EARTH_R/4;
+	test->marker = gis_viewer_add(test->viewer, GIS_OBJECT(marker), GIS_LEVEL_OVERLAY, 0);
 
-	//guint tex;
-	//glEnable(GL_TEXTURE_2D);
-	//glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	//glPixelStorei(GL_PACK_ALIGNMENT, 1);
-	//glGenTextures(1, &tex);
-	//glBindTexture(GL_TEXTURE_2D, tex);
-	//glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-	//		cairo_image_surface_get_data(surface));
-	//glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	//glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
-	//glMatrixMode(GL_PROJECTION);
-	//glLoadIdentity();
-	//glMatrixMode(GL_MODELVIEW);
-	//glLoadIdentity();
-
-	//glDisable(GL_COLOR_MATERIAL);
-	//glDisable(GL_CULL_FACE);
-	//glDisable(GL_DEPTH_TEST);
-	//glDisable(GL_LIGHTING);
-	//glBegin(GL_QUADS);
-	//glTexCoord2d(0, 0); glVertex3f(-1,  1, 1);
-	//glTexCoord2d(1, 0); glVertex3f( 1,  1, 1);
-	//glTexCoord2d(1, 1); glVertex3f( 1, -1, 1);
-	//glTexCoord2d(0, 1); glVertex3f(-1, -1, 1);
-	//glEnd();
-	//glDeleteTextures(1, &tex);
-	//cairo_destroy(cairo);
-	//cairo_surface_destroy(surface);
+	return test;
 }
 
 
@@ -103,14 +53,26 @@ static void gis_plugin_test_plugin_init(GisPluginInterface *iface)
 {
 	g_debug("GisPluginTest: plugin_init");
 	/* Add methods to the interface */
-	iface->expose = gis_plugin_test_expose;
 }
 /* Class/Object init */
-static void gis_plugin_test_init(GisPluginTest *self)
+static void gis_plugin_test_init(GisPluginTest *test)
 {
 	g_debug("GisPluginTest: init");
 }
+static void gis_plugin_test_dispose(GObject *_test)
+{
+	g_debug("GisPluginTest: dispose");
+	GisPluginTest *test = GIS_PLUGIN_TEST(_test);
+	if (test->viewer) {
+		gis_viewer_remove(test->viewer, test->marker);
+		g_object_unref(test->viewer);
+		test->viewer = NULL;
+	}
+	G_OBJECT_CLASS(gis_plugin_test_parent_class)->finalize(_test);
+}
 static void gis_plugin_test_class_init(GisPluginTestClass *klass)
 {
 	g_debug("GisPluginTest: class_init");
+	GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+	gobject_class->dispose = gis_plugin_test_dispose;
 }