From: Andrea Zagli Date: Wed, 24 Jun 2009 20:05:53 +0000 (+0200) Subject: Continued base classes. X-Git-Tag: GTKGIS_0_0_1~10 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=17b8d50b87c5ba0014dbf734126465c63922d28d;p=libgtkgis Continued base classes. Added samples data. Added test test1. --- diff --git a/.gitignore b/.gitignore index 601c09b..1fc3380 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ missing src/.deps/ src/.libs/ stamp-h1 +tests/.deps # temporarily TODO.tasks diff --git a/configure.ac b/configure.ac index c050dc5..2577e57 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ AC_PATH_PROG(GDAL_CONFIG, "gdal-config", "", $PATH) # Checks for libraries. PKG_CHECK_MODULES([GTKGIS], [gtk+-2.0 >= 2.10.0 + libxml-2.0 >= 2.7.0 goocanvas >= 0.13]) AC_SUBST(GTKGIS_CFLAGS) @@ -54,5 +55,6 @@ AC_CONFIG_FILES([ src/Makefile data/Makefile tests/Makefile + tests/samples/Makefile ]) AC_OUTPUT diff --git a/data/gtkgis.dtd b/data/gtkgis.dtd index 43ad2bc..8e4301e 100644 --- a/data/gtkgis.dtd +++ b/data/gtkgis.dtd @@ -1,8 +1,11 @@ - + + + diff --git a/src/Makefile.am b/src/Makefile.am index 2cd0b81..7e708c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ libgtkgis_la_LDFLAGS = -no-undefined libgtkgis_la_SOURCES = \ gtkgis.c \ + layersgroup.c \ layer.c \ layersource.c \ layersourceshp.c \ @@ -25,6 +26,7 @@ include_HEADERS = \ libgtkgis.h \ gtkgis.h \ layer.h \ + layersgroup.h \ layersource.h \ layersourceshp.h \ layersourcepostgis.h \ diff --git a/src/geometry.c b/src/geometry.c index 6d9969c..b0bd855 100644 --- a/src/geometry.c +++ b/src/geometry.c @@ -92,23 +92,6 @@ gtk_gis_geometry_init (GtkGisGeometry *gtk_gis_geometry) GtkGisGeometryPrivate *priv = GTK_GIS_GEOMETRY_GET_PRIVATE (gtk_gis_geometry); } -/** - * gtk_gis_geometry_new: - * - * Creates a new #GtkGisGeometry object. - * - * Returns: the newly created #GtkGisGeometry object. - */ -GtkGisGeometry -*gtk_gis_geometry_new () -{ - GtkGisGeometry *gtk_gis_geometry; - - gtk_gis_geometry = GTK_GIS_GEOMETRY (g_object_new (gtk_gis_geometry_get_type (), NULL)); - - return gtk_gis_geometry; -} - static void gtk_gis_geometry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { diff --git a/src/geometry.h b/src/geometry.h index 5ea5833..f0c7567 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -50,8 +50,6 @@ struct _GtkGisGeometryClass GType gtk_gis_geometry_get_type (void) G_GNUC_CONST; -GtkGisGeometry *gtk_gis_geometry_new (void); - gboolean gtk_gis_geometry_get_editable (GtkGisGeometry *geometry); void gtk_gis_geometry_set_editable (GtkGisGeometry *geometry, gboolean editable); diff --git a/src/geometryline.c b/src/geometryline.c index 3a5b6b1..eaa91d7 100644 --- a/src/geometryline.c +++ b/src/geometryline.c @@ -45,6 +45,7 @@ static void gtk_gis_geometry_line_get_property (GObject *object, typedef struct _GtkGisGeometryLinePrivate GtkGisGeometryLinePrivate; struct _GtkGisGeometryLinePrivate { + GPtrArray *points; }; GType @@ -90,6 +91,8 @@ static void gtk_gis_geometry_line_init (GtkGisGeometryLine *gtk_gis_geometry_line) { GtkGisGeometryLinePrivate *priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (gtk_gis_geometry_line); + + priv->points = g_ptr_array_new (); } /** @@ -109,6 +112,60 @@ GtkGisGeometryLine return gtk_gis_geometry_line; } +/** + * gtk_gis_geometry_line_new_from_array: + * @points: + * + * Creates a new #GtkGisGeometryLine object. + * + * Returns: the newly created #GtkGisGeometryLine object. + */ +GtkGisGeometryLine +*gtk_gis_geometry_line_new_from_array (GPtrArray *points) +{ + GtkGisGeometryLine *gtk_gis_geometry_line; + GtkGisGeometryLinePrivate *priv; + + gtk_gis_geometry_line = gtk_gis_geometry_line_new (); + + priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (gtk_gis_geometry_line); + + priv->points = points; + + return gtk_gis_geometry_line; +} + +/** + * gtk_gis_geomtry_line_add_point: + * @line: + * @point: + */ +void +gtk_gis_geomtry_line_add_point (GtkGisGeometryLine *line, GtkGisGeometryPoint *point) +{ + GtkGisGeometryLinePrivate *priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (gtk_gis_geometry_line); + + g_ptr_array_add (priv->points, point); +} + +/** + * gtk_gis_geometry_line_add_point_from_coordinates: + * @line: + * @x: + * @y: + * + */ +void +gtk_gis_geomtry_line_add_point_from_coordinates (GtkGisGeometryLine *line, + gdouble x, gdouble y) +{ + GtkGisGeometryPoint *point; + + point = gtk_gis_geometry_point_new (x, y); + + gtk_gis_geometry_line_add_point (line, point); +} + static void gtk_gis_geometry_line_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { diff --git a/src/geometryline.h b/src/geometryline.h index 0383fb2..63a1f10 100644 --- a/src/geometryline.h +++ b/src/geometryline.h @@ -21,6 +21,7 @@ #define __GTK_GIS_GEOMETRY_LINE_H__ #include "geometry.h" +#include "geometrypoint.h" G_BEGIN_DECLS @@ -51,6 +52,13 @@ GType gtk_gis_geometry_line_get_type (void) G_GNUC_CONST; GtkGisGeometryLine *gtk_gis_geometry_line_new (void); +GtkGisGeometryLine *gtk_gis_geometry_line_new_from_array (GPtrArray *points); + +void gtk_gis_geomtry_line_add_point (GtkGisGeometryLine *line, GtkGisGeometryPoint *point); +void gtk_gis_geomtry_line_add_point_from_coordinates (GtkGisGeometryLine *line, + gdouble x, gdouble y); + + G_END_DECLS diff --git a/src/geometrypoint.c b/src/geometrypoint.c index eb3519f..ad18bb4 100644 --- a/src/geometrypoint.c +++ b/src/geometrypoint.c @@ -45,6 +45,8 @@ static void gtk_gis_geometry_point_get_property (GObject *object, typedef struct _GtkGisGeometryPointPrivate GtkGisGeometryPointPrivate; struct _GtkGisGeometryPointPrivate { + gdouble x; + gdouble y; }; GType @@ -94,21 +96,45 @@ gtk_gis_geometry_point_init (GtkGisGeometryPoint *gtk_gis_geometry_point) /** * gtk_gis_geometry_point_new: + * @x: + * @y: * * Creates a new #GtkGisGeometryPoint object. * * Returns: the newly created #GtkGisGeometryPoint object. */ GtkGisGeometryPoint -*gtk_gis_geometry_point_new () +*gtk_gis_geometry_point_new (gdouble x, gdouble y) { GtkGisGeometryPoint *gtk_gis_geometry_point; + GtkGisGeometryPointPrivate *priv; gtk_gis_geometry_point = GTK_GIS_GEOMETRY_POINT (g_object_new (gtk_gis_geometry_point_get_type (), NULL)); + priv = GTK_GIS_GEOMETRY_POINT_GET_PRIVATE (gtk_gis_geometry_point); + + priv->x = x; + priv->y = y; + return gtk_gis_geometry_point; } +gdouble +gtk_gis_geometry_get_x (GtkGisGeometryPoint *point) +{ + GtkGisGeometryPointPrivate *priv = GTK_GIS_GEOMETRY_POINT_GET_PRIVATE (gtk_gis_geometry_point); + + return priv->x; +} + +gdouble +gtk_gis_geometry_get_y (GtkGisGeometryPoint *point) +{ + GtkGisGeometryPointPrivate *priv = GTK_GIS_GEOMETRY_POINT_GET_PRIVATE (gtk_gis_geometry_point); + + return priv->y; +} + static void gtk_gis_geometry_point_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { diff --git a/src/geometrypoint.h b/src/geometrypoint.h index 15eec16..12e899b 100644 --- a/src/geometrypoint.h +++ b/src/geometrypoint.h @@ -49,7 +49,10 @@ struct _GtkGisGeometryPointClass GType gtk_gis_geometry_point_get_type (void) G_GNUC_CONST; -GtkGisGeometryPoint *gtk_gis_geometry_point_new (void); +GtkGisGeometryPoint *gtk_gis_geometry_point_new (gdouble x, gdouble y); + +gdouble gtk_gis_geometry_get_x (GtkGisGeometryPoint *point); +gdouble gtk_gis_geometry_get_y (GtkGisGeometryPoint *point); G_END_DECLS diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c index bfb4af9..4dad0b2 100644 --- a/src/geometrypolygon.c +++ b/src/geometrypolygon.c @@ -109,6 +109,24 @@ GtkGisGeometryPolygon return gtk_gis_geometry_polygon; } +/** + * gtk_gis_geometry_polygon_new_from_array: + * @points: + * + * Creates a new #GtkGisGeometryPolygon object. + * + * Returns: the newly created #GtkGisGeometryPolygon object. + */ +GtkGisGeometryPolygon +*gtk_gis_geometry_polygon_new_from_array (GPtrArray *points) +{ + GtkGisGeometryPolygon *gtk_gis_geometry_polygon; + + gtk_gis_geometry_polygon = gtk_gis_geometry_line_new_from_array (points); + + return gtk_gis_geometry_polygon; +} + static void gtk_gis_geometry_polygon_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { diff --git a/src/geometrypolygon.h b/src/geometrypolygon.h index 2b740e9..97e9a9d 100644 --- a/src/geometrypolygon.h +++ b/src/geometrypolygon.h @@ -20,7 +20,7 @@ #ifndef __GTK_GIS_GEOMETRY_POLYGON_H__ #define __GTK_GIS_GEOMETRY_POLYGON_H__ -#include "geometry.h" +#include "geometryline.h" G_BEGIN_DECLS @@ -38,12 +38,12 @@ typedef struct _GtkGisGeometryPolygonClass GtkGisGeometryPolygonClass; struct _GtkGisGeometryPolygon { - GtkGisGeometry parent; + GtkGisGeometryLine parent; }; struct _GtkGisGeometryPolygonClass { - GtkGisGeometryClass parent_class; + GtkGisGeometryClassLine parent_class; }; GType gtk_gis_geometry_polygon_get_type (void) G_GNUC_CONST; @@ -51,6 +51,8 @@ GType gtk_gis_geometry_polygon_get_type (void) G_GNUC_CONST; GtkGisGeometryPolygon *gtk_gis_geometry_polygon_new (void); +GtkGisGeometryPolygon *gtk_gis_geometry_polygon_new_from_array (GPtrArray *points); + G_END_DECLS diff --git a/src/gtkgis.c b/src/gtkgis.c index b215af6..c2ef009 100644 --- a/src/gtkgis.c +++ b/src/gtkgis.c @@ -48,6 +48,7 @@ struct _GtkGisPrivate GtkWidget *canvas; GooCanvasItem *canvas_root; + GList *layer_groups; GList *layers; }; @@ -113,6 +114,116 @@ GtkGis return gtk_gis; } +/** + * gtk_gis_new_from_xml: + * @xdoc: + * + * Returns: the newly created #GtkGis object. + */ +GtkGis +*gtk_gis_new_from_xml (xmlDoc *xdoc) +{ + GtkGis *gtkgis = NULL; + xmlNode *cur; + + cur = xmlDocGetRootElement (xdoc); + if (cur != NULL) + { + if (strcmp (cur->name, "gtkgis") == 0) + { + GtkGisPrivate *priv; + + gtkgis = gtk_gis_new (); + + priv = GTK_GIS_GET_PRIVATE (gtkgis); + + cur = cur->children; + while (cur != NULL) + { + if (cur->type == XML_ELEMENT_NODE + && xmlStrcmp (cur->name, "layer") == 0) + { + xmlNode *xml_layer; + gchar *layer_name; + + xml_layer = cur; + + layer_name = xmlGetProp (cur, (const xmlChar *)"name"); + if (layer_name != NULL) + { + /* TO DO */ + /* get layer source name */ + layer_name = g_strdup_printf ("layer"); + } + + cur = cur->children; + if (cur != NULL + && cur->type == XML_ELEMENT_NODE + && xmlStrcmp (cur->name, "source") == 0) + { + xmlNode *xml_source; + + xml_source = cur; + + if (cur != NULL + && cur->type == XML_ELEMENT_NODE + && (xmlStrcmp (cur->name, "shape") == 0 + || xmlStrcmp (cur->name, "postgis") == 0)) + { + xmlNode *xml_source_spec; + GtkGisLayer *layer = NULL; + GtkGisLayerSource *layer_source = NULL; + + xml_source_spec = cur; + + if (xmlStrcmp (cur->name, "shape") == 0) + { + gchar *filename; + + filename = xmlGetProp (cur, (const xmlChar *)"filename"); + if (filename != NULL) + { + layer_source = gtk_gis_layer_source_shp_new (filename); + } + } + else if (xmlStrcmp (cur->name, "postgis") == 0) + { + /* TO DO */ + } + + if (layer_source != NULL) + { + layer = gtk_gis_layer_new_from_source (layer_source, layer_name); + gtk_gis_add_layer (gtkgis, layer); + } + + cur = xml_source_spec; + } + + cur = xml_source; + } + + cur = xml_layer; + } + + cur = cur->next; + } + } + else + { + /* TO DO */ + g_error ("Node \"gtkgis\" is missing."); + } + } + else + { + /* TO DO */ + g_warning ("The file is not a valid gtkgis file."); + } + + return gtkgis; +} + /** * gtk_gis_new_from_file: * @filename: @@ -120,17 +231,26 @@ GtkGis * Returns: the newly created #GtkGis object. */ GtkGis -*gtk_gis_new_from_file (gchar *filename) +*gtk_gis_new_from_file (const gchar *filename) { + GtkGis *gtkgis = NULL; + + xmlDoc *xdoc = xmlParseFile (filename); + if (xdoc != NULL) + { + gtkgis = gtk_gis_new_from_xml (xdoc); + } + + return gtkgis; } /** - * gtk_gis_save_to_file: + * gtk_gis_save_to_xml: * @gtkgis: * @filename: */ void -*gtk_gis_save_to_file (GtkGis *gtkgis, gchar *filename) +*gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *filename) { } diff --git a/src/gtkgis.h b/src/gtkgis.h index f28b800..a45abf9 100644 --- a/src/gtkgis.h +++ b/src/gtkgis.h @@ -21,7 +21,9 @@ #define __GTK_GIS_H__ #include +#include +#include "layersgroup.h" #include "layer.h" G_BEGIN_DECLS @@ -53,9 +55,13 @@ GType gtk_gis_get_type (void) G_GNUC_CONST; GtkGis *gtk_gis_new (void); +GtkGis *gtk_gis_new_from_xml (xmlDoc *xdoc); GtkGis *gtk_gis_new_from_file (gchar *filename); -void *gtk_gis_save_to_file (GtkGis *gtkgis, gchar *filename); +void *gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *filename); + +void gtk_gis_add_group (GtkGis *gtkgis, GtkGisLayersGroup *group); +void gtk_gis_remove_group (GtkGis *gtkgis, GtkGisLayersGroup *group); void gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer); void gtk_gis_remove_layer (GtkGis *gtkgis, GtkGisLayer *layer); diff --git a/src/layer.c b/src/layer.c index bf15d64..3634bf0 100644 --- a/src/layer.c +++ b/src/layer.c @@ -153,6 +153,8 @@ GtkGisLayer layer = gtk_gis_layer_new (source, name, type); + gtk_gis_layer_source_fill_layer (source, layer); + return layer; } diff --git a/src/layer.h b/src/layer.h index 407950f..a00a71e 100644 --- a/src/layer.h +++ b/src/layer.h @@ -88,7 +88,7 @@ gboolean gtk_gis_layer_get_editable (GtkGisLayer *layer); void gtk_gis_layer_set_editable (GtkGisLayer *layer, gboolean editable); -void gtk_gis_layer_draw (GtkGisLayer *layer +void gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *canvas_root); diff --git a/src/layersgroup.c b/src/layersgroup.c new file mode 100644 index 0000000..389f28c --- /dev/null +++ b/src/layersgroup.c @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2009 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "layersgroup.h" + +static void gtk_gis_layers_group_class_init (GtkGisLayersGroupClass *klass); +static void gtk_gis_layers_group_init (GtkGisLayersGroup *gtk_gis_layers_group); + +static void gtk_gis_layers_group_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_gis_layers_group_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + + +#define GTK_GIS_LAYERS_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroupPrivate)) + +typedef struct _GtkGisLayersGroupPrivate GtkGisLayersGroupPrivate; +struct _GtkGisLayersGroupPrivate + { + gchar *name; + + gboolean visible; + + GList *layers; + }; + +GType +gtk_gis_layers_group_get_type (void) +{ + static GType gtk_gis_layers_group_type = 0; + + if (!gtk_gis_layers_group_type) + { + static const GTypeInfo gtk_gis_layers_group_info = + { + sizeof (GtkGisLayersGroupClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_gis_layers_group_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkGisLayersGroup), + 0, /* n_preallocs */ + (GInstanceInitFunc) gtk_gis_layers_group_init, + NULL + }; + + gtk_gis_layers_group_type = g_type_register_static (G_TYPE_OBJECT, "GtkGisLayersGroup", + >k_gis_layers_group_info, 0); + } + + return gtk_gis_layers_group_type; +} + +static void +gtk_gis_layers_group_class_init (GtkGisLayersGroupClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GtkGisLayersGroupPrivate)); + + object_class->set_property = gtk_gis_layers_group_set_property; + object_class->get_property = gtk_gis_layers_group_get_property; +} + +static void +gtk_gis_layers_group_init (GtkGisLayersGroup *gtk_gis_layers_group) +{ + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (gtk_gis_layers_group); +} + +/** + * gtk_gis_layers_group_new: + * @source: + * @name: + * @geometrytype: + * + * Creates a new empty #GtkGisLayersGroup object. + * + * Returns: the newly created #GtkGisLayersGroup object. + */ +GtkGisLayersGroup +*gtk_gis_layers_group_new (const gchar *name) +{ + GtkGisLayersGroup *gtk_gis_layers_group; + GtkGisLayersGroupPrivate *priv; + + gtk_gis_layers_group = GTK_GIS_LAYERS_GROUP (g_object_new (gtk_gis_layers_group_get_type (), NULL)); + + priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + priv->name = g_strdup (name); + + return gtk_gis_layers_group; +} + +/** + * gtk_gis_layers_group_get_name: + * @layers_group: + * + * Returns: the #GtkGisLayersGroup's name. + */ +gchar +*gtk_gis_layers_group_get_name (GtkGisLayersGroup *layers_group) +{ + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + return g_strdup (priv->name); +} + +/** + * gtk_gis_layers_group_set_name: + * @layers_group: + * @name: + */ +void +gtk_gis_layers_group_set_name (GtkGisLayersGroup *layers_group, + const gchar *name) +{ + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + priv->name = g_strdup (name); +} + +/** + * gtk_gis_layers_group_add_layer: + * @layers_group: + * @layer: + */ +void +gtk_gis_layers_group_add_geometry (GtkGisLayersGroup *layers_group, GtkGisLayer *layer) +{ + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + priv->layers = g_list_append (priv->layers, layer); +} + +/** + * gtk_gis_layers_group_remove_layer: + * @layers_group: + * @layer: + */ +void +gtk_gis_layers_group_remove_layer (GtkGisLayersGroup *layers_group, GtkGisLayer *layer) +{ + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + priv->layers = g_list_remove (priv->layers, layer); +} + +static void +gtk_gis_layers_group_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GtkGisLayersGroup *layers_group = GTK_GIS_LAYERS_GROUP (object); + + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gtk_gis_layers_group_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GtkGisLayersGroup *layers_group = GTK_GIS_LAYERS_GROUP (object); + + GtkGisLayersGroupPrivate *priv = GTK_GIS_LAYERS_GROUP_GET_PRIVATE (layers_group); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/layersgroup.h b/src/layersgroup.h new file mode 100644 index 0000000..beb141d --- /dev/null +++ b/src/layersgroup.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2009 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __GTK_GIS_LAYERS_GROUP_H__ +#define __GTK_GIS_LAYERS_GROUP_H__ + +#include +#include + +#include "layer.h" + +G_BEGIN_DECLS + + +#define TYPE_GTK_GIS_LAYERS_GROUP (gtk_gis_layers_group_get_type ()) +#define GTK_GIS_LAYERS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroup)) +#define GTK_GIS_LAYERS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroupClass)) +#define IS_GTK_GIS_LAYERS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYERS_GROUP)) +#define IS_GTK_GIS_LAYERS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYERS_GROUP)) +#define GTK_GIS_LAYERS_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroupClass)) + + +typedef struct _GtkGisLayersGroup GtkGisLayersGroup; +typedef struct _GtkGisLayersGroupClass GtkGisLayersGroupClass; + +struct _GtkGisLayersGroup + { + GObject parent; + }; + +struct _GtkGisLayersGroupClass + { + GObjectClass parent_class; + }; + +GType gtk_gis_layers_group_get_type (void) G_GNUC_CONST; + + +GtkGisLayersGroup *gtk_gis_layers_group_new (const gchar *name); + +void gtk_gis_layers_group_add_layer (GtkGisLayersGroup *layers_group, + GtkGisLayer *layer); +void gtk_gis_layers_group_remove_layer (GtkGisLayersGroup *layers_group, + GtkGisLayer *layer); + +const gchar *gtk_gis_layers_group_get_name (GtkGisLayersGroup *layers_group); +void gtk_gis_layers_group_set_name (GtkGisLayersGroup *layers_group, + const gchar *name); + + +G_END_DECLS + +#endif /* __GTK_GIS_LAYERS_GROUP_H__ */ diff --git a/src/layersource.c b/src/layersource.c index 9d2649c..3c7222b 100644 --- a/src/layersource.c +++ b/src/layersource.c @@ -92,24 +92,7 @@ gtk_gis_layer_source_init (GtkGisLayerSource *gtk_gis_layer_source) } /** - * gtk_gis_layer_source_new: - * - * Creates a new #GtkGisLayerSource object. - * - * Returns: the newly created #GtkGisLayerSource object. - */ -GtkGisLayerSource -*gtk_gis_layer_source_new () -{ - GtkGisLayerSource *gtk_gis_layer_source; - - gtk_gis_layer_source = GTK_GIS_LAYER_SOURCE (g_object_new (gtk_gis_layer_source_get_type (), NULL)); - - return gtk_gis_layer_source; -} - -/** - * gtk_gis_layer_source_load: + * gtk_gis_layer_source_fill_layer: * @source: * @layer: * diff --git a/src/layersource.h b/src/layersource.h index 7bef22d..480ffc0 100644 --- a/src/layersource.h +++ b/src/layersource.h @@ -49,17 +49,15 @@ struct _GtkGisLayerSourceClass GObjectClass parent_class; gboolean (*fill_layer) (GtkGisLayerSource *source, - GtkGisLayer *layer); + GtkGisLayer *layer); GtkGisLayerGeometryType (*get_layer_geometry_type) (GtkGisLayerSource *source, - gchar *name); + gchar *name); }; GType gtk_gis_layer_source_get_type (void) G_GNUC_CONST; -GtkGisLayerSource *gtk_gis_layer_source_new (void); - gboolean gtk_gis_layer_source_fill_layer (GtkGisLayerSource *source, GtkGisLayer *layer); diff --git a/src/layersourceshp.c b/src/layersourceshp.c index aebc1db..3b718cf 100644 --- a/src/layersourceshp.c +++ b/src/layersourceshp.c @@ -24,6 +24,9 @@ #include #include "layersourceshp.h" +#include "geomtryline.h" +#include "geomtrypoint.h" +#include "geomtrypolygon.h" static void gtk_gis_layer_source_shp_class_init (GtkGisLayerSourceShpClass *klass); static void gtk_gis_layer_source_shp_init (GtkGisLayerSourceShp *gtk_gis_layer_source_shp); @@ -163,6 +166,52 @@ gtk_gis_layer_source_shp_fill_layer (GtkGisLayerSource *source, /* TO DO */ ret = FALSE; } + else + { + gint numLayers; + gint i; + + OGRLayerH layer; + OGRFeatureDefnH layerDefn; + + gchar *name = gtk_gis_layer_get_name (layer); + + GtkGisLayerSourceShpPrivate *priv = GTK_GIS_LAYER_SOURCE_SHP_GET_PRIVATE (gtk_gis_layer_source); + + numLayers = OGR_DS_GetLayerCount (priv->datasource); + for (i = 0; i < numLayers; i++) + { + layer = OGR_DS_GetLayer (priv->datasource, i); + layerDefn = OGR_L_GetLayerDefn (layer); + + if (strcmp (name, OGR_FD_GetName(layerDefn)) == 0) + { + OGRFeatureH feature; + OGRGeometryH poGeometry; + GtkGisGeometry *geometry; + + while ((feature = OGR_L_GetNextFeature (layer)) != NULL) + { + poGeometry = OGR_F_GetGeometryRef (feature); + if (poGeometry != NULL + && wkbFlatten(OGR_G_GetGeometryType (poGeometry)) == wkbPoint) + { + geometry = gtk_gis_geometry_point_new (OGR_G_GetX (poGeometry, 0), OGR_G_GetY (poGeometry, 0)); + } + else if (poGeometry != NULL + && wkbFlatten(OGR_G_GetGeometryType (poGeometry)) == wkbLineString) + { + } + else if (poGeometry != NULL + && wkbFlatten(OGR_G_GetGeometryType (poGeometry)) == wkbPolygon) + { + } + } + + break; + } + } + } return ret; } diff --git a/tests/Makefile.am b/tests/Makefile.am index 9bad208..a6fb6c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = samples + LIBS = $(GTKGIS_LIBS) AM_CPPFLAGS = $(GTKGIS_CFLAGS) \ @@ -5,8 +7,8 @@ AM_CPPFLAGS = $(GTKGIS_CFLAGS) \ libgtkgis = $(top_builddir)/src/libgtkgis.la -noinst_PROGRAMS = +noinst_PROGRAMS = from_xml LDADD = $(libgtgkis) -EXTRA_DIST = +EXTRA_DIST = test1.gtkgis diff --git a/tests/from_xml.c b/tests/from_xml.c new file mode 100644 index 0000000..e69de29 diff --git a/tests/samples/Makefile.am b/tests/samples/Makefile.am new file mode 100644 index 0000000..d09a97a --- /dev/null +++ b/tests/samples/Makefile.am @@ -0,0 +1,17 @@ +EXTRA_DIST = \ + airports.dbf \ + airports.prj \ + airports.shp \ + airports.shx \ + alaska.dbf \ + alaska.prj \ + alaska.shp \ + alaska.shx \ + railroads.dbf \ + railroads.prj \ + railroads.shp \ + railroads.shx \ + rivers.dbf \ + rivers.prj \ + rivers.shp \ + rivers.shx diff --git a/tests/samples/airports.dbf b/tests/samples/airports.dbf new file mode 100644 index 0000000..c841a13 Binary files /dev/null and b/tests/samples/airports.dbf differ diff --git a/tests/samples/airports.prj b/tests/samples/airports.prj new file mode 100644 index 0000000..c63d34b --- /dev/null +++ b/tests/samples/airports.prj @@ -0,0 +1 @@ +PROJCS["Albers",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.978698213898]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]] \ No newline at end of file diff --git a/tests/samples/airports.shp b/tests/samples/airports.shp new file mode 100644 index 0000000..98a6a98 Binary files /dev/null and b/tests/samples/airports.shp differ diff --git a/tests/samples/airports.shx b/tests/samples/airports.shx new file mode 100644 index 0000000..ca2f4dd Binary files /dev/null and b/tests/samples/airports.shx differ diff --git a/tests/samples/alaska.dbf b/tests/samples/alaska.dbf new file mode 100644 index 0000000..c9f5a57 Binary files /dev/null and b/tests/samples/alaska.dbf differ diff --git a/tests/samples/alaska.prj b/tests/samples/alaska.prj new file mode 100644 index 0000000..fb7ba96 --- /dev/null +++ b/tests/samples/alaska.prj @@ -0,0 +1 @@ +PROJCS["Albers Equal Area",GEOGCS["clark66",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]] \ No newline at end of file diff --git a/tests/samples/alaska.shp b/tests/samples/alaska.shp new file mode 100644 index 0000000..06ce12c Binary files /dev/null and b/tests/samples/alaska.shp differ diff --git a/tests/samples/alaska.shx b/tests/samples/alaska.shx new file mode 100644 index 0000000..53bb5c1 Binary files /dev/null and b/tests/samples/alaska.shx differ diff --git a/tests/samples/railroads.dbf b/tests/samples/railroads.dbf new file mode 100644 index 0000000..ebe5762 Binary files /dev/null and b/tests/samples/railroads.dbf differ diff --git a/tests/samples/railroads.prj b/tests/samples/railroads.prj new file mode 100644 index 0000000..c63d34b --- /dev/null +++ b/tests/samples/railroads.prj @@ -0,0 +1 @@ +PROJCS["Albers",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.978698213898]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]] \ No newline at end of file diff --git a/tests/samples/railroads.shp b/tests/samples/railroads.shp new file mode 100644 index 0000000..7b9635a Binary files /dev/null and b/tests/samples/railroads.shp differ diff --git a/tests/samples/railroads.shx b/tests/samples/railroads.shx new file mode 100644 index 0000000..4c70765 Binary files /dev/null and b/tests/samples/railroads.shx differ diff --git a/tests/samples/rivers.dbf b/tests/samples/rivers.dbf new file mode 100644 index 0000000..66e728b Binary files /dev/null and b/tests/samples/rivers.dbf differ diff --git a/tests/samples/rivers.prj b/tests/samples/rivers.prj new file mode 100644 index 0000000..fb7ba96 --- /dev/null +++ b/tests/samples/rivers.prj @@ -0,0 +1 @@ +PROJCS["Albers Equal Area",GEOGCS["clark66",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]] \ No newline at end of file diff --git a/tests/samples/rivers.shp b/tests/samples/rivers.shp new file mode 100644 index 0000000..9cfb15a Binary files /dev/null and b/tests/samples/rivers.shp differ diff --git a/tests/samples/rivers.shx b/tests/samples/rivers.shx new file mode 100644 index 0000000..555bcf4 Binary files /dev/null and b/tests/samples/rivers.shx differ diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis new file mode 100644 index 0000000..9fd53c6 --- /dev/null +++ b/tests/test1.gtkgis @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +