From 54012657966db1c925c6995a99ec1e1ae44ca10d Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 5 Aug 2009 18:45:23 +0200 Subject: [PATCH] Added function GtkGisGeometryLine::get_svg_path. Changed method to draw polygons, so they have also internal rings. Implemented fill-color style property. --- .gitignore | 1 + docs/reference/libgtkgis-decl-list.txt | 1 + docs/reference/libgtkgis-decl.txt | 5 ++ docs/reference/libgtkgis-undocumented.txt | 3 +- docs/reference/libgtkgis-unused.txt | 1 + src/geometryline.c | 73 ++++++++++++++++------- src/geometryline.h | 1 + src/geometrypolygon.c | 52 ++++++++++------ src/layersource.c | 3 + tests/test1.gtkgis | 3 + 10 files changed, 102 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 517b2c6..197a3e0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ tests/.deps tests/.libs tests/from_xml tests/test_comune.gtkgis +tests/test_ciambella.gtkgis tests/samples docs/reference/.libs docs/reference/html diff --git a/docs/reference/libgtkgis-decl-list.txt b/docs/reference/libgtkgis-decl-list.txt index d13f871..3d4d57a 100644 --- a/docs/reference/libgtkgis-decl-list.txt +++ b/docs/reference/libgtkgis-decl-list.txt @@ -144,6 +144,7 @@ gtk_gis_geometry_line_new gtk_gis_geometry_line_new_from_list gtk_gis_geometry_line_add_point gtk_gis_geometry_line_add_point_from_coordinates +gtk_gis_geometry_line_get_svg_path
diff --git a/docs/reference/libgtkgis-decl.txt b/docs/reference/libgtkgis-decl.txt index bf23256..f93f135 100644 --- a/docs/reference/libgtkgis-decl.txt +++ b/docs/reference/libgtkgis-decl.txt @@ -606,6 +606,11 @@ GtkGisGeometryLine *line, GtkGisPoint point void GtkGisGeometryLine *line,gdouble x, gdouble y + +gtk_gis_geometry_line_get_svg_path +const gchar * +GtkGisGeometryLine *line + TYPE_GTK_GIS_GEOMETRY #define TYPE_GTK_GIS_GEOMETRY (gtk_gis_geometry_get_type ()) diff --git a/docs/reference/libgtkgis-undocumented.txt b/docs/reference/libgtkgis-undocumented.txt index 0221b22..d61db35 100644 --- a/docs/reference/libgtkgis-undocumented.txt +++ b/docs/reference/libgtkgis-undocumented.txt @@ -1,7 +1,7 @@ 11% symbol docs coverage. 22 symbols documented. 7 symbols incomplete. -170 not documented. +171 not documented. GTK_GIS @@ -98,6 +98,7 @@ gtk_gis_geometry_get_point gtk_gis_geometry_get_type gtk_gis_geometry_line_add_point gtk_gis_geometry_line_add_point_from_coordinates +gtk_gis_geometry_line_get_svg_path gtk_gis_geometry_line_get_type gtk_gis_geometry_point_get_type gtk_gis_geometry_point_get_x diff --git a/docs/reference/libgtkgis-unused.txt b/docs/reference/libgtkgis-unused.txt index 4144b61..36fa92a 100644 --- a/docs/reference/libgtkgis-unused.txt +++ b/docs/reference/libgtkgis-unused.txt @@ -10,5 +10,6 @@ GtkGisLayerSourcePostgisClass GtkGisLayerSourceRasterClass GtkGisLayerSourceShpClass GtkGisLayersGroupClass +gtk_gis_geometry_line_get_svg_path gtk_gis_layer_get_style gtk_gis_layer_set_style diff --git a/src/geometryline.c b/src/geometryline.c index 15d1051..35d9c77 100644 --- a/src/geometryline.c +++ b/src/geometryline.c @@ -130,6 +130,8 @@ gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point) GtkGisPoint *gpoint; + g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line)); + gpoint = g_malloc0 (sizeof (GtkGisPoint)); gpoint->x = point.x; @@ -151,12 +153,53 @@ gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line, { GtkGisPoint gpoint; + g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line)); + gpoint.x = x; gpoint.y = y; gtk_gis_geometry_line_add_point (line, gpoint); } +/** + * gtk_gis_geometry_line_get_svg_path: + * @line: a #GtkGisGeometryLine object. + * + * Returns: the SVG path string representation of the object. + */ +const gchar +*gtk_gis_geometry_line_get_svg_path (GtkGisGeometryLine *line) +{ + GtkGisGeometryLinePrivate *priv; + gchar *ret; + GSList *cur; + GtkGisPoint *point; + + g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line), NULL); + + priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (line); + + cur = priv->points; + + point = (GtkGisPoint *)cur->data; + ret = g_strdup_printf ("M %f %f", point->x, point->y); + + cur = g_slist_next (cur); + while (cur != NULL) + { + point = (GtkGisPoint *)cur->data; + ret = g_strconcat (ret, + g_strdup_printf (" L %f %f", point->x, point->y), + NULL); + + cur = g_slist_next (cur); + } + + ret = convert_comma_to_dot (ret); + + return ret; +} + static gchar *convert_comma_to_dot (gchar *str) { @@ -191,7 +234,6 @@ static GooCanvasItem { GtkGisGeometryLinePrivate *priv; GooCanvasItem *item = NULL; - GtkGisPoint *point; gchar *path; @@ -199,30 +241,15 @@ static GooCanvasItem if (priv->points != NULL) { - GSList *cur; - - cur = priv->points; - - point = (GtkGisPoint *)cur->data; - path = g_strdup_printf ("M %f %f", point->x, point->y); - - cur = g_slist_next (cur); - while (cur != NULL) + path = (gchar *)gtk_gis_geometry_line_get_svg_path (GTK_GIS_GEOMETRY_LINE (line)); + if (path != NULL) { - point = (GtkGisPoint *)cur->data; - path = g_strconcat (path, - g_strdup_printf (" L %f %f", point->x, point->y), - NULL); - - cur = g_slist_next (cur); + item = goo_canvas_path_new (NULL, + path, + "line-width", style.width / scale->xy, + "stroke-color", style.stroke_color, + NULL); } - - path = convert_comma_to_dot (path); - item = goo_canvas_path_new (NULL, - path, - "line-width", style.width / scale->xy, - "stroke-color", style.stroke_color, - NULL); } return item; diff --git a/src/geometryline.h b/src/geometryline.h index e967a9b..96a73ca 100644 --- a/src/geometryline.h +++ b/src/geometryline.h @@ -58,6 +58,7 @@ void gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint poin void gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line, gdouble x, gdouble y); +const gchar *gtk_gis_geometry_line_get_svg_path (GtkGisGeometryLine *line); G_END_DECLS diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c index 90aaa50..dd75085 100644 --- a/src/geometrypolygon.c +++ b/src/geometrypolygon.c @@ -104,6 +104,8 @@ GtkGisGeometry { GtkGisGeometry *polygon; + g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line), NULL); + polygon = gtk_gis_geometry_polygon_new (); gtk_gis_geometry_polygon_add_line (GTK_GIS_GEOMETRY_POLYGON (polygon), line); @@ -146,7 +148,12 @@ void gtk_gis_geometry_polygon_add_line (GtkGisGeometryPolygon *polygon, GtkGisGeometryLine *line) { - GtkGisGeometryPolygonPrivate *priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon); + GtkGisGeometryPolygonPrivate *priv; + + g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon)); + g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line)); + + priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon); priv->lines = g_slist_append (priv->lines, line); } @@ -163,6 +170,8 @@ gtk_gis_geometry_polygon_add_line_from_list (GtkGisGeometryPolygon *polygon, { GtkGisGeometry *line; + g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon)); + line = gtk_gis_geometry_line_new_from_list (points); if (line != NULL) @@ -181,7 +190,12 @@ void gtk_gis_geometry_polygon_remove_line (GtkGisGeometryPolygon *polygon, GtkGisGeometryLine *line) { - GtkGisGeometryPolygonPrivate *priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon); + GtkGisGeometryPolygonPrivate *priv; + + g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon)); + g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line)); + + priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (polygon); priv->lines = g_slist_remove (priv->lines, line); } @@ -192,9 +206,11 @@ static GooCanvasItem GtkGisLayerStyle style) { GtkGisGeometryPolygonPrivate *priv; - GooCanvasItem *polygon_item = NULL; + GooCanvasItem *item = NULL; - gchar *path; + gchar *path = ""; + + g_return_val_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon), NULL); priv = GTK_GIS_GEOMETRY_POLYGON_GET_PRIVATE (GTK_GIS_GEOMETRY_POLYGON (polygon)); @@ -202,27 +218,29 @@ static GooCanvasItem { GSList *cur; GtkGisGeometry *line; - GooCanvasItem *item = NULL; - - polygon_item = goo_canvas_group_new (NULL, NULL); cur = priv->lines; - while (cur != NULL) { - line = (GtkGisGeometry *)cur->data; - item = gtk_gis_geometry_draw (line, scale, style); - - if (item != NULL) - { - goo_canvas_item_add_child (polygon_item, item, -1); - } - + line = (GtkGisGeometry *)cur->data; + path = g_strconcat (path, + " ", + gtk_gis_geometry_line_get_svg_path (GTK_GIS_GEOMETRY_LINE (line)), + NULL); + cur = g_slist_next (cur); } + + item = goo_canvas_path_new (NULL, + path, + "line-width", style.width / scale->xy, + "stroke-color", style.stroke_color, + "fill-color", style.fill_color, + "fill-rule", CAIRO_FILL_RULE_EVEN_ODD, + NULL); } - return polygon_item; + return item; } static void diff --git a/src/layersource.c b/src/layersource.c index 9661939..b9548f3 100644 --- a/src/layersource.c +++ b/src/layersource.c @@ -340,6 +340,7 @@ static GList if (poGeometry != NULL && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbPoint) { + /* POINTS */ GtkGisPoint gpoint; gpoint.x = OGR_G_GetX (poGeometry, 0); @@ -350,6 +351,7 @@ static GList else if (poGeometry != NULL && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbLineString) { + /* LINES */ gint points; gint point; GSList *gpoints = NULL; @@ -373,6 +375,7 @@ static GList else if (poGeometry != NULL && wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbPolygon) { + /* POLYGONS */ gint num_geometries; gint i_geometry; diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis index 28baeca..3910e04 100644 --- a/tests/test1.gtkgis +++ b/tests/test1.gtkgis @@ -4,6 +4,9 @@ + -- 2.49.0