Base classes

diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000

diff --git a/INSTALL b/INSTALL
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..5bb6e7b7e1a1d3ba4362b1467fabbf2acb70dcbd
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+/usr/share/automake-1.10/INSTALL
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index ec817cabbb36a598abb8e63ae454f93eec1bcf76..29dc4a6019ee7404c41f78ee03e3cab0d1366608 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,8 @@ GTK_DOC_CHECK
 AC_PATH_PROG(GDAL_CONFIG, "gdal-config", "", $PATH)
 
 # Checks for libraries.
-PKG_CHECK_MODULES([GTKGIS], [gtk+-2.0 >= 2.10.0])
+PKG_CHECK_MODULES([GTKGIS], [gtk+-2.0 >= 2.10.0
+                             goocanvas >= 0.13])
 
 AC_SUBST(GTKGIS_CFLAGS)
 AC_SUBST(GTKGIS_LIBS)

diff --git a/src/Makefile.am b/src/Makefile.am
index c44f47b0461b808bf9f241f4636745a093024b20..753e6877709aa2a0604fa5098a94229165765ceb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,21 @@ lib_LTLIBRARIES = libgtkgis.la
 libgtkgis_la_LDFLAGS = -no-undefined
 
 libgtkgis_la_SOURCES = \
-                       gtkgis.c
+                       gtkgis.c \
+                       layer.c \
+                       layersource.c \
+                       layersourceshp.c \
+                       layersourcepostgis.c \
+                       geometry.c
 
 include_HEADERS = \
-                  libgtkgis.h
+                  libgtkgis.h \
+                  gtkgis.h \
+                  layer.h \
+                  layersource.h \
+                  layersourceshp.h \
+                  layersourcepostgis.h \
+                  geometry.h
+
 
 noinst_HEADERS =

diff --git a/src/gtkgis.c b/src/gtkgis.c
index 362398a42f78ad9d40b5493c36d7e8ee3ef6e015..b215af6aa6660c93642b156258c3d0e07dd61fa0 100644 (file)
--- a/src/gtkgis.c
+++ b/src/gtkgis.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <cairo.h>
+#include <goocanvas.h>
 
 #include <ogr_api.h>
 #include <ogr_core.h>
@@ -45,6 +45,10 @@ static void gtk_gis_get_property (GObject *object,
 typedef struct _GtkGisPrivate GtkGisPrivate;
 struct _GtkGisPrivate
        {
+               GtkWidget *canvas;
+               GooCanvasItem *canvas_root;
+
+               GList *layers;
        };
 
 GType
@@ -109,12 +113,59 @@ GtkGis
        return gtk_gis;
 }
 
+/**
+ * gtk_gis_new_from_file:
+ * @filename:
+ *
+ * Returns: the newly created #GtkGis object.
+ */
+GtkGis
+*gtk_gis_new_from_file (gchar *filename)
+{
+}
+
+/**
+ * gtk_gis_save_to_file:
+ * @gtkgis:
+ * @filename:
+ */
+void
+*gtk_gis_save_to_file (GtkGis *gtkgis, gchar *filename)
+{
+}
+
+/**
+ * gtk_gis_add_layer:
+ * @gtkgis:
+ * @layer:
+ */
+void
+gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer)
+{
+       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis);
+
+       priv->layers = g_list_append (priv->layers, layer);
+}
+
+/**
+ * gtk_gis_remove_layer:
+ * @gtkgis:
+ * @layer:
+ */
+void
+gtk_gis_remove_layer (GtkGis *gtkgis, GtkGisLayer *layer)
+{
+       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis);
+
+       priv->layers = g_list_remove (priv->layers, layer);
+}
+
 static void
 gtk_gis_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
-       GtkGis *gtk_gis = GTK_GIS (object);
+       GtkGis *gtkgis = GTK_GIS (object);
 
-       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtk_gis);
+       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis);
 
        switch (property_id)
                {
@@ -127,9 +178,9 @@ gtk_gis_set_property (GObject *object, guint property_id, const GValue *value, G
 static void
 gtk_gis_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
-       GtkGis *gtk_gis = GTK_GIS (object);
+       GtkGis *gtkgis = GTK_GIS (object);
 
-       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtk_gis);
+       GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis);
 
        switch (property_id)
                {

diff --git a/src/gtkgis.h b/src/gtkgis.h
index 30d648585404cd6903f84ff5c06bacaaa9000fb9..f28b8001ba650b21b7e2fd4cac7250009745b6a5 100644 (file)
--- a/src/gtkgis.h
+++ b/src/gtkgis.h
@@ -20,8 +20,9 @@
 #ifndef __GTK_GIS_H__
 #define __GTK_GIS_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtkwidget.h>
+
+#include "layer.h"
 
 G_BEGIN_DECLS
 
@@ -39,12 +40,12 @@ typedef struct _GtkGisClass GtkGisClass;
 
 struct _GtkGis
        {
-               GObject parent;
+               GtkWidget parent;
        };
 
 struct _GtkGisClass
        {
-               GObjectClass parent_class;
+               GtkWidgetClass parent_class;
        };
 
 GType gtk_gis_get_type (void) G_GNUC_CONST;
@@ -52,6 +53,17 @@ GType gtk_gis_get_type (void) G_GNUC_CONST;
 
 GtkGis *gtk_gis_new (void);
 
+GtkGis *gtk_gis_new_from_file (gchar *filename);
+
+void *gtk_gis_save_to_file (GtkGis *gtkgis, gchar *filename);
+
+void gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer);
+void gtk_gis_remove_layer (GtkGis *gtkgis, GtkGisLayer *layer);
+
+void gtk_gis_set_legend_visible (GtkGis *gtkgis, gboolean visible);
+
+GtkWidget *gtk_gis_get_legend (GtkGis *gtkgis);
+
 
 G_END_DECLS