]> Pileus Git - aweather/blobdiff - src/aweather-view.c
* Fixing some async issue (w/ gthread_init)
[aweather] / src / aweather-view.c
index c8fc01b205f0a1ecba6494a2fd2ac73aa81f8206..627824f0051a91fb8294731f11252439dfb34e4f 100644 (file)
@@ -1,63 +1,85 @@
+/*
+ * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * 
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <glib.h>
 
+#include "marshal.h"
 #include "aweather-view.h"
 
+/****************
+ * GObject code *
+ ****************/
 G_DEFINE_TYPE(AWeatherView, aweather_view, G_TYPE_OBJECT);
 
 enum {
        PROP_0,
        PROP_TIME,
-       PROP_LOCATION,
+       PROP_SITE,
 };
 
 enum {
        SIG_TIME_CHANGED,
+       SIG_SITE_CHANGED,
        SIG_LOCATION_CHANGED,
+       SIG_REFRESH,
        NUM_SIGNALS,
 };
 
 static guint signals[NUM_SIGNALS];
 
-/* Constructor / destructors */
 static void aweather_view_init(AWeatherView *self)
 {
-       g_message("aweather_view_init");
+       g_debug("AWeatherView: init");
        /* Default values */
-       self->time     = 0;
-       self->location = g_strdup("IND");
+       self->time = g_strdup("");
+       self->site = g_strdup("");
 }
 
 static GObject *aweather_view_constructor(GType gtype, guint n_properties,
                GObjectConstructParam *properties)
 {
-       g_message("aweather_view_constructor");
+       g_debug("AWeatherView: constructor");
        GObjectClass *parent_class = G_OBJECT_CLASS(aweather_view_parent_class);
        return  parent_class->constructor(gtype, n_properties, properties);
 }
 
-static void aweather_view_dispose (GObject *gobject)
+static void aweather_view_dispose(GObject *gobject)
 {
-       g_message("aweather_view_dispose");
+       g_debug("AWeatherView: dispose");
        /* Drop references to other GObjects */
        G_OBJECT_CLASS(aweather_view_parent_class)->dispose(gobject);
 }
 
 static void aweather_view_finalize(GObject *gobject)
 {
-       g_message("aweather_view_finalize");
+       g_debug("AWeatherView: finalize");
        AWeatherView *self = AWEATHER_VIEW(gobject);
-       g_free(self->location);
+       g_free(self->site);
        G_OBJECT_CLASS(aweather_view_parent_class)->finalize(gobject);
 }
 
 static void aweather_view_set_property(GObject *object, guint property_id,
                const GValue *value, GParamSpec *pspec)
 {
-       g_message("aweather_view_set_property");
+       g_debug("AWeatherView: set_property");
        AWeatherView *self = AWEATHER_VIEW(object);
        switch (property_id) {
-       case PROP_TIME:     aweather_view_set_time    (self, g_value_get_int   (value)); break;
-       case PROP_LOCATION: aweather_view_set_location(self, g_value_get_string(value)); break;
+       case PROP_TIME:     aweather_view_set_time(self, g_value_get_string(value)); break;
+       case PROP_SITE:     aweather_view_set_site(self, g_value_get_string(value)); break;
        default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
        }
 }
@@ -65,18 +87,18 @@ static void aweather_view_set_property(GObject *object, guint property_id,
 static void aweather_view_get_property(GObject *object, guint property_id,
                GValue *value, GParamSpec *pspec)
 {
-       g_message("aweather_view_get_property");
+       g_debug("AWeatherView: get_property");
        AWeatherView *self = AWEATHER_VIEW(object);
        switch (property_id) {
-       case PROP_TIME:     g_value_set_int   (value, aweather_view_get_time    (self)); break;
-       case PROP_LOCATION: g_value_set_string(value, aweather_view_get_location(self)); break;
+       case PROP_TIME:     g_value_set_string(value, aweather_view_get_time(self)); break;
+       case PROP_SITE:     g_value_set_string(value, aweather_view_get_site(self)); break;
        default:            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
        }
 }
 
 static void aweather_view_class_init(AWeatherViewClass *klass)
 {
-       g_message("aweather_view_class_init");
+       g_debug("AWeatherView: class_init");
        GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
        gobject_class->constructor  = aweather_view_constructor;
        gobject_class->dispose      = aweather_view_dispose;
@@ -84,17 +106,16 @@ static void aweather_view_class_init(AWeatherViewClass *klass)
        gobject_class->get_property = aweather_view_get_property;
        gobject_class->set_property = aweather_view_set_property;
        g_object_class_install_property(gobject_class, PROP_TIME,
-               g_param_spec_int(
+               g_param_spec_pointer(
                        "time",
                        "time of the current frame",
                        "(format unknown)", 
-                       G_MININT32, G_MAXINT32, 0,
                        G_PARAM_READWRITE));
-       g_object_class_install_property(gobject_class, PROP_LOCATION,
+       g_object_class_install_property(gobject_class, PROP_SITE,
                g_param_spec_pointer(
-                       "location",
-                       "location seen by the viewport",
-                       "Location of the viewport. Currently this is the name of the radar site.", 
+                       "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",
@@ -106,9 +127,9 @@ static void aweather_view_class_init(AWeatherViewClass *klass)
                        g_cclosure_marshal_VOID__INT,
                        G_TYPE_NONE,
                        1,
-                       G_TYPE_INT);
-       signals[SIG_LOCATION_CHANGED] = g_signal_new(
-                       "location-changed",
+                       G_TYPE_STRING);
+       signals[SIG_SITE_CHANGED] = g_signal_new(
+                       "site-changed",
                        G_TYPE_FROM_CLASS(gobject_class),
                        G_SIGNAL_RUN_LAST,
                        0,
@@ -117,40 +138,138 @@ static void aweather_view_class_init(AWeatherViewClass *klass)
                        g_cclosure_marshal_VOID__STRING,
                        G_TYPE_NONE,
                        1,
-                       G_TYPE_GSTRING);
+                       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,
+                       aweather_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+                       G_TYPE_NONE,
+                       3,
+                       G_TYPE_DOUBLE,
+                       G_TYPE_DOUBLE,
+                       G_TYPE_DOUBLE);
+       signals[SIG_REFRESH] = g_signal_new(
+                       "refresh",
+                       G_TYPE_FROM_CLASS(gobject_class),
+                       G_SIGNAL_RUN_LAST,
+                       0,
+                       NULL,
+                       NULL,
+                       g_cclosure_marshal_VOID__VOID,
+                       G_TYPE_NONE,
+                       0);
+
+}
 
+/* Signal helpers */
+static void _aweather_view_emit_location_changed(AWeatherView *view)
+{
+       g_signal_emit(view, signals[SIG_LOCATION_CHANGED], 0, 
+                       view->location[0],
+                       view->location[1],
+                       view->location[2]);
+}
+static void _aweather_view_emit_time_changed(AWeatherView *view)
+{
+       g_signal_emit(view, signals[SIG_TIME_CHANGED], 0,
+                       view->time);
+}
+static void _aweather_view_emit_site_changed(AWeatherView *view)
+{
+       g_signal_emit(view, signals[SIG_SITE_CHANGED], 0,
+                       view->site);
 }
+static void _aweather_view_emit_refresh(AWeatherView *view)
+{
+       g_signal_emit(view, signals[SIG_REFRESH], 0);
+}
+
 
-/* Methods */
+/***********
+ * Methods *
+ ***********/
 AWeatherView *aweather_view_new()
 {
-       g_message("aweather_view_new");
+       g_debug("AWeatherView: new");
        return g_object_new(AWEATHER_TYPE_VIEW, NULL);
 }
 
-void aweather_view_set_time(AWeatherView *view, int time)
+void aweather_view_set_time(AWeatherView *view, const char *time)
 {
-       g_message("aweather_view_set_time");
-       view->time = time;
-       g_signal_emit(view, signals[SIG_TIME_CHANGED], 0, time);
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: set_time - time=%s", time);
+       g_free(view->time);
+       view->time = g_strdup(time);
+       _aweather_view_emit_time_changed(view);
 }
 
-int aweather_view_get_time(AWeatherView *view)
+gchar *aweather_view_get_time(AWeatherView *view)
 {
-       g_message("aweather_view_get_time");
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: get_time");
        return view->time;
 }
 
-void aweather_view_set_location(AWeatherView *view, const gchar *location)
+void aweather_view_get_location(AWeatherView *view, gdouble *x, gdouble *y, gdouble *z)
+{
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: get_location");
+       *x = view->location[0];
+       *y = view->location[1];
+       *z = view->location[2];
+}
+
+void aweather_view_set_location(AWeatherView *view, gdouble x, gdouble y, gdouble z)
+{
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: set_location");
+       view->location[0] = x;
+       view->location[1] = y;
+       view->location[2] = z;
+       _aweather_view_emit_location_changed(view);
+}
+
+void aweather_view_pan(AWeatherView *view, gdouble x, gdouble y, gdouble z)
+{
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: pan - x=%.0f, y=%.0f, z=%.0f", x, y, z);
+       view->location[0] += x;
+       view->location[1] += y;
+       view->location[2] += z;
+       _aweather_view_emit_location_changed(view);
+}
+
+void aweather_view_zoom(AWeatherView *view, gdouble scale)
 {
-       g_message("aweather_view_set_location");
-       g_free(view->location);
-       view->location = g_strdup(location);
-       g_signal_emit(view, signals[SIG_LOCATION_CHANGED], 0, view->location);
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: zoom");
+       view->location[2] *= scale;
+       _aweather_view_emit_location_changed(view);
 }
 
-gchar *aweather_view_get_location(AWeatherView *view)
+void aweather_view_refresh(AWeatherView *view)
 {
-       g_message("aweather_view_get_location");
-       return view->location;
+       g_debug("AWeatherView: refresh");
+       _aweather_view_emit_refresh(view);
 }
+
+void aweather_view_set_site(AWeatherView *view, const gchar *site)
+{
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: set_site");
+       g_free(view->site);
+       view->site = g_strdup(site);
+       _aweather_view_emit_site_changed(view);
+}
+
+gchar *aweather_view_get_site(AWeatherView *view)
+{
+       g_assert(AWEATHER_IS_VIEW(view));
+       g_debug("AWeatherView: get_site");
+       return view->site;
+}
+