Added zoom in by drag & drop with the mouse.
Colors can be specified only on the form #rrggbbaa.
11% symbol docs coverage.
23 symbols documented.
7 symbols incomplete.
-179 not documented.
+181 not documented.
GTK_GIS
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
libgtkgisincludedir = $(includedir)/gtkgis
libgtkgis_la_SOURCES = \
+ commons.c \
gtkgis.c \
layersgroup.c \
layer.c \
--- /dev/null
+/*
+ * Copyright (C) 2009 Andrea Zagli <azagli@libero.it>
+ *
+ * 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 <stdio.h>
+#include <string.h>
+
+#include <glib.h>
+
+#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;
+}
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);
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);
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);
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,
static GooCanvasItem
*gtk_gis_geometry_raster_draw (GtkGisGeometry *raster,
GtkGisScale *scale,
- GtkGisLayerStyle style)
+ GtkGisLayerStyle *style)
{
GooCanvasItem *item = NULL;
GtkWidget *canvas;
GooCanvasItem *canvas_root;
+ GooCanvasItem *canvas_selection_rect;
+
GSList *layers_groups;
GSList *layers;
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;
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);
}
scale->xy = (scale->x + scale->y) / 2;
gtk_gis_set_scale (gtkgis, scale);
+
+ gtk_gis_move_to (gtkgis, extent.min_x, extent.min_y);
}
/**
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);
}
/**
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));
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;
}
&& 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;
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");
}
<shape filename="tests/samples/alaska.shp" />
</source>
<style>
- <fill-color>#FFFF00</fill-color>
+ <fill-color>#C5DFBF</fill-color>
</style>
</layer>
<shape filename="tests/samples/airports.shp" />
</source>
<style>
- <stroke-color>red</stroke-color>
+ <stroke-color>#FF0000</stroke-color>
</style>
<!--<label>
<field>NAME</field>
</label>-->
</layer>
- <!--<layer name="railroads">
+ <layer name="railroads">
<source>
<shape filename="tests/samples/railroads.shp" />
</source>
<style>
- <stroke-color>red</stroke-color>
+ <stroke-color>#00FF00</stroke-color>
</style>
- </layer>-->
+ </layer>
<layer name="rivers">
<source>
<shape filename="tests/samples/rivers.shp" />
</source>
<style>
- <stroke-color>blue</stroke-color>
+ <stroke-color>#0000FF</stroke-color>
</style>
<!--<label>
<field>NAM</field>
projects / libgtkgis / commitdiff