From 60b3998981aa54228d2533b9554a47735bc1bfd1 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 19 Aug 2009 17:43:27 +0200 Subject: [PATCH] Added functions gtk_gis_color_parse and gtk_gis_color_to_string. Added zoom in by drag & drop with the mouse. Colors can be specified only on the form #rrggbbaa. --- docs/reference/libgtkgis-undocumented.txt | 4 +- src/Makefile.am | 1 + src/commons.c | 122 ++++++++++++++++++++++ src/geometryline.c | 2 +- src/geometrypoint.c | 4 +- src/geometrypolygon.c | 4 +- src/geometryraster.c | 4 +- src/gtkgis.c | 112 ++++++++++++++++++-- src/layer.c | 8 +- tests/test1.gtkgis | 12 +-- 10 files changed, 246 insertions(+), 27 deletions(-) create mode 100644 src/commons.c diff --git a/docs/reference/libgtkgis-undocumented.txt b/docs/reference/libgtkgis-undocumented.txt index 7dfb79f..5bdfc50 100644 --- a/docs/reference/libgtkgis-undocumented.txt +++ b/docs/reference/libgtkgis-undocumented.txt @@ -1,7 +1,7 @@ 11% symbol docs coverage. 23 symbols documented. 7 symbols incomplete. -179 not documented. +181 not documented. GTK_GIS @@ -91,6 +91,8 @@ TYPE_GTK_GIS_LAYER_SOURCE_RASTER TYPE_GTK_GIS_LAYER_SOURCE_SHP gtk_gis_add_group gtk_gis_add_layer +gtk_gis_color_parse +gtk_gis_color_to_string gtk_gis_draw gtk_gis_geometry_draw gtk_gis_geometry_get_editable diff --git a/src/Makefile.am b/src/Makefile.am index a84ed5c..09d0777 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ libgtkgis_la_LDFLAGS = -no-undefined libgtkgisincludedir = $(includedir)/gtkgis libgtkgis_la_SOURCES = \ + commons.c \ gtkgis.c \ layersgroup.c \ layer.c \ diff --git a/src/commons.c b/src/commons.c new file mode 100644 index 0000000..0c63fff --- /dev/null +++ b/src/commons.c @@ -0,0 +1,122 @@ +/* + * 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 + * + */ + +#include +#include + +#include + +#include "commons.h" + +/** + * gtk_gis_color_parse: + * @color: a string that represent a color. + * + * Returns: a 32bit number. + */ +guint32 +gtk_gis_color_parse (const gchar *color) +{ + guint32 ret_color = 0; + gchar *c; + + c = g_strstrip (g_strdup (color)); + + if (c[0] == '#') + { + gint val; + + if (strlen (c) == 4 || strlen (c) == 5) + { + if (isxdigit (c[1])) + { + ret_color += strtoul (g_strdup_printf ("%c%c", c[1], c[1]), NULL, 16) << 24; + } + if (isxdigit (c[2])) + { + ret_color += strtoul (g_strdup_printf ("%c%c", c[2], c[2]), NULL, 16) << 16; + } + if (isxdigit (c[3])) + { + ret_color += strtoul (g_strdup_printf ("%c%c", c[3], c[3]), NULL, 16) << 8; + } + if (strlen (c) == 5 && isxdigit (c[4])) + { + ret_color += strtoul (g_strdup_printf ("%c%c", c[4], c[4]), NULL, 16); + } + else + { + ret_color += 255; + } + } + else if (strlen (c) == 7 || strlen (c) == 9) + { + if (isxdigit (c[1]) && isxdigit (c[2])) + { + ret_color += strtoul (g_strndup (&c[1], 2), NULL, 16) << 24; + } + if (isxdigit (c[3]) && isxdigit (c[4])) + { + ret_color += strtoul (g_strndup (&c[3], 2), NULL, 16) << 16; + } + if (isxdigit (c[5]) && isxdigit (c[6])) + { + ret_color += strtoul (g_strndup (&c[5], 2), NULL, 16) << 8; + } + if (strlen (c) == 9 && isxdigit (c[7]) && isxdigit (c[8])) + { + ret_color += strtoul (g_strndup (&c[7], 2), NULL, 16); + } + else + { + ret_color += 255; + } + } + } + else + { + /* TO DO + * parse named colors + */ + g_warning ("Only color in the format #rrggbbaa are admitted."); + } + + return ret_color; +} + +/** + * gtk_gis_color_to_string: + * @color: a 32bit integer. + * + * Returns: the hexadecimal string representation of the color. + */ +gchar +*gtk_gis_color_to_string (guint32 color) +{ + gchar *ret; + + ret = g_strconcat ("#", + g_strdup_printf ("%02X", color >> 24 & 0xFF), + g_strdup_printf ("%02X", color >> 16 & 0xFF), + g_strdup_printf ("%02X", color >> 8 & 0xFF), + g_strdup_printf ("%02X", color & 0xFF), + NULL); + + return ret; +} diff --git a/src/geometryline.c b/src/geometryline.c index c76c7c9..23ab56b 100644 --- a/src/geometryline.c +++ b/src/geometryline.c @@ -306,7 +306,7 @@ static GooCanvasItem item = goo_canvas_path_new (NULL, path, "line-width", style->width / scale->xy, - "stroke-color", style->stroke_color, + "stroke-color-rgba", gtk_gis_color_parse (style->stroke_color), NULL); str_label = gtk_gis_geometry_get_label (line); diff --git a/src/geometrypoint.c b/src/geometrypoint.c index 7979884..3110af0 100644 --- a/src/geometrypoint.c +++ b/src/geometrypoint.c @@ -187,8 +187,8 @@ GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point, priv->point->x, priv->point->y, (style->width / 2) / scale->x, (style->width / 2) / scale->y, "line-width", style->width / scale->xy, - "stroke-color", style->stroke_color, - "fill-color", style->fill_color, + "stroke-color-rgba", gtk_gis_color_parse (style->stroke_color), + "fill-color-rgba", gtk_gis_color_parse (style->fill_color), NULL); str_label = gtk_gis_geometry_get_label (point); diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c index ca15d63..3d57369 100644 --- a/src/geometrypolygon.c +++ b/src/geometrypolygon.c @@ -288,8 +288,8 @@ static GooCanvasItem item = goo_canvas_path_new (NULL, path + 1, "line-width", style->width / scale->xy, - "stroke-color", style->stroke_color, - "fill-color", style->fill_color, + "stroke-color-rgba", gtk_gis_color_parse (style->stroke_color), + "fill-color-rgba", gtk_gis_color_parse (style->fill_color), "fill-rule", CAIRO_FILL_RULE_EVEN_ODD, NULL); diff --git a/src/geometryraster.c b/src/geometryraster.c index dc97044..fae7722 100644 --- a/src/geometryraster.c +++ b/src/geometryraster.c @@ -33,7 +33,7 @@ static void gtk_gis_geometry_raster_init (GtkGisGeometryRaster *gtk_gis_geometry static GooCanvasItem *gtk_gis_geometry_raster_draw (GtkGisGeometry *raster, GtkGisScale *scale, - GtkGisLayerStyle style); + GtkGisLayerStyle *style); static void gtk_gis_geometry_raster_set_property (GObject *object, guint property_id, @@ -118,7 +118,7 @@ GtkGisGeometry static GooCanvasItem *gtk_gis_geometry_raster_draw (GtkGisGeometry *raster, GtkGisScale *scale, - GtkGisLayerStyle style) + GtkGisLayerStyle *style) { GooCanvasItem *item = NULL; diff --git a/src/gtkgis.c b/src/gtkgis.c index 694d07f..8db9edd 100644 --- a/src/gtkgis.c +++ b/src/gtkgis.c @@ -89,6 +89,8 @@ struct _GtkGisPrivate GtkWidget *canvas; GooCanvasItem *canvas_root; + GooCanvasItem *canvas_selection_rect; + GSList *layers_groups; GSList *layers; @@ -146,6 +148,14 @@ gtk_gis_init (GtkGis *gtk_gis) priv->canvas_root = goo_canvas_get_root_item (GOO_CANVAS (priv->canvas)); + priv->canvas_selection_rect = goo_canvas_rect_new (priv->canvas_root, + 0.0, 0.0, 0.0, 0.0, + "line-width", 1.0, + "stroke-color-rgba", gtk_gis_color_parse ("#FF0000"), + "fill-color-rgba", gtk_gis_color_parse ("#77777780"), + "visibility", GOO_CANVAS_ITEM_INVISIBLE, + NULL); + priv->layers_groups = NULL; priv->layers = NULL; @@ -707,6 +717,10 @@ gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale) gtk_gis_canvas_resize (gtkgis); + g_object_set (G_OBJECT (priv->canvas_selection_rect), + "line-width", 1.0 / priv->scale->xy, + NULL); + gdk_window_set_cursor (GTK_WIDGET (gtkgis)->window, NULL); } @@ -777,6 +791,8 @@ gtk_gis_zoom_to_extent (GtkGis *gtkgis, GtkGisExtent extent) scale->xy = (scale->x + scale->y) / 2; gtk_gis_set_scale (gtkgis, scale); + + gtk_gis_move_to (gtkgis, extent.min_x, extent.min_y); } /** @@ -872,8 +888,6 @@ gtk_gis_zoom_to_layer (GtkGis *gtkgis, GtkGisLayer *layer) extent = gtk_gis_layer_get_extent (layer); gtk_gis_zoom_to_extent (gtkgis, *extent); - - gtk_gis_move_to (gtkgis, extent->min_x, extent->min_y); } /** @@ -1150,6 +1164,29 @@ gtk_gis_button_press_event (GtkWidget *widget, if (event->button == 1) { + if (event->state & GDK_SHIFT_MASK) + { + GtkAllocation allocation; + gdouble x; + gdouble y; + + allocation = priv->canvas->allocation; + + x = (0 - allocation.x) + event->x; + y = (0 - allocation.y) + event->y; + goo_canvas_convert_from_pixels (GOO_CANVAS (priv->canvas), &x, &y); + + g_object_set (G_OBJECT (priv->canvas_selection_rect), + "x", x, + "y", y, + "width", 0.0, + "height", 0.0, + "visibility", GOO_CANVAS_ITEM_VISIBLE, + NULL); + + goo_canvas_item_raise (priv->canvas_selection_rect, NULL); + } + if (priv->sel_start == NULL) { priv->sel_start = g_malloc0 (sizeof (GtkGisPoint)); @@ -1177,6 +1214,35 @@ gtk_gis_button_release_event (GtkWidget *widget, if (event->button == 1) { + if (event->state & GDK_SHIFT_MASK) + { + /* zoom */ + GtkGisExtent extent; + + gdouble x; + gdouble y; + gdouble width; + gdouble height; + + g_object_get (G_OBJECT (priv->canvas_selection_rect), + "x", &x, + "y", &y, + "width", &width, + "height", &height, + NULL); + + extent.min_x = x; + extent.min_y = y; + extent.max_x = x + width; + extent.max_y = y + height; + + g_object_set (G_OBJECT (priv->canvas_selection_rect), + "visibility", GOO_CANVAS_ITEM_INVISIBLE, + NULL); + + gtk_gis_zoom_to_extent (gtkgis, extent); + } + g_free (priv->sel_start); priv->sel_start = NULL; } @@ -1216,18 +1282,46 @@ gtk_gis_motion_notify_event (GtkWidget *widget, && priv->sel_start != NULL) { GtkAllocation allocation; - GtkAllocation new_allocation; allocation = priv->canvas->allocation; - new_allocation.x = allocation.x + (x - (gint)priv->sel_start->x); - new_allocation.y = allocation.y + (y - (gint)priv->sel_start->y); + if (state & GDK_SHIFT_MASK + && priv->sel_start != NULL) + { + /* selection */ + gdouble canvas_x; + gdouble canvas_y; + gdouble rect_x; + gdouble rect_y; + + canvas_x = (0 - allocation.x) + x; + canvas_y = (0 - allocation.y) + y; + goo_canvas_convert_from_pixels (GOO_CANVAS (priv->canvas), &canvas_x, &canvas_y); + + g_object_get (G_OBJECT (priv->canvas_selection_rect), + "x", &rect_x, + "y", &rect_y, + NULL); + + g_object_set (G_OBJECT (priv->canvas_selection_rect), + "width", ABS (canvas_x - rect_x), + "height", ABS (canvas_y - rect_y), + NULL); + } + else + { + /* pan */ + GtkAllocation new_allocation; + + new_allocation.x = allocation.x + (x - (gint)priv->sel_start->x); + new_allocation.y = allocation.y + (y - (gint)priv->sel_start->y); - gtk_layout_move (GTK_LAYOUT (priv->scroll_win), priv->canvas, - new_allocation.x, new_allocation.y); + gtk_layout_move (GTK_LAYOUT (priv->scroll_win), priv->canvas, + new_allocation.x, new_allocation.y); - priv->sel_start->x = x; - priv->sel_start->y = y; + priv->sel_start->x = x; + priv->sel_start->y = y; + } } return FALSE; diff --git a/src/layer.c b/src/layer.c index 2deef9a..a920e84 100644 --- a/src/layer.c +++ b/src/layer.c @@ -85,13 +85,13 @@ gtk_gis_layer_init (GtkGisLayer *gtk_gis_layer) priv->style = g_malloc (sizeof (GtkGisLayerStyle)); priv->style->width = 0.5; - priv->style->stroke_color = g_strdup ("black"); - priv->style->fill_color = g_strdup ("white"); + priv->style->stroke_color = g_strdup ("#000000"); + priv->style->fill_color = g_strdup ("#FFFFFF"); priv->label = g_malloc (sizeof (GtkGisLayerLabel)); priv->label->field = NULL; - priv->label->color = g_strdup ("black"); - priv->label->background_color = g_strdup ("white"); + priv->label->color = g_strdup ("#000000"); + priv->label->background_color = g_strdup ("#FFFFFF"); priv->label->font = g_strdup ("Sans 12"); } diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis index e717e18..d3b0e72 100644 --- a/tests/test1.gtkgis +++ b/tests/test1.gtkgis @@ -5,7 +5,7 @@ @@ -14,28 +14,28 @@ - +