Many bug fixes.
depcomp
gtk-doc.make
install-sh
+INSTALL
libgtkgis.pc
libtool
ltmain.sh
+++ /dev/null
-/usr/share/automake-1.10/INSTALL
\ No newline at end of file
GtkGisGeometryLine
gtk_gis_geometry_line_get_type
gtk_gis_geometry_line_new
-gtk_gis_geometry_line_new_from_list
+gtk_gis_geometry_line_new_from_points
gtk_gis_geometry_line_add_point
gtk_gis_geometry_line_add_point_from_coordinates
gtk_gis_geometry_line_get_svg_path
<FUNCTION>
<NAME>gtk_gis_layer_set_style</NAME>
<RETURNS>void </RETURNS>
-GtkGisLayer *layer, GtkGisLayerStyle style
+GtkGisLayer *layer, GtkGisLayerStyle *style
</FUNCTION>
<FUNCTION>
<NAME>gtk_gis_layer_get_label</NAME>
</FUNCTION>
<FUNCTION>
<NAME>gtk_gis_layer_draw</NAME>
-<RETURNS>void </RETURNS>
-GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale
+<RETURNS>GooCanvasItem *</RETURNS>
+GtkGisLayer *layer, GtkGisScale *scale
</FUNCTION>
<MACRO>
<NAME>TYPE_GTK_GIS_GEOMETRY_LINE</NAME>
void
</FUNCTION>
<FUNCTION>
-<NAME>gtk_gis_geometry_line_new_from_list</NAME>
+<NAME>gtk_gis_geometry_line_new_from_points</NAME>
<RETURNS>GtkGisGeometry *</RETURNS>
GSList *points
</FUNCTION>
<FUNCTION>
<NAME>gtk_gis_geometry_line_add_point</NAME>
<RETURNS>void </RETURNS>
-GtkGisGeometryLine *line, GtkGisPoint point
+GtkGisGeometryLine *line, GtkGisPoint *point
</FUNCTION>
<FUNCTION>
<NAME>gtk_gis_geometry_line_add_point_from_coordinates</NAME>
GooCanvasItem *(*draw) (GtkGisGeometry *geometry,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
};
</STRUCT>
<FUNCTION>
<FUNCTION>
<NAME>gtk_gis_geometry_draw</NAME>
<RETURNS>GooCanvasItem *</RETURNS>
-GtkGisGeometry *geometry,GtkGisScale *scale,GtkGisLayerStyle style
+GtkGisGeometry *geometry,GtkGisScale *scale,GtkGisLayerStyle *style
</FUNCTION>
<MACRO>
<NAME>TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS</NAME>
+gtk_gis_geometry_line_new_from_list
gtk_gis_geometry_polygon_add_line_from_list
gtk_gis_geometry_polygon_new_from_list
11% symbol docs coverage.
-22 symbols documented.
+23 symbols documented.
7 symbols incomplete.
-180 not documented.
+179 not documented.
GTK_GIS
gtk_gis_set_scale
gtk_gis_zoom_to_extent
gtk_gis_zoom_to_layer
-gtk_gis_zoom_to_max
commons:Long_Description
gtk_gis_geometry_get_extent
gtk_gis_geometry_get_label
gtk_gis_geometry_line_get_svg_path
+gtk_gis_geometry_line_new_from_points
gtk_gis_geometry_polygon_add_line_from_points
gtk_gis_geometry_polygon_new_from_points
gtk_gis_geometry_set_label
@Returns:
-<!-- ##### FUNCTION gtk_gis_geometry_line_new_from_list ##### -->
-<para>
-
-</para>
-
-@points:
-@Returns:
-
-
<!-- ##### FUNCTION gtk_gis_geometry_line_add_point ##### -->
<para>
</para>
@layer:
-@root:
@scale:
+@Returns:
+<!-- ##### FUNCTION gtk_gis_geometry_line_new_from_list ##### -->
+<para>
+
+</para>
+
+@points:
+@Returns:
+
<!-- ##### FUNCTION gtk_gis_geometry_polygon_add_line_from_list ##### -->
<para>
GtkGisGeometryPrivate *priv = GTK_GIS_GEOMETRY_GET_PRIVATE (gtk_gis_geometry);
priv->editable = FALSE;
+ priv->label = NULL;
}
/**
/**
* gtk_gis_geometry_get_label:
- * @geometry:
+ * @geometry: a #GtkGisGeometry object.
*
+ * Returns: the field's name used as label.
*/
const gchar
*gtk_gis_geometry_get_label (GtkGisGeometry *geometry)
{
GtkGisGeometryPrivate *priv;
+ gchar *label;
g_return_val_if_fail (IS_GTK_GIS_GEOMETRY (geometry), NULL);
- return g_strdup (priv->label);
+ priv = GTK_GIS_GEOMETRY_GET_PRIVATE (geometry);
+
+ label = NULL;
+ if (priv->label != NULL)
+ {
+ label = g_strdup (priv->label);
+ }
+
+ return label;
}
/**
* gtk_gis_geometry_set_label:
- * @geometry:
- * @label:
+ * @geometry: a #GtkGisGeometry object.
+ * @label: the field's name to use as label.
*
*/
void
g_return_if_fail (IS_GTK_GIS_GEOMETRY (geometry));
- priv->label = g_strdup (label);
+ priv = GTK_GIS_GEOMETRY_GET_PRIVATE (geometry);
+
+ if (label == NULL)
+ {
+ priv->label = NULL;
+ }
+ else
+ {
+ priv->label = g_strdup (label);
+ }
}
/**
* gtk_gis_geometry_get_extent:
- * @line: a #GtkGisGeometry object.
+ * @geometry: a #GtkGisGeometry object.
*
*/
GtkGisExtent
/**
* gtk_gis_geometry_draw:
* @geometry: a #GtkGisGeometry object.
+ * @scale:
+ * @style:
*
*/
GooCanvasItem
*gtk_gis_geometry_draw (GtkGisGeometry *geometry,
GtkGisScale *scale,
- GtkGisLayerStyle style)
+ GtkGisLayerStyle *style)
{
GooCanvasItem *item = NULL;
GooCanvasItem *(*draw) (GtkGisGeometry *geometry,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
};
GType gtk_gis_geometry_get_type (void) G_GNUC_CONST;
GooCanvasItem *gtk_gis_geometry_draw (GtkGisGeometry *geometry,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
G_END_DECLS
static GtkGisExtent *gtk_gis_geometry_line_get_extent (GtkGisGeometry *line);
static GooCanvasItem *gtk_gis_geometry_line_draw (GtkGisGeometry *line,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
static void gtk_gis_geometry_line_set_property (GObject *object,
guint property_id,
}
/**
- * gtk_gis_geometry_line_new_from_list:
+ * gtk_gis_geometry_line_new_from_points:
* @points: a #GSList of #GtkGisPoint to add to the line.
*
* Creates a new #GtkGisGeometryLine object.
* Returns: the newly created #GtkGisGeometryLine object.
*/
GtkGisGeometry
-*gtk_gis_geometry_line_new_from_list (GSList *points)
+*gtk_gis_geometry_line_new_from_points (GSList *points)
{
GtkGisGeometry *line = NULL;
GtkGisGeometryLinePrivate *priv;
+ GSList *cur;
+
+ g_return_val_if_fail (points != NULL, NULL);
line = gtk_gis_geometry_line_new ();
priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (GTK_GIS_GEOMETRY_LINE (line));
- priv->points = g_slist_copy (points);
+ cur = points;
+ while (cur != NULL)
+ {
+ gtk_gis_geometry_line_add_point (GTK_GIS_GEOMETRY_LINE (line), (GtkGisPoint *)cur->data);
+
+ cur = g_slist_next (cur);
+ }
return line;
}
* @point: a #GtkGisPoint to add to the line.
*/
void
-gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point)
+gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint *point)
{
GtkGisGeometryLinePrivate *priv = GTK_GIS_GEOMETRY_LINE_GET_PRIVATE (line);
gpoint = g_malloc0 (sizeof (GtkGisPoint));
- gpoint->x = point.x;
- gpoint->y = point.y;
+ gpoint->x = point->x;
+ gpoint->y = point->y;
/* recalculate the new extent */
- if (priv->extent = NULL)
+ if (priv->extent == NULL)
{
priv->extent = g_malloc (sizeof (GtkGisExtent));
priv->extent->min_x = gpoint->x;
gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line,
gdouble x, gdouble y)
{
- GtkGisPoint gpoint;
+ GtkGisPoint *gpoint;
g_return_if_fail (IS_GTK_GIS_GEOMETRY_LINE (line));
- gpoint.x = x;
- gpoint.y = y;
+ gpoint = g_malloc0 (sizeof (GtkGisPoint));
+
+ gpoint->x = x;
+ gpoint->y = y;
gtk_gis_geometry_line_add_point (line, gpoint);
}
static GooCanvasItem
*gtk_gis_geometry_line_draw (GtkGisGeometry *line,
GtkGisScale *scale,
- GtkGisLayerStyle style)
+ GtkGisLayerStyle *style)
{
GtkGisGeometryLinePrivate *priv;
GooCanvasItem *item = NULL;
path = (gchar *)gtk_gis_geometry_line_get_svg_path (GTK_GIS_GEOMETRY_LINE (line));
if (path != NULL)
{
+ const gchar *str_label;
+
item = goo_canvas_path_new (NULL,
path,
- "line-width", style.width / scale->xy,
- "stroke-color", style.stroke_color,
+ "line-width", style->width / scale->xy,
+ "stroke-color", style->stroke_color,
NULL);
+
+ str_label = gtk_gis_geometry_get_label (line);
+ if (str_label != NULL
+ && g_strcmp0 (str_label, "") != 0)
+ {
+ GooCanvasItem *group;
+ gdouble x;
+ gdouble y;
+
+ group = goo_canvas_group_new (NULL, NULL);
+
+ goo_canvas_item_add_child (group, item, -1);
+
+ /* center the label inside the polygon */
+
+ /* TO DO
+ * the label must be visible every time that the polygon is visible
+ */
+
+ x = priv->extent->min_x + (priv->extent->max_x - priv->extent->min_x) / 2;
+ y = priv->extent->min_y + (priv->extent->max_y - priv->extent->min_y) / 2;
+
+ goo_canvas_text_new (group,
+ str_label,
+ x, y, -1,
+ GTK_ANCHOR_CENTER,
+ "font", g_strdup_printf ("Sans %fpx", 12 / scale->xy),
+ NULL);
+
+ item = group;
+ }
}
}
GtkGisGeometry *gtk_gis_geometry_line_new (void);
-GtkGisGeometry *gtk_gis_geometry_line_new_from_list (GSList *points);
+GtkGisGeometry *gtk_gis_geometry_line_new_from_points (GSList *points);
-void gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point);
+void gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint *point);
void gtk_gis_geometry_line_add_point_from_coordinates (GtkGisGeometryLine *line,
gdouble x, gdouble y);
static GtkGisExtent *gtk_gis_geometry_point_get_extent (GtkGisGeometry *point);
static GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
static void gtk_gis_geometry_point_set_property (GObject *object,
guint property_id,
static
GooCanvasItem *gtk_gis_geometry_point_draw (GtkGisGeometry *point,
GtkGisScale *scale,
- GtkGisLayerStyle style)
+ GtkGisLayerStyle *style)
{
GooCanvasItem *item = NULL;
if (priv->point != NULL)
{
+ const gchar *str_label;
+
item = goo_canvas_ellipse_new (NULL,
priv->point->x, priv->point->y,
- 0.5 / scale->x, 0.5 / scale->y,
- "line-width", style.width / scale->xy,
- "stroke-color", style.stroke_color,
- "fill-color", style.fill_color,
+ (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,
NULL);
+
+ str_label = gtk_gis_geometry_get_label (point);
+ if (str_label != NULL
+ && g_strcmp0 (str_label, "") != 0)
+ {
+ GooCanvasItem *group;
+
+ group = goo_canvas_group_new (NULL, NULL);
+
+ goo_canvas_item_add_child (group, item, -1);
+
+ goo_canvas_text_new (group,
+ str_label,
+ priv->point->x, priv->point->y, -1,
+ GTK_ANCHOR_CENTER,
+ "font", g_strdup_printf ("Sans %fpx", 12 / scale->xy),
+ NULL);
+
+ item = group;
+ }
}
return item;
static GtkGisExtent *gtk_gis_geometry_polygon_get_extent (GtkGisGeometry *polygon);
static GooCanvasItem *gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon,
GtkGisScale *scale,
- GtkGisLayerStyle style);
+ GtkGisLayerStyle *style);
static void gtk_gis_geometry_polygon_set_property (GObject *object,
guint property_id,
GtkGisGeometry *polygon = NULL;
GtkGisGeometry *line = NULL;
- line = gtk_gis_geometry_line_new_from_list (points);
+ line = gtk_gis_geometry_line_new_from_points (points);
if (line != NULL)
{
/* recalculate the new extent */
line_extent = gtk_gis_geometry_get_extent (GTK_GIS_GEOMETRY (line));
- if (priv->extent = NULL)
+ if (priv->extent == NULL)
{
priv->extent = g_malloc (sizeof (GtkGisExtent));
priv->extent->min_x = line_extent->min_x;
g_return_if_fail (IS_GTK_GIS_GEOMETRY_POLYGON (polygon));
- line = gtk_gis_geometry_line_new_from_list (points);
+ line = gtk_gis_geometry_line_new_from_points (points);
if (line != NULL)
{
static GooCanvasItem
*gtk_gis_geometry_polygon_draw (GtkGisGeometry *polygon,
GtkGisScale *scale,
- GtkGisLayerStyle style)
+ GtkGisLayerStyle *style)
{
GtkGisGeometryPolygonPrivate *priv;
GooCanvasItem *item = NULL;
GtkGisGeometry *line;
const gchar *str_label;
- GooCanvasItem *item_label;
cur = priv->lines;
while (cur != NULL)
}
item = goo_canvas_path_new (NULL,
- path,
- "line-width", style.width / scale->xy,
- "stroke-color", style.stroke_color,
- "fill-color", style.fill_color,
+ path + 1,
+ "line-width", style->width / scale->xy,
+ "stroke-color", style->stroke_color,
+ "fill-color", style->fill_color,
"fill-rule", CAIRO_FILL_RULE_EVEN_ODD,
NULL);
if (str_label != NULL
&& g_strcmp0 (str_label, "") != 0)
{
+ GooCanvasItem *group;
gdouble x;
gdouble y;
+ group = goo_canvas_group_new (NULL, NULL);
+
+ goo_canvas_item_add_child (group, item, -1);
+
/* center the label inside the polygon */
/* TO DO
x = priv->extent->min_x + (priv->extent->max_x - priv->extent->min_x) / 2;
y = priv->extent->min_y + (priv->extent->max_y - priv->extent->min_y) / 2;
- item_label = goo_canvas_text_new (item,
- str_label,
- x, y, -1,
- GTK_ANCHOR_CENTER,
- "font", "Sans 12",
- NULL);
+ goo_canvas_text_new (group,
+ str_label,
+ x, y, -1,
+ GTK_ANCHOR_CENTER,
+ "font", g_strdup_printf ("Sans %fpx", 12 / scale->xy),
+ NULL);
+
+ item = group;
}
}
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <locale.h>
+
#include <goocanvas.h>
#include <ogr_api.h>
&& xmlStrcmp (cur->name, "style") == 0)
{
xmlNode *xml_style;
- GtkGisLayerStyle style;
+ GtkGisLayerStyle *style;
xml_style = cur;
+ style = g_malloc0 (sizeof (GtkGisLayerStyle));
+ style->stroke_color = NULL;
+ style->fill_color = NULL;
+
cur = cur->children;
while (cur != NULL)
{
if (cur->type == XML_ELEMENT_NODE
&& (xmlStrcmp (cur->name, "width") == 0))
{
- style.width = g_strtod ((gchar *)xmlNodeGetContent (cur), NULL);
+ style->width = g_strtod ((gchar *)xmlNodeGetContent (cur), NULL);
}
else if (cur->type == XML_ELEMENT_NODE
&& (xmlStrcmp (cur->name, "stroke-color") == 0))
{
- style.stroke_color = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ style->stroke_color = g_strdup ((gchar *)xmlNodeGetContent (cur));
}
else if (cur->type == XML_ELEMENT_NODE
&& (xmlStrcmp (cur->name, "fill-color") == 0))
{
- style.fill_color = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ style->fill_color = g_strdup ((gchar *)xmlNodeGetContent (cur));
}
cur = cur->next;
}
cur = xml_style;
}
+ else if (cur->type == XML_ELEMENT_NODE
+ && xmlStrcmp (cur->name, "label") == 0)
+ {
+ xmlNode *xml_label;
+ GtkGisLayerLabel *label;
+
+ xml_label = cur;
+
+ label = g_malloc0 (sizeof (GtkGisLayerLabel));
+ label->field = NULL;
+ label->color = NULL;
+ label->background_color = NULL;
+ label->font = NULL;
+
+ cur = cur->children;
+ while (cur != NULL)
+ {
+ if (cur->type == XML_ELEMENT_NODE
+ && (xmlStrcmp (cur->name, "field") == 0))
+ {
+ label->field = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ }
+ else if (cur->type == XML_ELEMENT_NODE
+ && (xmlStrcmp (cur->name, "color") == 0))
+ {
+ label->color = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ }
+ else if (cur->type == XML_ELEMENT_NODE
+ && (xmlStrcmp (cur->name, "background-color") == 0))
+ {
+ label->background_color = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ }
+ else if (cur->type == XML_ELEMENT_NODE
+ && (xmlStrcmp (cur->name, "font") == 0))
+ {
+ label->font = g_strdup ((gchar *)xmlNodeGetContent (cur));
+ }
+ cur = cur->next;
+ }
+
+ gtk_gis_layer_set_label (layer, label);
+
+ cur = xml_label;
+ }
cur = cur->next;
}
xmlDoc
*gtk_gis_get_xml (GtkGis *gtkgis)
{
+ gchar *locale_old;
+ gchar *locale_num;
+
xmlDoc *xdoc = NULL;
xmlNode *xroot;
xmlNode *xreport;
priv = GTK_GIS_GET_PRIVATE (gtkgis);
+ locale_old = setlocale (LC_ALL, NULL);
+ locale_num = setlocale (LC_NUMERIC, "C");
+
xdoc = xmlNewDoc ("1.0");
xroot = xmlNewNode (NULL, "gtkgis");
cur_layer = g_slist_next (cur_layer);
}
+ setlocale (LC_NUMERIC, locale_num);
+ setlocale (LC_ALL, locale_old);
+
return xdoc;
}
GdkCursor *cursor;
GSList *cur;
GtkGisLayerSource *layer_source;
+ GooCanvasItem *item_layer;
g_return_if_fail (IS_GTK_GIS (gtkgis));
layer_source = gtk_gis_layer_get_source ((GtkGisLayer *)cur->data);
gtk_gis_layer_source_set_max_extent (layer_source, priv->extent);
- gtk_gis_layer_draw ((GtkGisLayer *)cur->data, priv->canvas_root, priv->scale);
+ item_layer = gtk_gis_layer_draw ((GtkGisLayer *)cur->data, priv->scale);
+ if (item_layer != NULL)
+ {
+ goo_canvas_item_add_child (priv->canvas_root, item_layer, -1);
+ }
cur = g_slist_next (cur);
}
/**
* gtk_gis_set_scale:
* @gtkgis: a #GtkGis object.
- * @scale:
+ * @scale: a #GtkGisScale struct.
*
*/
void
scale = g_malloc0 (sizeof (GtkGisScale));
- /* must add width or height to make the max extent
+ /* must add width or height to make the extent
* the same proportion of the canvas */
extent_width = extent.max_x - extent.min_x;
extent_height = extent.max_y - extent.min_y;
* gtk_gis_zoom_to_max:
* @gtkgis: a #GtkGis object.
*
+ * Zoom to the possible max extent.
*/
void
gtk_gis_zoom_to_max (GtkGis *gtkgis)
priv->style->stroke_color = g_strdup ("black");
priv->style->fill_color = g_strdup ("white");
- priv->label = NULL;
+ 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->font = g_strdup ("Sans 12");
}
/**
xmlSetProp (xnode, "name", priv->name);
}
- if (!priv->visible)
+ if (priv->visible)
+ {
+ xmlSetProp (xnode, "visible", "y");
+ }
+ else
{
xmlSetProp (xnode, "visible", "n");
}
xnode_label_prop = xmlNewNode (NULL, "field");
xmlNodeSetContent (xnode_label_prop, g_strdup (priv->label->field));
xmlAddChild (xnode_label, xnode_label_prop);
+
+ xnode_label_prop = xmlNewNode (NULL, "color");
+ xmlNodeSetContent (xnode_label_prop, g_strdup (priv->label->color));
+ xmlAddChild (xnode_label, xnode_label_prop);
+
+ xnode_label_prop = xmlNewNode (NULL, "background-color");
+ xmlNodeSetContent (xnode_label_prop, g_strdup (priv->label->background_color));
+ xmlAddChild (xnode_label, xnode_label_prop);
+
+ xnode_label_prop = xmlNewNode (NULL, "font");
+ xmlNodeSetContent (xnode_label_prop, g_strdup (priv->label->font));
+ xmlAddChild (xnode_label, xnode_label_prop);
}
return xnode;
priv = GTK_GIS_LAYER_GET_PRIVATE (layer);
field = NULL;
- if (label->field != NULL && g_strcmp0 (label->field, "") != 0)
+ if (label != NULL && label->field != NULL && g_strcmp0 (label->field, "") != 0)
{
field = g_strdup (label->field);
}
* Valid only for layers that aren't rasters.
*/
void
-gtk_gis_layer_set_style (GtkGisLayer *layer, GtkGisLayerStyle style)
+gtk_gis_layer_set_style (GtkGisLayer *layer, GtkGisLayerStyle *style)
{
GtkGisLayerPrivate *priv;
- GtkGisLayerStyle new_style;
+ GtkGisLayerStyle *new_style;
gchar *prop;
g_return_if_fail (IS_GTK_GIS_LAYER (layer));
+ if (style == NULL) return;
+
priv = GTK_GIS_LAYER_GET_PRIVATE (layer);
- if (style.width != 0)
+ new_style = g_malloc0 (sizeof (GtkGisLayerStyle));
+
+ if (style->width != 0)
{
- new_style.width = style.width;
+ new_style->width = style->width;
}
else
{
- new_style.width = priv->style->width;
+ new_style->width = priv->style->width;
}
- prop = g_strdup (style.stroke_color);
- if (style.stroke_color != NULL &&
+ prop = g_strdup (style->stroke_color);
+ if (style->stroke_color != NULL &&
g_strcmp0 (g_strstrip (prop), "") != 0)
{
- new_style.stroke_color = g_strdup (style.stroke_color);
+ new_style->stroke_color = g_strdup (prop);
}
else
{
- new_style.stroke_color = g_strdup (priv->style->stroke_color);
+ new_style->stroke_color = g_strdup (priv->style->stroke_color);
}
- prop = g_strdup (style.fill_color);
- if (style.fill_color != NULL &&
+ prop = g_strdup (style->fill_color);
+ if (style->fill_color != NULL &&
g_strcmp0 (g_strstrip (prop), "") != 0)
{
- new_style.fill_color = g_strdup (style.fill_color);
+ new_style->fill_color = g_strdup (prop);
}
else
{
- new_style.fill_color = g_strdup (priv->style->fill_color);
+ new_style->fill_color = g_strdup (priv->style->fill_color);
}
g_free (priv->style);
- priv->style = g_memdup (&new_style, sizeof (GtkGisLayerStyle));
+ priv->style = new_style;
}
/**
gtk_gis_layer_set_label (GtkGisLayer *layer, GtkGisLayerLabel *label)
{
GtkGisLayerPrivate *priv;
+ GtkGisLayerLabel *new_label;
+ gchar *prop;
g_return_if_fail (IS_GTK_GIS_LAYER (layer));
- priv->label = g_memdup (label, sizeof (GtkGisLayerLabel));
+ if (label == NULL) return;
+
+ priv = GTK_GIS_LAYER_GET_PRIVATE (layer);
+
+ new_label = g_malloc0 (sizeof (GtkGisLayerLabel));
+
+ prop = g_strdup (label->field);
+ if (label->field != NULL &&
+ g_strcmp0 (g_strstrip (prop), "") != 0)
+ {
+ new_label->field = g_strdup (prop);
+ }
+ else
+ {
+ new_label->field = g_strdup (priv->label->field);
+ }
+
+ prop = g_strdup (label->color);
+ if (label->color != NULL &&
+ g_strcmp0 (g_strstrip (prop), "") != 0)
+ {
+ new_label->color = g_strdup (prop);
+ }
+ else
+ {
+ new_label->color = g_strdup (priv->label->color);
+ }
+
+ prop = g_strdup (label->background_color);
+ if (label->background_color != NULL &&
+ g_strcmp0 (g_strstrip (prop), "") != 0)
+ {
+ new_label->background_color = g_strdup (prop);
+ }
+ else
+ {
+ new_label->background_color = g_strdup (priv->label->background_color);
+ }
+
+ prop = g_strdup (label->font);
+ if (label->font != NULL &&
+ g_strcmp0 (g_strstrip (prop), "") != 0)
+ {
+ new_label->font = g_strdup (prop);
+ }
+ else
+ {
+ new_label->font = g_strdup (priv->label->font);
+ }
+
+ g_free (priv->label);
+ priv->label = new_label;
}
/**
* gtk_gis_layer_draw:
* @layer: a #GtkGisLayer object.
- * @root:
* @scale:
*
+ * Returns: the #GooCanvasItem object with the layer's content draw.
*/
-void
-gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale)
+GooCanvasItem
+*gtk_gis_layer_draw (GtkGisLayer *layer, GtkGisScale *scale)
{
GtkGisLayerPrivate *priv;
GSList *cur;
GooCanvasItem *item;
g_return_if_fail (IS_GTK_GIS_LAYER (layer));
- g_return_if_fail (GOO_IS_CANVAS_ITEM (root));
priv = GTK_GIS_LAYER_GET_PRIVATE (layer);
gtk_gis_layer_fill_from_source (layer, priv->label);
- priv->layer_item = goo_canvas_group_new (root, NULL);
+ priv->layer_item = goo_canvas_group_new (NULL, NULL);
cur = priv->geometries;
while (cur != NULL)
{
- item = gtk_gis_geometry_draw ((GtkGisGeometry *)cur->data, scale, *priv->style);
+ item = gtk_gis_geometry_draw ((GtkGisGeometry *)cur->data, scale, priv->style);
if (item != NULL)
{
goo_canvas_item_add_child (priv->layer_item, item, -1);
cur = g_slist_next (cur);
}
+
+ return priv->layer_item;
}
static void
gboolean editable);
GtkGisLayerStyle *gtk_gis_layer_get_style (GtkGisLayer *layer);
-void gtk_gis_layer_set_style (GtkGisLayer *layer, GtkGisLayerStyle style);
+void gtk_gis_layer_set_style (GtkGisLayer *layer, GtkGisLayerStyle *style);
GtkGisLayerLabel *gtk_gis_layer_get_label (GtkGisLayer *layer);
void gtk_gis_layer_set_label (GtkGisLayer *layer, GtkGisLayerLabel *label);
-void gtk_gis_layer_draw (GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale);
+GooCanvasItem *gtk_gis_layer_draw (GtkGisLayer *layer, GtkGisScale *scale);
G_END_DECLS
gpoints = g_slist_append (gpoints, gpoint);
}
- geometry = gtk_gis_geometry_line_new_from_list (gpoints);
+ geometry = gtk_gis_geometry_line_new_from_points (gpoints);
}
else if (poGeometry != NULL
&& wkbFlatten (OGR_G_GetGeometryType (poGeometry)) == wkbPolygon)
gtk_widget_show_all (window);
- /*gtk_gis_zoom_to_max (GTK_GIS (gtkgis));*/
- gtk_gis_zoom_to_layer (GTK_GIS (gtkgis),
- gtk_gis_get_layer_by_name (GTK_GIS (gtkgis), "railroads"));
+ gtk_gis_zoom_to_max (GTK_GIS (gtkgis));
+ /*gtk_gis_zoom_to_layer (GTK_GIS (gtkgis),
+ gtk_gis_get_layer_by_name (GTK_GIS (gtkgis), "railroads"));*/
gtk_gis_draw (GTK_GIS (gtkgis));
/*scale = gtk_gis_get_scale (GTK_GIS (gtkgis));
<source>
<shape filename="tests/samples/airports.shp" />
</source>
+ <style>
+ <stroke-color>red</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>
</style>
- </layer>
+ </layer>-->
- <layer name="rivers" visible="n">
+ <layer name="rivers">
<source>
<shape filename="tests/samples/rivers.shp" />
</source>
<style>
<stroke-color>blue</stroke-color>
</style>
+ <!--<label>
+ <field>NAM</field>
+ </label>-->
</layer>
</gtkgis>
projects / libgtkgis / commitdiff