From: Andrea Zagli Date: Sun, 5 Jul 2009 13:19:42 +0000 (+0200) Subject: Added commons.h with commons structs. X-Git-Tag: GTKGIS_0_0_1~3 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=00bbb749e1d1c2f5d395bed70e7c659f7b50eace;p=libgtkgis Added commons.h with commons structs. Added GtkGis::set_scale and GtkGis::get_scale. Scale factor now acts only on geometries (x, y, etc.) and not also on properties (ex. line-with). --- diff --git a/libgtkgis.pc.in b/libgtkgis.pc.in index 9531dca..e2fbbbc 100644 --- a/libgtkgis.pc.in +++ b/libgtkgis.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ includedir=@includedir@ Name: @PACKAGE_NAME@ -Description: Library to embed GIS functionalities into applications based on Gtk+ +Description: A Gtk+ widget to embed base GIS functionalities into applications. Version: @PACKAGE_VERSION@ Requires: gtk+-2.0 Libs: -L${libdir} -lgtkgis diff --git a/src/Makefile.am b/src/Makefile.am index 7e708c0..e17fdd6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ libgtkgis_la_SOURCES = \ include_HEADERS = \ libgtkgis.h \ + commons.h \ gtkgis.h \ layer.h \ layersgroup.h \ diff --git a/src/commons.h b/src/commons.h new file mode 100644 index 0000000..21e15c7 --- /dev/null +++ b/src/commons.h @@ -0,0 +1,61 @@ +/* + * 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_COMMONS_H__ +#define __GTK_GIS_COMMONS_H__ + +#include +#include + +G_BEGIN_DECLS + + +typedef struct + { + gdouble x; + gdouble y; + } GtkGisPoint; + +typedef struct + { + gdouble x; + gdouble y; + gdouble xy; + } GtkGisScale; + +typedef enum + { + LAYER_GEOMETRY_TYPE_POINT, + LAYER_GEOMETRY_TYPE_LINE, + LAYER_GEOMETRY_TYPE_POLYGON, + LAYER_GEOMETRY_TYPE_RASTER + } GtkGisLayerGeometryType; + +typedef struct + { + gdouble min_x; + gdouble min_y; + gdouble max_x; + gdouble max_y; + } GtkGisLayerExtent; + + +G_END_DECLS + +#endif /* __GTK_GIS_COMMONS_H__ */ diff --git a/src/geometry.c b/src/geometry.c index 31f8aef..4599eb5 100644 --- a/src/geometry.c +++ b/src/geometry.c @@ -25,6 +25,7 @@ #include #endif +#include "commons.h" #include "geometry.h" static void gtk_gis_geometry_class_init (GtkGisGeometryClass *klass); @@ -102,13 +103,13 @@ gtk_gis_geometry_set_editable (GtkGisGeometry *geometry, gboolean editable) * */ GooCanvasItem -*gtk_gis_geometry_draw (GtkGisGeometry *geometry) +*gtk_gis_geometry_draw (GtkGisGeometry *geometry, GtkGisScale *scale) { GooCanvasItem *item = NULL; if (IS_GTK_GIS_GEOMETRY (geometry) && GTK_GIS_GEOMETRY_GET_CLASS (geometry)->draw != NULL) { - item = GTK_GIS_GEOMETRY_GET_CLASS (geometry)->draw (geometry); + item = GTK_GIS_GEOMETRY_GET_CLASS (geometry)->draw (geometry, scale); } return item; diff --git a/src/geometry.h b/src/geometry.h index 07606a5..30d31a0 100644 --- a/src/geometry.h +++ b/src/geometry.h @@ -25,6 +25,8 @@ #include +#include + G_BEGIN_DECLS @@ -48,23 +50,16 @@ struct _GtkGisGeometryClass { GObjectClass parent_class; - GooCanvasItem *(*draw) (GtkGisGeometry *geometry); + GooCanvasItem *(*draw) (GtkGisGeometry *geometry, GtkGisScale *scale); }; GType gtk_gis_geometry_get_type (void) G_GNUC_CONST; -typedef struct - { - gdouble x; - gdouble y; - } GtkGisPoint; - - gboolean gtk_gis_geometry_get_editable (GtkGisGeometry *geometry); void gtk_gis_geometry_set_editable (GtkGisGeometry *geometry, gboolean editable); -GooCanvasItem *gtk_gis_geometry_draw (GtkGisGeometry *geometry); +GooCanvasItem *gtk_gis_geometry_draw (GtkGisGeometry *geometry, GtkGisScale *scale); G_END_DECLS diff --git a/src/geometryline.c b/src/geometryline.c index 0c39964..8dae4e0 100644 --- a/src/geometryline.c +++ b/src/geometryline.c @@ -32,7 +32,7 @@ static void gtk_gis_geometry_line_init (GtkGisGeometryLine *gtk_gis_geometry_lin static gchar *convert_comma_to_dot (gchar *str); -static GooCanvasItem *gtk_gis_geometry_line_draw (GtkGisGeometry *line); +static GooCanvasItem *gtk_gis_geometry_line_draw (GtkGisGeometry *line, GtkGisScale *scale); static void gtk_gis_geometry_line_set_property (GObject *object, guint property_id, @@ -183,7 +183,7 @@ static gchar } static GooCanvasItem -*gtk_gis_geometry_line_draw (GtkGisGeometry *line) +*gtk_gis_geometry_line_draw (GtkGisGeometry *line, GtkGisScale *scale) { GtkGisGeometryLinePrivate *priv; GooCanvasItem *item = NULL; @@ -216,7 +216,7 @@ static GooCanvasItem path = convert_comma_to_dot (path); item = goo_canvas_path_new (NULL, path, - "line-width", 1.0, + "line-width", 1.0 / scale->xy, NULL); } diff --git a/src/geometrypoint.c b/src/geometrypoint.c index 1a16c87..7336fd2 100644 --- a/src/geometrypoint.c +++ b/src/geometrypoint.c @@ -30,7 +30,7 @@ static void gtk_gis_geometry_point_class_init (GtkGisGeometryPointClass *klass); static void gtk_gis_geometry_point_init (GtkGisGeometryPoint *gtk_gis_geometry_point); -static GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point); +static GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point, GtkGisScale *scale); static void gtk_gis_geometry_point_set_property (GObject *object, guint property_id, @@ -148,7 +148,7 @@ gtk_gis_geometry_point_get_y (GtkGisGeometryPoint *point) } static -GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point) +GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point, GtkGisScale *scale) { GooCanvasItem *item = NULL; @@ -158,8 +158,8 @@ GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point) { item = goo_canvas_rect_new (NULL, priv->point->x, priv->point->y, - 1, 1, - "line-width", 1.0, + 1 / scale->x, 1 / scale->y, + "line-width", 1.0 / scale->xy, NULL); } diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c index 1887207..1c24709 100644 --- a/src/geometrypolygon.c +++ b/src/geometrypolygon.c @@ -30,7 +30,7 @@ static void gtk_gis_geometry_polygon_class_init (GtkGisGeometryPolygonClass *klass); static void gtk_gis_geometry_polygon_init (GtkGisGeometryPolygon *gtk_gis_geometry_polygon); -static GooCanvasItem *gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon); +static GooCanvasItem *gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon, GtkGisScale *scale); static void gtk_gis_geometry_polygon_set_property (GObject *object, guint property_id, @@ -185,7 +185,7 @@ gtk_gis_geometry_polygon_remove_line (GtkGisGeometryPolygon *polygon, } static GooCanvasItem -*gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon) +*gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon, GtkGisScale *scale) { GtkGisGeometryPolygonPrivate *priv; GooCanvasItem *polygon_item = NULL; @@ -207,7 +207,7 @@ static GooCanvasItem while (cur != NULL) { line = (GtkGisGeometry *)cur->data; - item = gtk_gis_geometry_draw (line); + item = gtk_gis_geometry_draw (line, scale); if (item != NULL) { diff --git a/src/gtkgis.c b/src/gtkgis.c index e16e772..34f8b5e 100644 --- a/src/gtkgis.c +++ b/src/gtkgis.c @@ -72,9 +72,7 @@ struct _GtkGisPrivate GSList *layers; GtkGisLayerExtent *extent; - - gdouble scale_x; - gdouble scale_y; + GtkGisScale *scale; }; G_DEFINE_TYPE (GtkGis, gtk_gis, GTK_TYPE_BIN) @@ -109,6 +107,10 @@ gtk_gis_init (GtkGis *gtk_gis) priv->scroll_win = gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (gtk_gis), priv->scroll_win); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll_win), + GTK_POLICY_NEVER, + GTK_POLICY_NEVER); + priv->canvas = goo_canvas_new (); gtk_container_add (GTK_CONTAINER (priv->scroll_win), priv->canvas); @@ -119,8 +121,10 @@ gtk_gis_init (GtkGis *gtk_gis) priv->extent = NULL; - priv->scale_x = 0.0; - priv->scale_y = 0.0; + priv->scale = g_malloc0 (sizeof (GtkGisScale)); + priv->scale->x = 1.0; + priv->scale->y = 1.0; + priv->scale->xy = 1.0; } /** @@ -264,8 +268,6 @@ GtkWidget g_warning ("The file is not a valid gtkgis file."); } - gtk_gis_draw (GTK_GIS (gtkgis)); - return gtkgis; } @@ -389,41 +391,81 @@ gtk_gis_draw (GtkGis *gtkgis) cur = priv->layers; while (cur != NULL) { - gtk_gis_layer_draw ((GtkGisLayer *)cur->data, priv->canvas_root); + gtk_gis_layer_draw ((GtkGisLayer *)cur->data, priv->canvas_root, priv->scale); cur = g_slist_next (cur); } } /** - * gtk_gis_zoom_to_max: + * gtk_gis_get_scale: * @gtkgis: * + * Returns: the #GtkGisScale. + */ +GtkGisScale +*gtk_gis_get_scale (GtkGis *gtkgis) +{ + GtkGisPrivate *priv; + GtkGisScale *scale = NULL; + + priv = GTK_GIS_GET_PRIVATE (gtkgis); + + scale = g_malloc0 (sizeof (GtkGisScale)); + scale->x = priv->scale->x; + scale->y = priv->scale->y; + scale->xy = priv->scale->xy; + + return scale; +} + +/** + * gtk_gis_set_scale: + * @gtkgis: + * @scale: + * */ void -gtk_gis_zoom_to_max (GtkGis *gtkgis) +gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale) { GtkGisPrivate *priv; - GtkRequisition requisition; + + g_return_if_fail (scale != NULL); priv = GTK_GIS_GET_PRIVATE (gtkgis); -g_fprintf(stderr,"%f %f %f %f\n", priv->extent->min_x, priv->extent->max_x, -priv->extent->min_y, priv->extent->max_y); + priv->scale->x = scale->x; + priv->scale->y = scale->y; + priv->scale->xy = scale->xy; - gtk_gis_size_request (GTK_WIDGET (gtkgis), &requisition); -g_fprintf(stderr,"%d %d\n", requisition.width, requisition.height); - /*priv->scale_x = requisition.width / (priv->extent->max_x - priv->extent->min_x); - priv->scale_y = requisition.height / (priv->extent->max_y - priv->extent->min_y);*/ - priv->scale_x = 640 / (priv->extent->max_x - priv->extent->min_x); - priv->scale_y = 600 / (priv->extent->max_y - priv->extent->min_y); -g_fprintf(stderr,"%f %f\n", priv->scale_x, priv->scale_y); g_object_set (priv->canvas, - "scale-x", priv->scale_x, - "scale-y", priv->scale_y, + "scale-x", priv->scale->x, + "scale-y", priv->scale->y, NULL); } +/** + * gtk_gis_zoom_to_max: + * @gtkgis: + * + */ +void +gtk_gis_zoom_to_max (GtkGis *gtkgis) +{ + GtkGisPrivate *priv; + GtkGisScale *scale; + + priv = GTK_GIS_GET_PRIVATE (gtkgis); + + scale = g_malloc0 (sizeof (GtkGisScale)); + + scale->x = GTK_WIDGET (gtkgis)->allocation.width / (priv->extent->max_x - priv->extent->min_x); + scale->y = GTK_WIDGET (gtkgis)->allocation.height / (priv->extent->max_y - priv->extent->min_y); + scale->xy = (scale->x + scale->y) / 2; + + gtk_gis_set_scale (gtkgis, scale); +} + /** * gtk_gis_zoom_to_layer: * @gtkgis: diff --git a/src/gtkgis.h b/src/gtkgis.h index 3e19dc1..b3d6fa8 100644 --- a/src/gtkgis.h +++ b/src/gtkgis.h @@ -23,6 +23,7 @@ #include #include +#include "commons.h" #include "layersgroup.h" #include "layer.h" @@ -68,6 +69,9 @@ void gtk_gis_remove_layer (GtkGis *gtkgis, GtkGisLayer *layer); void gtk_gis_draw (GtkGis *gtkgis); +GtkGisScale *gtk_gis_get_scale (GtkGis *gtkgis); +void gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale); + void gtk_gis_zoom_to_max (GtkGis *gtkgis); void gtk_gis_zoom_to_layer (GtkGis *gtkgis, GtkGisLayer *layer); diff --git a/src/layer.c b/src/layer.c index 53fbc4b..0caa313 100644 --- a/src/layer.c +++ b/src/layer.c @@ -271,7 +271,7 @@ gtk_gis_layer_set_editable (GtkGisLayer *layer, * */ void -gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root) +gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale) { GtkGisLayerPrivate *priv; @@ -288,7 +288,7 @@ gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root) cur = g_list_first (priv->geometries); while (cur != NULL) { - item = gtk_gis_geometry_draw ((GtkGisGeometry *)cur->data); + item = gtk_gis_geometry_draw ((GtkGisGeometry *)cur->data, scale); if (item != NULL) { diff --git a/src/layer.h b/src/layer.h index 4adfb8a..a052795 100644 --- a/src/layer.h +++ b/src/layer.h @@ -82,7 +82,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, GooCanvasItem *root); +void gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale); G_END_DECLS diff --git a/src/layersource.c b/src/layersource.c index 1c1b448..258f874 100644 --- a/src/layersource.c +++ b/src/layersource.c @@ -102,8 +102,10 @@ GList GList *geometries = NULL; OGRLayerH layer; - OGRFeatureH feature; + + GtkGisLayerExtent extent; + OGRGeometryH poGeometry; GtkGisGeometry *geometry; @@ -115,6 +117,8 @@ GList g_return_if_fail (layer != NULL); + extent = gtk_gis_layer_source_get_layer_extent (source, name); + OGR_L_ResetReading (layer); while ((feature = OGR_L_GetNextFeature (layer)) != NULL) @@ -127,7 +131,7 @@ GList GtkGisPoint gpoint; gpoint.x = OGR_G_GetX (poGeometry, 0); - gpoint.y = OGR_G_GetY (poGeometry, 0); + gpoint.y = extent.max_y - OGR_G_GetY (poGeometry, 0) + extent.min_y; geometry = gtk_gis_geometry_point_new (gpoint); } @@ -147,7 +151,7 @@ GList gpoint = g_malloc0 (sizeof (GtkGisPoint)); gpoint->x = OGR_G_GetX (poGeometry, point); - gpoint->y = OGR_G_GetY (poGeometry, point); + gpoint->y = extent.max_y - OGR_G_GetY (poGeometry, point) + extent.min_y; gpoints = g_slist_append (gpoints, gpoint); } @@ -181,7 +185,7 @@ GList gpoint = g_malloc0 (sizeof (GtkGisPoint)); gpoint->x = OGR_G_GetX (poGeometryInt, point); - gpoint->y = OGR_G_GetY (poGeometryInt, point); + gpoint->y = extent.max_y - OGR_G_GetY (poGeometryInt, point) + extent.min_y; gpoints = g_slist_append (gpoints, gpoint); } diff --git a/src/layersource.h b/src/layersource.h index 5a72e54..76e2d49 100644 --- a/src/layersource.h +++ b/src/layersource.h @@ -26,6 +26,7 @@ #include #include +#include "commons.h" #include "geometry.h" G_BEGIN_DECLS @@ -39,23 +40,6 @@ G_BEGIN_DECLS #define GTK_GIS_LAYER_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE, GtkGisLayerSourceClass)) -typedef enum - { - LAYER_GEOMETRY_TYPE_POINT, - LAYER_GEOMETRY_TYPE_LINE, - LAYER_GEOMETRY_TYPE_POLYGON, - LAYER_GEOMETRY_TYPE_RASTER - } GtkGisLayerGeometryType; - -typedef struct - { - gdouble min_x; - gdouble min_y; - gdouble max_x; - gdouble max_y; - } GtkGisLayerExtent; - - typedef struct _GtkGisLayerSource GtkGisLayerSource; typedef struct _GtkGisLayerSourceClass GtkGisLayerSourceClass; diff --git a/tests/from_xml.c b/tests/from_xml.c index 76e5091..4dd576c 100644 --- a/tests/from_xml.c +++ b/tests/from_xml.c @@ -21,6 +21,7 @@ main (int argc, char *argv[]) gtk_widget_show_all (window); gtk_gis_zoom_to_max (GTK_GIS (gtkgis)); + gtk_gis_draw (GTK_GIS (gtkgis)); gtk_main (); diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis index e6aaea8..c68e7a5 100644 --- a/tests/test1.gtkgis +++ b/tests/test1.gtkgis @@ -10,7 +10,7 @@ - + --> @@ -22,6 +22,6 @@ - --> +