]> Pileus Git - aweather/commitdiff
libgis -> grits: Update everything
authorAndy Spencer <andy753421@gmail.com>
Fri, 26 Nov 2010 02:54:01 +0000 (02:54 +0000)
committerAndy Spencer <andy753421@gmail.com>
Fri, 26 Nov 2010 02:55:42 +0000 (02:55 +0000)
Also some minor formatting changes,
line wrapping, debug messages, etc

18 files changed:
Makefile.am
configure.ac
data/aweather.xml
data/defaults.ini
data/main.ui.in
docs/aweather.ad
gen-win32.sh
gen.sh
src/Makefile.am
src/aweather-gui.c
src/aweather-gui.h
src/aweather-location.h
src/main.c
src/plugins/Makefile.am
src/plugins/level2.c
src/plugins/level2.h
src/plugins/radar.c
src/plugins/radar.h

index 1c7f870ba19a18b525bacbfc2637a8891f11a155..5b262835077adf4d29748129a0e1ef57866ba9e1 100644 (file)
@@ -14,7 +14,7 @@ test: all
 build: all
        export DESTDIR="`pwd`/build"; \
        make -C ../aweather-win32 install; \
-       make -C ../libgis-win32 install; \
+       make -C ../grits-win32 install; \
        make -C ../rsl-win32 install;
        touch $@
 
index 27116862571a389165036ce49b553ed00806ed32..a1bce94992d25944e4a175953077a40ebf971dc2 100644 (file)
@@ -1,5 +1,5 @@
 # Init and options
-AC_INIT([aweather], [0.4.1], [andy753421@gmail.com])
+AC_INIT([aweather], [0.4.2], [andy753421@gmail.com])
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -14,8 +14,8 @@ PKG_PROG_PKG_CONFIG
 gl_INIT
 
 # Check for required packages
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(GIS,  libgis = $VERSION)
+PKG_CHECK_MODULES(GLIB,  glib-2.0)
+PKG_CHECK_MODULES(GRITS, grits = $VERSION)
 
 # Define odd RSL install location
 AC_CHECK_LIB(rsl, RSL_wsr88d_to_radar, RSL_LIBS="-lrsl")
index 0616ab32f3936b1f821931a4f45e893b1f4f8e30..93f2f743b7027178124bc79e4c60387627a1a9a9 100644 (file)
@@ -4,13 +4,13 @@
   <glade-widget-classes> 
     <glade-widget-class name="AWeatherGui" generic-name="Gui" title="Gui" parent="GtkWindow"> 
     </glade-widget-class> 
-    <glade-widget-class name="GisViewer" generic-name="Viewer" title="Viewer" parent="GtkDrawingArea"> 
+    <glade-widget-class name="GritsViewer" generic-name="Viewer" title="Viewer" parent="GtkDrawingArea"> 
     </glade-widget-class> 
-    <glade-widget-class name="GisOpenGL" generic-name="OpenGL" title="OpenGL" parent="GisViewer"> 
+    <glade-widget-class name="GritsOpenGL" generic-name="OpenGL" title="OpenGL" parent="GritsViewer"> 
     </glade-widget-class> 
   </glade-widget-classes> 
   <glade-widget-group name="aweather-widgets" title="AWeather Widgets"> 
     <glade-widget-class-ref name="AWeatherGui"/> 
-    <glade-widget-class-ref name="GisOpenGL"/> 
+    <glade-widget-class-ref name="GritsOpenGL"/> 
   </glade-widget-group> 
 </glade-catalog> 
index 4f5e3b0da69d69711e8ca67c8d73f9a7b882cd63..a4fd77212e139821514ddbbb40da7de13ec068a9 100644 (file)
@@ -3,7 +3,7 @@ nexrad_url=http://mesonet.agron.iastate.edu/data/nexrd2/raw/
 log_level=7
 initial_site=
 
-[gis]
+[grits]
 offline=false
 
 [plugins]
index 00676645bccce028bec4f8750555f5cf6f68732c..0a0f5c4ec4c0fc62cb49d7a1bb2134c5f22b6268 100644 (file)
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <child>
-                  <object class="GisOpenGL" id="main_viewer">
+                  <object class="GritsOpenGL" id="main_viewer">
                     <property name="width_request">600</property>
                     <property name="height_request">400</property>
                     <property name="visible">True</property>
index c21c097c2fcafeb9a7a4471cd4d332357391748a..ae5f1817aff874c4a0447c9a9a4ac706dd7fdb76 100644 (file)
@@ -91,7 +91,7 @@ Start AWeather in offline mode and center the map on the St. Louis radar.::
 
 SEE ALSO
 --------
-gis-demo(1)
+grits-demo(1)
 
 BUGS
 ----
index 2c798e3c057fb13aa488a586140335d13de82f31..d2c7eb149ada796400aa7dc4f079fdfc81f70b5b 100755 (executable)
@@ -1,9 +1,9 @@
 #!/bin/bash
 gnulib-tool --no-vc-files --import strptime
 
-GIS="/scratch/libgis-win32/src"
-export PKG_CONFIG_PATH="$GIS"
-export LIBS="-L$GIS"
-export CPPFLAGS="-I$GIS"
+GRITS="/scratch/grits-win32/src"
+export PKG_CONFIG_PATH="$GRITS"
+export LIBS="-L$GRITS"
+export CPPFLAGS="-I$GRITS"
 export CFLAGS="-g -Werror -Wno-unused -O3"
 ./autogen.sh --host=i686-pc-mingw32
diff --git a/gen.sh b/gen.sh
index 25976847affbeb9fe4e9ca2ca97da98b1c6c6074..84a9e625b366a62e7ed882a9b4094b03abc08e5f 100755 (executable)
--- a/gen.sh
+++ b/gen.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 dir=$(dirname $(readlink -f $0))
-PKG_CONFIG_PATH="../libgis/src/" \
+PKG_CONFIG_PATH="../grits/src/" \
 ./autogen.sh \
        "--datadir=$dir/data" \
        "--libdir=$dir/src/plugins" \
index 6a56bc4830308cc9a01698fe9a7f3f2fe68594be..9c05599e13ff77923af0019896f9c4e9ac155ae2 100644 (file)
@@ -1,6 +1,6 @@
 SUBDIRS = plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
 AM_LDFLAGS  = -Wl,--export-dynamic
 
 bin_PROGRAMS = aweather wsr88ddec
@@ -11,7 +11,7 @@ aweather_CPPFLAGS = \
        -DHTMLDIR="\"$(dots)$(htmldir)\"" \
        -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
        -DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
-aweather_LDADD    = $(GIS_LIBS)
+aweather_LDADD    = $(GRITS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
index c0cbf0d12a2d133e84b6ea66dee6b2c774b86b3c..c6a89ca731b718411fe717a682c4dff462b0eb2c 100644 (file)
@@ -21,7 +21,7 @@
 #include <glib/gstdio.h>
 #include <math.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "aweather-gui.h"
 #include "aweather-location.h"
@@ -37,7 +37,7 @@ G_MODULE_EXPORT gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event,
        if (event->keyval == GDK_q)
                gtk_widget_destroy(GTK_WIDGET(self));
        else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
-               gis_viewer_refresh(self->viewer);
+               grits_viewer_refresh(self->viewer);
        else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
                GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "main_tabs"));
                gint num_tabs = gtk_notebook_get_n_pages(tabs);
@@ -74,8 +74,8 @@ static void cleancache_r(gchar *path)
 G_MODULE_EXPORT void on_cleancache(GtkMenuItem *menu, AWeatherGui *self)
 {
        g_debug("AWeatherGui: on_cleancache");
-       /* Todo: move this to libgis */
-       gchar *cache = g_build_filename(g_get_user_cache_dir(), "libgis", NULL);
+       /* Todo: move this to grits */
+       gchar *cache = g_build_filename(g_get_user_cache_dir(), "grits", NULL);
        cleancache_r(cache);
 }
 
@@ -101,17 +101,17 @@ G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)
 
 G_MODULE_EXPORT void on_zoomin(GtkAction *action, AWeatherGui *self)
 {
-       gis_viewer_zoom(self->viewer, 3./4);
+       grits_viewer_zoom(self->viewer, 3./4);
 }
 
 G_MODULE_EXPORT void on_zoomout(GtkAction *action, AWeatherGui *self)
 {
-       gis_viewer_zoom(self->viewer, 4./3);
+       grits_viewer_zoom(self->viewer, 4./3);
 }
 
 G_MODULE_EXPORT void on_refresh(GtkAction *action, AWeatherGui *self)
 {
-       gis_viewer_refresh(self->viewer);
+       grits_viewer_refresh(self->viewer);
 }
 
 G_MODULE_EXPORT void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
@@ -150,7 +150,7 @@ G_MODULE_EXPORT void on_time_changed(AWeatherGui *self)
        gtk_tree_model_get_iter(model, &iter, path);
        gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
 
-       gis_viewer_set_time(self->viewer, mktime(&tm));
+       grits_viewer_set_time(self->viewer, mktime(&tm));
 }
 
 static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
@@ -176,7 +176,7 @@ static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
        return FALSE;
 }
 
-static void update_time_widget(GisViewer *viewer, time_t time, AWeatherGui *self)
+static void update_time_widget(GritsViewer *viewer, time_t time, AWeatherGui *self)
 {
        g_debug("AWeatherGui: update_time_widget - time=%u", (guint)time);
        // FIXME
@@ -195,7 +195,7 @@ G_MODULE_EXPORT void on_offline(GtkToggleAction *action, AWeatherGui *self)
 {
        gboolean value = gtk_toggle_action_get_active(action);
        g_debug("AWeatherGui: on_offline - offline=%d", value);
-       gis_viewer_set_offline(self->viewer, value);
+       grits_viewer_set_offline(self->viewer, value);
 }
 
 G_MODULE_EXPORT void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self)
@@ -206,7 +206,7 @@ G_MODULE_EXPORT void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *se
        gtk_combo_box_get_active_iter(combo, &iter);
        gtk_tree_model_get(model, &iter, 0, &code, -1);
        g_debug("AWeatherGui: on_initial_site_changed - code=%s", code);
-       gis_prefs_set_string(self->prefs, "aweather/initial_site", code);
+       grits_prefs_set_string(self->prefs, "aweather/initial_site", code);
        g_free(code);
 }
 
@@ -214,14 +214,14 @@ G_MODULE_EXPORT void on_nexrad_url_changed(GtkEntry *entry, AWeatherGui *self)
 {
        const gchar *text = gtk_entry_get_text(entry);
        g_debug("AWeatherGui: on_nexrad_url_changed - url=%s", text);
-       gis_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
+       grits_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
 }
 
 G_MODULE_EXPORT int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
 {
        gint value = gtk_spin_button_get_value_as_int(spinner);
        g_debug("AWeatherGui: on_log_level_changed - %p, level=%d", self, value);
-       gis_prefs_set_integer(self->prefs, "aweather/log_level", value);
+       grits_prefs_set_integer(self->prefs, "aweather/log_level", value);
        return TRUE;
 }
 
@@ -262,9 +262,9 @@ static void site_setup(AWeatherGui *self)
 static void prefs_setup(AWeatherGui *self)
 {
        /* Set values */
-       gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url",   NULL);
-       gint   ll = gis_prefs_get_integer(self->prefs, "aweather/log_level",    NULL);
-       gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site", NULL);
+       gchar *nu = grits_prefs_get_string (self->prefs, "aweather/nexrad_url",   NULL);
+       gint   ll = grits_prefs_get_integer(self->prefs, "aweather/log_level",    NULL);
+       gchar *is = grits_prefs_get_string (self->prefs, "aweather/initial_site", NULL);
        GtkWidget *nuw = aweather_gui_get_widget(self, "prefs_general_url");
        GtkWidget *llw = aweather_gui_get_widget(self, "prefs_general_log");
        GtkWidget *isw = aweather_gui_get_widget(self, "prefs_general_site");
@@ -331,7 +331,7 @@ AWeatherGui *aweather_gui_new()
        g_debug("AWeatherGui: new");
        return g_object_new(AWEATHER_TYPE_GUI, NULL);
 }
-GisViewer *aweather_gui_get_viewer(AWeatherGui *self)
+GritsViewer *aweather_gui_get_viewer(AWeatherGui *self)
 {
        g_assert(AWEATHER_IS_GUI(self));
        return self->viewer;
@@ -359,9 +359,9 @@ GObject *aweather_gui_get_object(AWeatherGui *self, const gchar *name)
 }
 void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
 {
-       GisPlugin *plugin = gis_plugins_enable(self->plugins, name,
+       GritsPlugin *plugin = grits_plugins_enable(self->plugins, name,
                        self->viewer, self->prefs);
-       GtkWidget *body = gis_plugin_get_config(plugin);
+       GtkWidget *body = grits_plugin_get_config(plugin);
        if (body) {
                GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
                GtkWidget *tab    = gtk_label_new(name);
@@ -384,7 +384,7 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
                if (tab_name && g_str_equal(name, tab_name))
                        gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
        }
-       gis_plugins_disable(self->plugins, name);
+       grits_plugins_disable(self->plugins, name);
        gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
 }
 
@@ -401,20 +401,20 @@ static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builde
        /* Simple things */
        gchar *config   = g_build_filename(g_get_user_config_dir(), PACKAGE, "config.ini", NULL);
        gchar *defaults = g_build_filename(PKGDATADIR, "defaults.ini", NULL);
-       self->prefs   = gis_prefs_new(config, defaults);
-       self->plugins = gis_plugins_new(PLUGINSDIR, self->prefs);
-       self->viewer  = GIS_VIEWER(aweather_gui_get_widget(self, "main_viewer"));
-       gis_viewer_setup(self->viewer, self->plugins, self->prefs);
+       self->prefs   = grits_prefs_new(config, defaults);
+       self->plugins = grits_plugins_new(PLUGINSDIR, self->prefs);
+       self->viewer  = GRITS_VIEWER(aweather_gui_get_widget(self, "main_viewer"));
+       grits_viewer_setup(self->viewer, self->plugins, self->prefs);
        g_free(config);
        g_free(defaults);
 
        /* Plugins */
        GtkTreeIter iter;
        self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));
-       for (GList *cur = gis_plugins_available(self->plugins); cur; cur = cur->next) {
+       for (GList *cur = grits_plugins_available(self->plugins); cur; cur = cur->next) {
                gchar *name = cur->data;
                GError *error = NULL;
-               gboolean enabled = gis_prefs_get_boolean_v(self->prefs, "plugins", cur->data, &error);
+               gboolean enabled = grits_prefs_get_boolean_v(self->prefs, "plugins", cur->data, &error);
                if (error && error->code == G_KEY_FILE_ERROR_GROUP_NOT_FOUND)
                        enabled = TRUE;
                gtk_list_store_append(self->gtk_plugins, &iter);
@@ -460,7 +460,7 @@ static void aweather_gui_dispose(GObject *_self)
        g_debug("AWeatherGui: dispose");
        AWeatherGui *self = AWEATHER_GUI(_self);
        if (self->plugins) {
-               gis_plugins_free(self->plugins);
+               grits_plugins_free(self->plugins);
                self->plugins = NULL;
        }
        if (self->builder) {
index 396955cf35730dbb6d6f5c6d05b52d7d9d75c61d..640ff2a3e9f93884bd0a43f87c99d60414cccff0 100644 (file)
@@ -21,7 +21,7 @@
 #include <gtk/gtk.h>
 #include <glib-object.h>
 
-#include <gis.h>
+#include <grits.h>
 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())
@@ -39,9 +39,9 @@ struct _AWeatherGui {
 
        /* instance members */
        GtkBuilder   *builder;
-       GisViewer    *viewer;
-       GisPlugins   *plugins;
-       GisPrefs     *prefs;
+       GritsViewer  *viewer;
+       GritsPlugins *plugins;
+       GritsPrefs   *prefs;
        GtkListStore *gtk_plugins;
 };
 
@@ -56,7 +56,7 @@ GType aweather_gui_get_type(void);
 /* Methods */
 AWeatherGui *aweather_gui_new();
 
-GisViewer   *aweather_gui_get_viewer(AWeatherGui *gui);
+GritsViewer *aweather_gui_get_viewer(AWeatherGui *gui);
 
 GtkWidget   *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
 GObject     *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
index 6c8f2959a9087e893fc93cfe1cbceb730231d931..44a4304d25812d6e6de5bb8947ad16968e80b7e4 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef __LOCATION_H__
 #define __LOCATION_H__
 
-#include "gis-util.h"
+#include "grits-util.h"
 
 enum {
        LOCATION_END,
@@ -30,7 +30,7 @@ typedef struct {
        gint type;
        gchar *code;
        gchar *name;
-       GisPoint pos;
+       GritsPoint pos;
        gdouble lod;
 } city_t;
 
index 2ac6a0f82e130adde8d7d3989f3c905ae0636203..bee9c6cc920608cf216986638f8e579605cb22e1 100644 (file)
@@ -20,7 +20,7 @@
 #include <gtk/gtkgl.h>
 #include <glib/gstdio.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "aweather-gui.h"
 #include "aweather-location.h"
@@ -52,7 +52,7 @@ gboolean set_location(gpointer _gui)
        gchar *site = g_object_get_data(G_OBJECT(gui), "site");
        for (city_t *city = cities; city->type; city++) {
                if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
-                       gis_viewer_set_location(gui->viewer,
+                       grits_viewer_set_location(gui->viewer,
                                city->pos.lat, city->pos.lon, EARTH_R/25);
                        break;
                }
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
        /* Set up AWeather */
        gdk_threads_enter();
        /* Pre-load some type for gtkbuilder */
-       GIS_TYPE_OPENGL;
+       GRITS_TYPE_OPENGL;
        AWEATHER_TYPE_GUI;
        GtkBuilder *builder = gtk_builder_new();
        if (!gtk_builder_add_from_file(builder, PKGDATADIR "/main.ui", &error))
@@ -112,15 +112,15 @@ int main(int argc, char *argv[])
        AWeatherGui *gui = AWEATHER_GUI(gtk_builder_get_object(builder, "main_window"));
        g_signal_connect(gui, "destroy", gtk_main_quit, NULL);
 
-       gint     prefs_debug   = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
-       gchar   *prefs_site    = gis_prefs_get_string(gui->prefs,  "aweather/initial_site", NULL);
-       gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline", NULL);
+       gint     prefs_debug   = grits_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
+       gchar   *prefs_site    = grits_prefs_get_string(gui->prefs,  "aweather/initial_site", NULL);
+       gboolean prefs_offline = grits_prefs_get_boolean(gui->prefs, "grits/offline", NULL);
 
        debug   = (opt_debug   ?: prefs_debug   ?: debug);
        site    = (opt_site    ?: prefs_site    ?: site);
        offline = (opt_offline ?: prefs_offline ?: offline);
 
-       gis_viewer_set_offline(gui->viewer, offline);
+       grits_viewer_set_offline(gui->viewer, offline);
        log_levels = (1 << (debug+1))-1;
 
        GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
index 64f21ad6a6bddcf81b70924cdf942e6b3dbf9518..83a4e8257e11ba3541db923d1ea6c37697e1b60b 100644 (file)
@@ -1,4 +1,4 @@
-AM_CFLAGS   = -Wall --std=gnu99 $(GIS_CFLAGS)
+AM_CFLAGS   = -Wall --std=gnu99 $(GRITS_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 AM_LDFLAGS  = -module -avoid-version -no-undefined
 
@@ -15,7 +15,7 @@ radar_la_SOURCES = \
        ../aweather-colormap.h \
        ../aweather-location.c \
        ../aweather-location.h
-radar_la_LIBADD  = $(RSL_LIBS) $(GIS_LIBS) \
+radar_la_LIBADD  = $(RSL_LIBS) $(GRITS_LIBS) \
                   $(addprefix $(top_srcdir)/lib/,$(gl_LTLIBOBJS))
 endif
 
index 6e0a0666457a16ad63f7d801247d8df0340846b7..88fae9d1c42c0895d9118ca0b0755336dc67849d 100644 (file)
@@ -19,7 +19,7 @@
 #include <math.h>
 #include <GL/gl.h>
 #include <glib/gstdio.h>
-#include <gis.h>
+#include <grits.h>
 #include <rsl.h>
 
 #include "level2.h"
@@ -130,7 +130,7 @@ static gboolean _decompress_radar(const gchar *file, const gchar *raw)
 /*********************
  * Drawing functions *
  *********************/
-static void _draw_radar(GisCallback *_self, gpointer _viewer)
+static void _draw_radar(GritsCallback *_self, gpointer _viewer)
 {
        AWeatherLevel2 *self = AWEATHER_LEVEL2(_self);
        if (!self->sweep || !self->sweep_tex)
@@ -142,7 +142,7 @@ static void _draw_radar(GisCallback *_self, gpointer _viewer)
        gdouble lat  = (double)h->latd + (double)h->latm/60 + (double)h->lats/(60*60);
        gdouble lon  = (double)h->lond + (double)h->lonm/60 + (double)h->lons/(60*60);
        gdouble elev = h->height;
-       gis_viewer_center_position(self->viewer, lat, lon, elev);
+       grits_viewer_center_position(self->viewer, lat, lon, elev);
 
        glDisable(GL_ALPHA_TEST);
        glDisable(GL_CULL_FACE);
@@ -234,7 +234,7 @@ void aweather_level2_set_sweep(AWeatherLevel2 *self,
        g_idle_add(_set_sweep_cb, self);
 }
 
-AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
                AWeatherColormap *colormap, Radar *radar)
 {
        g_debug("AWeatherLevel2: new - %s", radar->h.radar_name);
@@ -246,7 +246,7 @@ AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
        return self;
 }
 
-AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
                AWeatherColormap *colormap,
                const gchar *file, const gchar *site)
 {
@@ -367,11 +367,11 @@ GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
 /****************
  * GObject code *
  ****************/
-G_DEFINE_TYPE(AWeatherLevel2, aweather_level2, GIS_TYPE_CALLBACK);
+G_DEFINE_TYPE(AWeatherLevel2, aweather_level2, GRITS_TYPE_CALLBACK);
 static void aweather_level2_init(AWeatherLevel2 *self)
 {
-       GIS_CALLBACK(self)->callback  = _draw_radar;
-       GIS_CALLBACK(self)->user_data = self;
+       GRITS_CALLBACK(self)->callback  = _draw_radar;
+       GRITS_CALLBACK(self)->user_data = self;
 }
 static void aweather_level2_dispose(GObject *_self)
 {
index 7f3d366f4ca7cfff7c6f4521b7fb7b41e1aafd36..bc14663ad5df6e10999ed51ca272208c8b884252 100644 (file)
@@ -18,7 +18,7 @@
 #ifndef __AWEATHER_LEVEL2_H__
 #define __AWEATHER_LEVEL2_H__
 
-#include <gis.h>
+#include <grits.h>
 #include "aweather-colormap.h"
 
 /* Level2 */
@@ -33,8 +33,8 @@ typedef struct _AWeatherLevel2      AWeatherLevel2;
 typedef struct _AWeatherLevel2Class AWeatherLevel2Class;
 
 struct _AWeatherLevel2 {
-       GisCallback       parent;
-       GisViewer        *viewer;
+       GritsCallback     parent;
+       GritsViewer      *viewer;
        Radar            *radar;
        AWeatherColormap *colormap;
 
@@ -46,15 +46,15 @@ struct _AWeatherLevel2 {
 };
 
 struct _AWeatherLevel2Class {
-       GisCallbackClass parent_class;
+       GritsCallbackClass parent_class;
 };
 
 GType aweather_level2_get_type(void);
 
-AWeatherLevel2 *aweather_level2_new(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new(GritsViewer *viewer,
                AWeatherColormap *colormap, Radar *radar);
 
-AWeatherLevel2 *aweather_level2_new_from_file(GisViewer *viewer,
+AWeatherLevel2 *aweather_level2_new_from_file(GritsViewer *viewer,
                AWeatherColormap *colormap,
                const gchar *file, const gchar *site);
 
index 4b86240607a39f7f62e28d5d7cd723c45beac117..3f7bff4022054c4a1b38dbff13cad6ccb6276417 100644 (file)
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <rsl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "radar.h"
 #include "level2.h"
@@ -59,7 +59,7 @@ void _gtk_bin_set_child(GtkBin *bin, GtkWidget *new)
 static gchar *_find_nearest(time_t time, GList *files,
                gsize offset, gchar *format)
 {
-       g_debug("GisPluginRadar: _find_nearest ...");
+       g_debug("RadarSite: find_nearest ...");
        time_t  nearest_time = 0;
        char   *nearest_file = NULL;
 
@@ -74,7 +74,7 @@ static gchar *_find_nearest(time_t time, GList *files,
                }
        }
 
-       g_debug("GisPluginRadar: _find_nearest = %s", nearest_file);
+       g_debug("RadarSite: find_nearest = %s", nearest_file);
        if (nearest_file)
                return g_strdup(nearest_file);
        else
@@ -92,29 +92,29 @@ typedef enum {
 } RadarSiteStatus;
 struct _RadarSite {
        /* Information */
-       city_t    *city;
-       GisMarker *marker;     // Map marker for libgis
-       gpointer  *marker_ref; // Reference to maker
+       city_t         *city;
+       GritsMarker    *marker;      // Map marker for grits
+       gpointer       *marker_ref;  // Reference to maker
 
        /* Stuff from the parents */
-       GisViewer     *viewer;
-       GisHttp       *http;
-       GisPrefs      *prefs;
-       GtkWidget     *pconfig;
+       GritsViewer    *viewer;
+       GritsHttp      *http;
+       GritsPrefs     *prefs;
+       GtkWidget      *pconfig;
 
        /* When loaded */
        gboolean        hidden;
-       RadarSiteStatus status;     // Loading status for the site
+       RadarSiteStatus status;      // Loading status for the site
        GtkWidget      *config;
-       AWeatherLevel2 *level2;     // The Level2 structure for the current volume
-       gpointer        level2_ref; // GisViewer reference to the added radar
+       AWeatherLevel2 *level2;      // The Level2 structure for the current volume
+       gpointer        level2_ref;  // GritsViewer reference to the added radar
 
        /* Internal data */
-       time_t   time;        // Current timestamp of the level2
-       gchar   *message;     // Error message set while updating
-       guint    time_id;     // "time-changed"     callback ID
-       guint    refresh_id;  // "refresh"          callback ID
-       guint    location_id; // "locaiton-changed" callback ID
+       time_t          time;        // Current timestamp of the level2
+       gchar          *message;     // Error message set while updating
+       guint           time_id;     // "time-changed"     callback ID
+       guint           refresh_id;  // "refresh"          callback ID
+       guint           location_id; // "locaiton-changed" callback ID
 };
 
 /* format: http://mesonet.agron.iastate.edu/data/nexrd2/raw/KABR/KABR_20090510_0323 */
@@ -134,7 +134,7 @@ gboolean _site_update_end(gpointer _site)
 {
        RadarSite *site = _site;
        if (site->message) {
-               g_warning("GisPluginRadar: _update_end - %s", site->message);
+               g_warning("RadarSite: update_end - %s", site->message);
                _gtk_bin_set_child(GTK_BIN(site->config), gtk_label_new(site->message));
        } else {
                _gtk_bin_set_child(GTK_BIN(site->config),
@@ -146,18 +146,18 @@ gboolean _site_update_end(gpointer _site)
 gpointer _site_update_thread(gpointer _site)
 {
        RadarSite *site = _site;
-       g_debug("GisPluginRadar: _site_update_thread - %s", site->city->code);
+       g_debug("RadarSite: update_thread - %s", site->city->code);
        site->message = NULL;
 
-       gboolean offline = gis_viewer_get_offline(site->viewer);
-       gchar *nexrad_url = gis_prefs_get_string(site->prefs,
+       gboolean offline = grits_viewer_get_offline(site->viewer);
+       gchar *nexrad_url = grits_prefs_get_string(site->prefs,
                        "aweather/nexrad_url", NULL);
 
        /* Find nearest volume (temporally) */
-       g_debug("GisPluginRadar: _site_update_thread - find nearest - %s", site->city->code);
+       g_debug("RadarSite: update_thread - find nearest - %s", site->city->code);
        gchar *dir_list = g_strconcat(nexrad_url, "/", site->city->code,
                        "/", "dir.list", NULL);
-       GList *files = gis_http_available(site->http,
+       GList *files = grits_http_available(site->http,
                        "^K\\w{3}_\\d{8}_\\d{4}$", site->city->code,
                        "\\d+ (.*)", (offline ? NULL : dir_list));
        g_free(dir_list);
@@ -170,11 +170,11 @@ gpointer _site_update_thread(gpointer _site)
        }
 
        /* Fetch new volume */
-       g_debug("GisPluginRadar: _site_update_thread - fetch");
+       g_debug("RadarSite: update_thread - fetch");
        gchar *local = g_strconcat(site->city->code, "/", nearest, NULL);
        gchar *uri   = g_strconcat(nexrad_url, "/", local,   NULL);
-       gchar *file = gis_http_fetch(site->http, uri, local,
-                       offline ? GIS_LOCAL : GIS_UPDATE,
+       gchar *file  = grits_http_fetch(site->http, uri, local,
+                       offline ? GRITS_LOCAL : GRITS_UPDATE,
                        _site_update_loading, site);
        g_free(nexrad_url);
        g_free(nearest);
@@ -186,7 +186,7 @@ gpointer _site_update_thread(gpointer _site)
        }
 
        /* Load and add new volume */
-       g_debug("GisPluginRadar: _site_update_thread - load - %s", site->city->code);
+       g_debug("RadarSite: update_thread - load - %s", site->city->code);
        site->level2 = aweather_level2_new_from_file(
                        site->viewer, colormaps, file, site->city->code);
        g_free(file);
@@ -194,9 +194,9 @@ gpointer _site_update_thread(gpointer _site)
                site->message = "Load failed";
                goto out;
        }
-       GIS_OBJECT(site->level2)->hidden = site->hidden;
-       site->level2_ref = gis_viewer_add(site->viewer,
-                       GIS_OBJECT(site->level2), GIS_LEVEL_WORLD, TRUE);
+       GRITS_OBJECT(site->level2)->hidden = site->hidden;
+       site->level2_ref = grits_viewer_add(site->viewer,
+                       GRITS_OBJECT(site->level2), GRITS_LEVEL_WORLD, TRUE);
 
 out:
        g_idle_add(_site_update_end, site);
@@ -208,8 +208,8 @@ void _site_update(RadarSite *site)
                return;
        site->status = STATUS_LOADING;
 
-       site->time = gis_viewer_get_time(site->viewer);
-       g_debug("GisPluginRadar: _site_update %s - %d",
+       site->time = grits_viewer_get_time(site->viewer);
+       g_debug("RadarSite: update %s - %d",
                        site->city->code, (gint)site->time);
 
        /* Add a progress bar */
@@ -218,9 +218,9 @@ void _site_update(RadarSite *site)
        _gtk_bin_set_child(GTK_BIN(site->config), progress);
 
        /* Remove old volume */
-       g_debug("GisPluginRadar: _site_update - remove - %s", site->city->code);
+       g_debug("RadarSite: update - remove - %s", site->city->code);
        if (site->level2_ref) {
-               gis_viewer_remove(site->viewer, site->level2_ref);
+               grits_viewer_remove(site->viewer, site->level2_ref);
                site->level2_ref = NULL;
        }
 
@@ -235,7 +235,7 @@ void radar_site_unload(RadarSite *site)
        if (site->status != STATUS_LOADED)
                return; // Abort if it's still loading
 
-       g_debug("GisPluginRadar: radar_site_unload %s", site->city->code);
+       g_debug("RadarSite: unload %s", site->city->code);
 
        if (site->time_id)
                g_signal_handler_disconnect(site->viewer, site->time_id);
@@ -248,7 +248,7 @@ void radar_site_unload(RadarSite *site)
 
        /* Remove radar */
        if (site->level2_ref) {
-               gis_viewer_remove(site->viewer, site->level2_ref);
+               grits_viewer_remove(site->viewer, site->level2_ref);
                site->level2_ref = NULL;
        }
 
@@ -259,14 +259,14 @@ void radar_site_toggle(RadarSite *site)
 {
        site->hidden = !site->hidden;
        if (site->level2) {
-               GIS_OBJECT(site->level2)->hidden = site->hidden;
+               GRITS_OBJECT(site->level2)->hidden = site->hidden;
                gtk_widget_queue_draw(GTK_WIDGET(site->viewer));
        }
 }
 
 void radar_site_load(RadarSite *site)
 {
-       g_debug("GisPluginRadar: radar_site_load %s", site->city->code);
+       g_debug("RadarSite: load %s", site->city->code);
 
        /* Add tab page */
        site->config = gtk_alignment_new(0, 0, 1, 1);
@@ -283,7 +283,7 @@ void radar_site_load(RadarSite *site)
        _site_update(site);
 }
 
-void _site_on_location_changed(GisViewer *viewer,
+void _site_on_location_changed(GritsViewer *viewer,
                gdouble lat, gdouble lon, gdouble elev,
                gpointer _site)
 {
@@ -307,21 +307,23 @@ void _site_on_location_changed(GisViewer *viewer,
 gboolean _site_add_marker(gpointer _site)
 {
        RadarSite *site = _site;
-       site->marker = gis_marker_new(site->city->name);
-       GIS_OBJECT(site->marker)->center = site->city->pos;
-       GIS_OBJECT(site->marker)->lod    = EARTH_R*site->city->lod;
-       site->marker_ref = gis_viewer_add(site->viewer,
-                       GIS_OBJECT(site->marker), GIS_LEVEL_OVERLAY, FALSE);
+       site->marker = grits_marker_new(site->city->name);
+       GRITS_OBJECT(site->marker)->center = site->city->pos;
+       GRITS_OBJECT(site->marker)->lod    = EARTH_R*site->city->lod;
+       site->marker_ref = grits_viewer_add(site->viewer,
+                       GRITS_OBJECT(site->marker), GRITS_LEVEL_OVERLAY, FALSE);
        return FALSE;
 }
 RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
-               GisViewer *viewer, GisPrefs *prefs, GisHttp *http)
+               GritsViewer *viewer, GritsPrefs *prefs, GritsHttp *http)
 {
        RadarSite *site = g_new0(RadarSite, 1);
        site->viewer  = g_object_ref(viewer);
        site->prefs   = g_object_ref(prefs);
        //site->http    = http;
-       site->http    = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
+       site->http    = grits_http_new(G_DIR_SEPARATOR_S
+                       "nexrad" G_DIR_SEPARATOR_S
+                       "level2" G_DIR_SEPARATOR_S);
        site->city    = city;
        site->pconfig = pconfig;
 
@@ -338,10 +340,10 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
 void radar_site_free(RadarSite *site)
 {
        radar_site_unload(site);
-       gis_viewer_remove(site->viewer, site->marker_ref);
+       grits_viewer_remove(site->viewer, site->marker_ref);
        if (site->location_id)
                g_signal_handler_disconnect(site->viewer, site->location_id);
-       gis_http_free(site->http);
+       grits_http_free(site->http);
        g_object_unref(site->viewer);
        g_object_unref(site->prefs);
        g_free(site);
@@ -358,15 +360,15 @@ void radar_site_free(RadarSite *site)
 #define CONUS_DEG_PER_PX  0.017971305190311
 
 struct _RadarConus {
-       GisViewer   *viewer;
-       GisHttp     *http;
+       GritsViewer *viewer;
+       GritsHttp   *http;
        GtkWidget   *config;
        time_t       time;
        const gchar *message;
        GStaticMutex loading;
 
        gchar       *path;
-       GisTile     *tile[2];
+       GritsTile   *tile[2];
        gpointer    *tile_ref[2];
 
        guint        time_id;     // "time-changed"     callback ID
@@ -387,7 +389,7 @@ void _conus_update_loading(gchar *file, goffset cur,
 }
 
 /* Copy images to graphics memory */
-static void _conus_update_end_copy(GisTile *tile, guchar *pixels)
+static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
 {
        if (!tile->data) {
                tile->data = g_new0(guint, 1);
@@ -419,7 +421,7 @@ static void _conus_update_end_copy(GisTile *tile, guchar *pixels)
 static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
                gint width, gint height, gint pxsize)
 {
-       g_debug("GisPluginRadar: _conus_update_end_split");
+       g_debug("Conus: update_end_split");
        guchar *out[] = {west,east};
        const guchar alphamap[][4] = {
                {0x04, 0xe9, 0xe7, 0x30},
@@ -453,11 +455,11 @@ static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
 gboolean _conus_update_end(gpointer _conus)
 {
        RadarConus *conus = _conus;
-       g_debug("GisPluginRadar: _conus_update_end");
+       g_debug("Conus: update_end");
 
        /* Check error status */
        if (conus->message) {
-               g_warning("GisPluginRadar: _conus_update_end - %s", conus->message);
+               g_warning("Conus: update_end - %s", conus->message);
                _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new(conus->message));
                goto out;
        }
@@ -466,7 +468,7 @@ gboolean _conus_update_end(gpointer _conus)
        GError *error = NULL;
        GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(conus->path, &error);
        if (!pixbuf || error) {
-               g_warning("GisPluginRadar: _conus_update_end - error loading pixbuf");
+               g_warning("Conus: update_end - error loading pixbuf");
                _gtk_bin_set_child(GTK_BIN(conus->config), gtk_label_new("Error loading pixbuf"));
                g_remove(conus->path);
                goto out;
@@ -507,10 +509,10 @@ gpointer _conus_update_thread(gpointer _conus)
        conus->message = NULL;
 
        /* Find nearest */
-       g_debug("GisPluginRadar: _conus_update_thread - nearest");
-       gboolean offline = gis_viewer_get_offline(conus->viewer);
+       g_debug("Conus: update_thread - nearest");
+       gboolean offline = grits_viewer_get_offline(conus->viewer);
        gchar *conus_url = "http://radar.weather.gov/Conus/RadarImg/";
-       GList *files = gis_http_available(conus->http,
+       GList *files = grits_http_available(conus->http,
                        "^Conus_[^\"]*_N0Ronly.gif$", "",
                        NULL, (offline ? NULL : conus_url));
        gchar *nearest = _find_nearest(conus->time, files, 6, "%Y%m%d_%H%M");
@@ -522,9 +524,9 @@ gpointer _conus_update_thread(gpointer _conus)
        }
 
        /* Fetch the image */
-       g_debug("GisPluginRadar: _conus_update_thread - fetch");
+       g_debug("Conus: update_thread - fetch");
        gchar *uri  = g_strconcat(conus_url, nearest, NULL);
-       conus->path = gis_http_fetch(conus->http, uri, nearest, GIS_ONCE,
+       conus->path = grits_http_fetch(conus->http, uri, nearest, GRITS_ONCE,
                        _conus_update_loading, conus);
        g_free(nearest);
        g_free(uri);
@@ -534,7 +536,7 @@ gpointer _conus_update_thread(gpointer _conus)
        }
 
 out:
-       g_debug("GisPluginRadar: _conus_update_thread - done");
+       g_debug("Conus: update_thread - done");
        g_idle_add(_conus_update_end, conus);
        return NULL;
 }
@@ -543,8 +545,8 @@ void _conus_update(RadarConus *conus)
 {
        if (!g_static_mutex_trylock(&conus->loading))
                return;
-       conus->time = gis_viewer_get_time(conus->viewer);
-       g_debug("GisPluginRadar: _conus_update - %d",
+       conus->time = grits_viewer_get_time(conus->viewer);
+       g_debug("Conus: update - %d",
                        (gint)conus->time);
 
        /* Add a progress bar */
@@ -557,15 +559,15 @@ void _conus_update(RadarConus *conus)
 
 void radar_conus_toggle(RadarConus *conus)
 {
-       GIS_OBJECT(conus->tile[0])->hidden =
-               !GIS_OBJECT(conus->tile[0])->hidden;
-       GIS_OBJECT(conus->tile[1])->hidden =
-               !GIS_OBJECT(conus->tile[1])->hidden;
+       GRITS_OBJECT(conus->tile[0])->hidden =
+               !GRITS_OBJECT(conus->tile[0])->hidden;
+       GRITS_OBJECT(conus->tile[1])->hidden =
+               !GRITS_OBJECT(conus->tile[1])->hidden;
        gtk_widget_queue_draw(GTK_WIDGET(conus->viewer));
 }
 
 RadarConus *radar_conus_new(GtkWidget *pconfig,
-               GisViewer *viewer, GisHttp *http)
+               GritsViewer *viewer, GritsHttp *http)
 {
        RadarConus *conus = g_new0(RadarConus, 1);
        conus->viewer  = g_object_ref(viewer);
@@ -576,14 +578,14 @@ RadarConus *radar_conus_new(GtkWidget *pconfig,
        gdouble south =  CONUS_NORTH - CONUS_DEG_PER_PX*CONUS_HEIGHT;
        gdouble east  =  CONUS_WEST  + CONUS_DEG_PER_PX*CONUS_WIDTH;
        gdouble mid   =  CONUS_WEST  + CONUS_DEG_PER_PX*CONUS_WIDTH/2;
-       conus->tile[0] = gis_tile_new(NULL, CONUS_NORTH, south, mid, CONUS_WEST);
-       conus->tile[1] = gis_tile_new(NULL, CONUS_NORTH, south, east, mid);
+       conus->tile[0] = grits_tile_new(NULL, CONUS_NORTH, south, mid, CONUS_WEST);
+       conus->tile[1] = grits_tile_new(NULL, CONUS_NORTH, south, east, mid);
        conus->tile[0]->zindex = 2;
        conus->tile[1]->zindex = 1;
-       conus->tile_ref[0] = gis_viewer_add(viewer,
-                       GIS_OBJECT(conus->tile[0]), GIS_LEVEL_WORLD, TRUE);
-       conus->tile_ref[1] = gis_viewer_add(viewer,
-                       GIS_OBJECT(conus->tile[1]), GIS_LEVEL_WORLD, TRUE);
+       conus->tile_ref[0] = grits_viewer_add(viewer,
+                       GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE);
+       conus->tile_ref[1] = grits_viewer_add(viewer,
+                       GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE);
 
        conus->time_id = g_signal_connect_swapped(viewer, "time-changed",
                        G_CALLBACK(_conus_update), conus);
@@ -603,13 +605,13 @@ void radar_conus_free(RadarConus *conus)
        g_signal_handler_disconnect(conus->viewer, conus->refresh_id);
 
        for (int i = 0; i < 2; i++) {
-               GisTile *tile = conus->tile[i];
-               gpointer ref  = conus->tile_ref[i];
+               GritsTile *tile = conus->tile[i];
+               gpointer   ref  = conus->tile_ref[i];
                if (tile->data) {
                        glDeleteTextures(1, tile->data);
                        g_free(tile->data);
                }
-               gis_viewer_remove(conus->viewer, ref);
+               grits_viewer_remove(conus->viewer, ref);
        }
 
        g_object_unref(conus->viewer);
@@ -617,17 +619,17 @@ void radar_conus_free(RadarConus *conus)
 }
 
 
-/******************
- * GisPluginRadar *
- ******************/
-static void _draw_hud(GisCallback *callback, gpointer _self)
+/********************
+ * GritsPluginRadar *
+ ********************/
+static void _draw_hud(GritsCallback *callback, gpointer _self)
 {
        /* TODO */
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       GritsPluginRadar *self = GRITS_PLUGIN_RADAR(_self);
        if (!self->colormap)
                return;
 
-       g_debug("GisPluginRadar: _draw_hud");
+       g_debug("GritsPluginRadar: _draw_hud");
        /* Print the color table */
        glMatrixMode(GL_MODELVIEW ); glLoadIdentity();
        glMatrixMode(GL_PROJECTION); glLoadIdentity();
@@ -649,17 +651,17 @@ static void _draw_hud(GisCallback *callback, gpointer _self)
 }
 
 /* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
+GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs)
 {
        /* TODO: move to constructor if possible */
-       g_debug("GisPluginRadar: new");
-       GisPluginRadar *self = g_object_new(GIS_TYPE_PLUGIN_RADAR, NULL);
+       g_debug("GritsPluginRadar: new");
+       GritsPluginRadar *self = g_object_new(GRITS_TYPE_PLUGIN_RADAR, NULL);
        self->viewer = viewer;
        self->prefs  = prefs;
 
        /* Load HUD */
-       GisCallback *hud_cb = gis_callback_new(_draw_hud, self);
-       self->hud_ref = gis_viewer_add(viewer, GIS_OBJECT(hud_cb), GIS_LEVEL_HUD, FALSE);
+       GritsCallback *hud_cb = grits_callback_new(_draw_hud, self);
+       self->hud_ref = grits_viewer_add(viewer, GRITS_OBJECT(hud_cb), GRITS_LEVEL_HUD, FALSE);
 
        /* Load Conus */
        self->conus = radar_conus_new(self->config, self->viewer, self->conus_http);
@@ -676,60 +678,64 @@ GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs)
        return self;
 }
 
-static GtkWidget *gis_plugin_radar_get_config(GisPlugin *_self)
+static GtkWidget *grits_plugin_radar_get_config(GritsPlugin *_self)
 {
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
+       GritsPluginRadar *self = GRITS_PLUGIN_RADAR(_self);
        return self->config;
 }
 
 /* GObject code */
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface);
-G_DEFINE_TYPE_WITH_CODE(GisPluginRadar, gis_plugin_radar, G_TYPE_OBJECT,
-               G_IMPLEMENT_INTERFACE(GIS_TYPE_PLUGIN,
-                       gis_plugin_radar_plugin_init));
-static void gis_plugin_radar_plugin_init(GisPluginInterface *iface)
+static void grits_plugin_radar_plugin_init(GritsPluginInterface *iface);
+G_DEFINE_TYPE_WITH_CODE(GritsPluginRadar, grits_plugin_radar, G_TYPE_OBJECT,
+               G_IMPLEMENT_INTERFACE(GRITS_TYPE_PLUGIN,
+                       grits_plugin_radar_plugin_init));
+static void grits_plugin_radar_plugin_init(GritsPluginInterface *iface)
 {
-       g_debug("GisPluginRadar: plugin_init");
+       g_debug("GritsPluginRadar: plugin_init");
        /* Add methods to the interface */
-       iface->get_config = gis_plugin_radar_get_config;
+       iface->get_config = grits_plugin_radar_get_config;
 }
-static void gis_plugin_radar_init(GisPluginRadar *self)
+static void grits_plugin_radar_init(GritsPluginRadar *self)
 {
-       g_debug("GisPluginRadar: class_init");
+       g_debug("GritsPluginRadar: class_init");
        /* Set defaults */
-       self->sites_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "level2" G_DIR_SEPARATOR_S);
-       self->conus_http = gis_http_new(G_DIR_SEPARATOR_S "nexrad" G_DIR_SEPARATOR_S "conus" G_DIR_SEPARATOR_S);
+       self->sites_http = grits_http_new(G_DIR_SEPARATOR_S
+                       "nexrad" G_DIR_SEPARATOR_S
+                       "level2" G_DIR_SEPARATOR_S);
+       self->conus_http = grits_http_new(G_DIR_SEPARATOR_S
+                       "nexrad" G_DIR_SEPARATOR_S
+                       "conus"  G_DIR_SEPARATOR_S);
        self->sites      = g_hash_table_new_full(g_str_hash, g_str_equal,
                                NULL, (GDestroyNotify)radar_site_free);
        self->config     = gtk_notebook_new();
        /* Need to position on the top because of Win32 bug */
        gtk_notebook_set_tab_pos(GTK_NOTEBOOK(self->config), GTK_POS_BOTTOM);
 }
-static void gis_plugin_radar_dispose(GObject *gobject)
+static void grits_plugin_radar_dispose(GObject *gobject)
 {
-       g_debug("GisPluginRadar: dispose");
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
-       gis_viewer_remove(self->viewer, self->hud_ref);
+       g_debug("GritsPluginRadar: dispose");
+       GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
+       grits_viewer_remove(self->viewer, self->hud_ref);
        radar_conus_free(self->conus);
        /* Drop references */
-       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->dispose(gobject);
+       G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);
 }
-static void gis_plugin_radar_finalize(GObject *gobject)
+static void grits_plugin_radar_finalize(GObject *gobject)
 {
-       g_debug("GisPluginRadar: finalize");
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(gobject);
+       g_debug("GritsPluginRadar: finalize");
+       GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
        /* Free data */
-       gis_http_free(self->conus_http);
-       gis_http_free(self->sites_http);
+       grits_http_free(self->conus_http);
+       grits_http_free(self->sites_http);
        g_hash_table_destroy(self->sites);
        gtk_widget_destroy(self->config);
-       G_OBJECT_CLASS(gis_plugin_radar_parent_class)->finalize(gobject);
+       G_OBJECT_CLASS(grits_plugin_radar_parent_class)->finalize(gobject);
 
 }
-static void gis_plugin_radar_class_init(GisPluginRadarClass *klass)
+static void grits_plugin_radar_class_init(GritsPluginRadarClass *klass)
 {
-       g_debug("GisPluginRadar: class_init");
+       g_debug("GritsPluginRadar: class_init");
        GObjectClass *gobject_class = (GObjectClass*)klass;
-       gobject_class->dispose  = gis_plugin_radar_dispose;
-       gobject_class->finalize = gis_plugin_radar_finalize;
+       gobject_class->dispose  = grits_plugin_radar_dispose;
+       gobject_class->finalize = grits_plugin_radar_finalize;
 }
index 2ed86acb1568c9af3f4935c957364bafb000b8e5..8227aa15d6cfeeaa61f5086b3218dd18b37697f4 100644 (file)
 #include <glib-object.h>
 #include <rsl.h>
 
-#include <gis.h>
+#include <grits.h>
 #include "level2.h"
 
-#define GIS_TYPE_PLUGIN_RADAR            (gis_plugin_radar_get_type ())
-#define GIS_PLUGIN_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GIS_TYPE_PLUGIN_RADAR, GisPluginRadar))
-#define GIS_IS_PLUGIN_RADAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GIS_TYPE_PLUGIN_RADAR))
-#define GIS_PLUGIN_RADAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GIS_TYPE_PLUGIN_RADAR, GisPluginRadarClass))
-#define GIS_IS_PLUGIN_RADAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GIS_TYPE_PLUGIN_RADAR))
-#define GIS_PLUGIN_RADAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GIS_TYPE_PLUGIN_RADAR, GisPluginRadarClass))
+#define GRITS_TYPE_PLUGIN_RADAR            (grits_plugin_radar_get_type ())
+#define GRITS_PLUGIN_RADAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),   GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadar))
+#define GRITS_IS_PLUGIN_RADAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),   GRITS_TYPE_PLUGIN_RADAR))
+#define GRITS_PLUGIN_RADAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST   ((klass), GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadarClass))
+#define GRITS_IS_PLUGIN_RADAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE   ((klass), GRITS_TYPE_PLUGIN_RADAR))
+#define GRITS_PLUGIN_RADAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),   GRITS_TYPE_PLUGIN_RADAR, GritsPluginRadarClass))
 
-typedef struct _GisPluginRadar        GisPluginRadar;
-typedef struct _GisPluginRadarClass   GisPluginRadarClass;
+typedef struct _GritsPluginRadar      GritsPluginRadar;
+typedef struct _GritsPluginRadarClass GritsPluginRadarClass;
 
 typedef struct _RadarConus RadarConus;
 typedef struct _RadarSite  RadarSite;
 
-struct _GisPluginRadar {
+struct _GritsPluginRadar {
        GObject parent_instance;
 
        /* instance members */
-       GisViewer  *viewer;
-       GisPrefs   *prefs;
-       GtkWidget  *config;
+       GritsViewer *viewer;
+       GritsPrefs  *prefs;
+       GtkWidget   *config;
        AWeatherColormap *colormap;
        gpointer    *hud_ref;
 
-       GHashTable *sites;
-       GisHttp    *sites_http;
+       GHashTable  *sites;
+       GritsHttp   *sites_http;
 
-       RadarConus *conus;
-       GisHttp    *conus_http;
+       RadarConus  *conus;
+       GritsHttp   *conus_http;
 };
 
-struct _GisPluginRadarClass {
+struct _GritsPluginRadarClass {
        GObjectClass parent_class;
 };
 
-GType gis_plugin_radar_get_type();
+GType grits_plugin_radar_get_type();
 
 /* Methods */
-GisPluginRadar *gis_plugin_radar_new(GisViewer *viewer, GisPrefs *prefs);
+GritsPluginRadar *grits_plugin_radar_new(GritsViewer *viewer, GritsPrefs *prefs);
 
 /* Misc. RSL helpers */
 #define RSL_FOREACH_VOL(radar, volume, count, index) \