From 94b967299bbfd1ee98707929dbcdb52ee2e82ba0 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 28 Jul 2009 10:31:23 +0200 Subject: [PATCH] Added more gtk-documentation. Changed algorithm for zoom to max (now seems to work). --- .gitignore | 1 + docs/reference/libgtkgis-decl-list.txt | 230 +++++ docs/reference/libgtkgis-decl.txt | 932 ++++++++++++++++++++ docs/reference/libgtkgis-overrides.txt | 0 docs/reference/libgtkgis-sections.txt | 230 +++++ docs/reference/libgtkgis-undeclared.txt | 0 docs/reference/libgtkgis-undocumented.txt | 184 ++++ docs/reference/libgtkgis-unused.txt | 12 + docs/reference/libgtkgis.args | 0 docs/reference/libgtkgis.hierarchy | 28 + docs/reference/libgtkgis.interfaces | 4 + docs/reference/libgtkgis.prerequisites | 0 docs/reference/libgtkgis.signals | 0 docs/reference/libgtkgis.types | 12 + docs/reference/tmpl/commons.sgml | 2 - docs/reference/tmpl/geometry.sgml | 2 - docs/reference/tmpl/geometryline.sgml | 2 - docs/reference/tmpl/geometrypoint.sgml | 2 - docs/reference/tmpl/geometrypolygon.sgml | 2 - docs/reference/tmpl/geometryraster.sgml | 2 - docs/reference/tmpl/gtkgis.sgml | 3 - docs/reference/tmpl/layer.sgml | 2 - docs/reference/tmpl/layersgroup.sgml | 2 - docs/reference/tmpl/layersource.sgml | 2 - docs/reference/tmpl/layersourcepostgis.sgml | 2 - docs/reference/tmpl/layersourceraster.sgml | 2 - docs/reference/tmpl/layersourceshp.sgml | 2 - docs/reference/tmpl/libgtkgis.sgml | 2 - libgtkgis.pc.in | 2 +- src/geometry.c | 6 +- src/geometryline.c | 8 +- src/geometrypoint.c | 8 +- src/geometrypolygon.c | 12 +- src/geometryraster.c | 2 +- src/gtkgis.c | 103 ++- src/gtkgis.h | 2 +- src/layer.c | 33 +- src/layersource.c | 16 +- tests/from_xml.c | 11 +- 39 files changed, 1763 insertions(+), 102 deletions(-) create mode 100644 docs/reference/libgtkgis-decl-list.txt create mode 100644 docs/reference/libgtkgis-decl.txt create mode 100644 docs/reference/libgtkgis-overrides.txt create mode 100644 docs/reference/libgtkgis-sections.txt create mode 100644 docs/reference/libgtkgis-undeclared.txt create mode 100644 docs/reference/libgtkgis-undocumented.txt create mode 100644 docs/reference/libgtkgis-unused.txt create mode 100644 docs/reference/libgtkgis.args create mode 100644 docs/reference/libgtkgis.hierarchy create mode 100644 docs/reference/libgtkgis.interfaces create mode 100644 docs/reference/libgtkgis.prerequisites create mode 100644 docs/reference/libgtkgis.signals create mode 100644 docs/reference/libgtkgis.types diff --git a/.gitignore b/.gitignore index df1ab9d..c92b0fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.l[oa] *.[oa] *~ +*.bak Makefile Makefile.in diff --git a/docs/reference/libgtkgis-decl-list.txt b/docs/reference/libgtkgis-decl-list.txt new file mode 100644 index 0000000..35fd1d9 --- /dev/null +++ b/docs/reference/libgtkgis-decl-list.txt @@ -0,0 +1,230 @@ +
+geometrypoint +TYPE_GTK_GIS_GEOMETRY_POINT +GTK_GIS_GEOMETRY_POINT +GTK_GIS_GEOMETRY_POINT_CLASS +IS_GTK_GIS_GEOMETRY_POINT +IS_GTK_GIS_GEOMETRY_POINT_CLASS +GTK_GIS_GEOMETRY_POINT_GET_CLASS +GtkGisGeometryPoint +GtkGisGeometryPoint +gtk_gis_geometry_point_get_type +gtk_gis_geometry_point_new +gtk_gis_geometry_get_point +gtk_gis_geometry_point_get_x +gtk_gis_geometry_point_get_y +
+ +
+layersourceshp +TYPE_GTK_GIS_LAYER_SOURCE_SHP +GTK_GIS_LAYER_SOURCE_SHP +GTK_GIS_LAYER_SOURCE_SHP_CLASS +IS_GTK_GIS_LAYER_SOURCE_SHP +IS_GTK_GIS_LAYER_SOURCE_SHP_CLASS +GTK_GIS_LAYER_SOURCE_SHP_GET_CLASS +GtkGisLayerSourceShp +GtkGisLayerSourceShp +gtk_gis_layer_source_shp_get_type +gtk_gis_layer_source_shp_new +gtk_gis_layer_source_shp_new_from_xml +gtk_gis_layer_source_shp_get_filename +
+ +
+geometrypolygon +TYPE_GTK_GIS_GEOMETRY_POLYGON +GTK_GIS_GEOMETRY_POLYGON +GTK_GIS_GEOMETRY_POLYGON_CLASS +IS_GTK_GIS_GEOMETRY_POLYGON +IS_GTK_GIS_GEOMETRY_POLYGON_CLASS +GTK_GIS_GEOMETRY_POLYGON_GET_CLASS +GtkGisGeometryPolygon +GtkGisGeometryPolygon +gtk_gis_geometry_polygon_get_type +gtk_gis_geometry_polygon_new +gtk_gis_geometry_polygon_new_from_line +gtk_gis_geometry_polygon_new_from_list +gtk_gis_geometry_polygon_add_line +gtk_gis_geometry_polygon_add_line_from_list +gtk_gis_geometry_polygon_remove_line +
+ +
+gtkgis +TYPE_GTK_GIS +GTK_GIS +GTK_GIS_CLASS +IS_GTK_GIS +IS_GTK_GIS_CLASS +GTK_GIS_GET_CLASS +GtkGis +GtkGis +gtk_gis_get_type +gtk_gis_new +gtk_gis_new_from_xml +gtk_gis_new_from_file +gtk_gis_get_xml +gtk_gis_save_to_xml +gtk_gis_add_group +gtk_gis_remove_group +gtk_gis_add_layer +gtk_gis_remove_layer +gtk_gis_get_layer_by_name +gtk_gis_draw +gtk_gis_get_scale +gtk_gis_set_scale +gtk_gis_zoom_to_max +gtk_gis_zoom_to_layer +gtk_gis_get_legend +
+ +
+layersgroup +TYPE_GTK_GIS_LAYERS_GROUP +GTK_GIS_LAYERS_GROUP +GTK_GIS_LAYERS_GROUP_CLASS +IS_GTK_GIS_LAYERS_GROUP +IS_GTK_GIS_LAYERS_GROUP_CLASS +GTK_GIS_LAYERS_GROUP_GET_CLASS +GtkGisLayersGroup +GtkGisLayersGroup +gtk_gis_layers_group_get_type +gtk_gis_layers_group_new +gtk_gis_layers_group_add_layer +gtk_gis_layers_group_remove_layer +gtk_gis_layers_group_get_name +gtk_gis_layers_group_set_name +
+ +
+layer +TYPE_GTK_GIS_LAYER +GTK_GIS_LAYER +GTK_GIS_LAYER_CLASS +IS_GTK_GIS_LAYER +IS_GTK_GIS_LAYER_CLASS +GTK_GIS_LAYER_GET_CLASS +GtkGisLayer +GtkGisLayer +gtk_gis_layer_get_type +gtk_gis_layer_new +gtk_gis_layer_new_from_source +gtk_gis_layer_get_xml +gtk_gis_layer_get_name +gtk_gis_layer_get_source +gtk_gis_layer_fill_from_source +gtk_gis_layer_save +gtk_gis_layer_add_geometry +gtk_gis_layer_remove_geometry +gtk_gis_layer_get_extent +gtk_gis_layer_get_editable +gtk_gis_layer_set_editable +gtk_gis_layer_draw +
+ +
+libgtkgis +
+ +
+geometryline +TYPE_GTK_GIS_GEOMETRY_LINE +GTK_GIS_GEOMETRY_LINE +GTK_GIS_GEOMETRY_LINE_CLASS +IS_GTK_GIS_GEOMETRY_LINE +IS_GTK_GIS_GEOMETRY_LINE_CLASS +GTK_GIS_GEOMETRY_LINE_GET_CLASS +GtkGisGeometryLine +GtkGisGeometryLine +gtk_gis_geometry_line_get_type +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 +
+ +
+geometry +TYPE_GTK_GIS_GEOMETRY +GTK_GIS_GEOMETRY +GTK_GIS_GEOMETRY_CLASS +IS_GTK_GIS_GEOMETRY +IS_GTK_GIS_GEOMETRY_CLASS +GTK_GIS_GEOMETRY_GET_CLASS +GtkGisGeometry +GtkGisGeometry +gtk_gis_geometry_get_type +gtk_gis_geometry_get_editable +gtk_gis_geometry_set_editable +gtk_gis_geometry_draw +
+ +
+layersourcepostgis +TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS +GTK_GIS_LAYER_SOURCE_POSTGIS +GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +GTK_GIS_LAYER_SOURCE_POSTGIS_GET_CLASS +GtkGisLayerSourcePostgis +GtkGisLayerSourcePostgis +gtk_gis_layer_source_postgis_get_type +gtk_gis_layer_source_postgis_new +gtk_gis_layer_source_postgis_new_from_xml +
+ +
+layersourceraster +TYPE_GTK_GIS_LAYER_SOURCE_RASTER +GTK_GIS_LAYER_SOURCE_RASTER +GTK_GIS_LAYER_SOURCE_RASTER_CLASS +IS_GTK_GIS_LAYER_SOURCE_RASTER +IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS +GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS +GtkGisLayerSourceRaster +GtkGisLayerSourceRaster +gtk_gis_layer_source_raster_get_type +gtk_gis_layer_source_raster_new +gtk_gis_layer_source_raster_new_from_xml +gtk_gis_layer_source_raster_get_filename +
+ +
+layersource +TYPE_GTK_GIS_LAYER_SOURCE +GTK_GIS_LAYER_SOURCE +GTK_GIS_LAYER_SOURCE_CLASS +IS_GTK_GIS_LAYER_SOURCE +IS_GTK_GIS_LAYER_SOURCE_CLASS +GTK_GIS_LAYER_SOURCE_GET_CLASS +GtkGisLayerSource +GtkGisLayerSource +gtk_gis_layer_source_get_type +gtk_gis_layer_source_get_xml +gtk_gis_layer_source_get_geometries +gtk_gis_layer_source_get_layer_geometry_type +gtk_gis_layer_source_get_layer_extent +gtk_gis_layer_source_set_max_extent +
+ +
+commons +GtkGisLayerGeometryType +
+ +
+geometryraster +TYPE_GTK_GIS_GEOMETRY_RASTER +GTK_GIS_GEOMETRY_RASTER +GTK_GIS_GEOMETRY_RASTER_CLASS +IS_GTK_GIS_GEOMETRY_RASTER +IS_GTK_GIS_GEOMETRY_RASTER_CLASS +GTK_GIS_GEOMETRY_RASTER_GET_CLASS +GtkGisGeometryRaster +GtkGisGeometryRaster +gtk_gis_geometry_raster_get_type +gtk_gis_geometry_raster_new_from_pixbuf +
+ diff --git a/docs/reference/libgtkgis-decl.txt b/docs/reference/libgtkgis-decl.txt new file mode 100644 index 0000000..7405e27 --- /dev/null +++ b/docs/reference/libgtkgis-decl.txt @@ -0,0 +1,932 @@ + +TYPE_GTK_GIS_GEOMETRY_POINT +#define TYPE_GTK_GIS_GEOMETRY_POINT (gtk_gis_geometry_point_get_type ()) + + +GTK_GIS_GEOMETRY_POINT +#define GTK_GIS_GEOMETRY_POINT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_GEOMETRY_POINT, GtkGisGeometryPoint)) + + +GTK_GIS_GEOMETRY_POINT_CLASS +#define GTK_GIS_GEOMETRY_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_GEOMETRY_POINT, GtkGisGeometryPointClass)) + + +IS_GTK_GIS_GEOMETRY_POINT +#define IS_GTK_GIS_GEOMETRY_POINT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_GEOMETRY_POINT)) + + +IS_GTK_GIS_GEOMETRY_POINT_CLASS +#define IS_GTK_GIS_GEOMETRY_POINT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_GEOMETRY_POINT)) + + +GTK_GIS_GEOMETRY_POINT_GET_CLASS +#define GTK_GIS_GEOMETRY_POINT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_GEOMETRY_POINT, GtkGisGeometryPointClass)) + + +GtkGisGeometryPoint + + +GtkGisGeometryPointClass + + +GtkGisGeometryPoint +struct _GtkGisGeometryPoint + { + GtkGisGeometry parent; + }; + + +GtkGisGeometryPointClass +struct _GtkGisGeometryPointClass + { + GtkGisGeometryClass parent_class; + }; + + +gtk_gis_geometry_point_get_type +GType +void + + +gtk_gis_geometry_point_new +GtkGisGeometry * +GtkGisPoint point + + +gtk_gis_geometry_get_point +GtkGisPoint * +GtkGisGeometryPoint *point + + +gtk_gis_geometry_point_get_x +gdouble +GtkGisGeometryPoint *point + + +gtk_gis_geometry_point_get_y +gdouble +GtkGisGeometryPoint *point + + +TYPE_GTK_GIS_LAYER_SOURCE_SHP +#define TYPE_GTK_GIS_LAYER_SOURCE_SHP (gtk_gis_layer_source_shp_get_type ()) + + +GTK_GIS_LAYER_SOURCE_SHP +#define GTK_GIS_LAYER_SOURCE_SHP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER_SOURCE_SHP, GtkGisLayerSourceShp)) + + +GTK_GIS_LAYER_SOURCE_SHP_CLASS +#define GTK_GIS_LAYER_SOURCE_SHP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER_SOURCE_SHP, GtkGisLayerSourceShpClass)) + + +IS_GTK_GIS_LAYER_SOURCE_SHP +#define IS_GTK_GIS_LAYER_SOURCE_SHP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER_SOURCE_SHP)) + + +IS_GTK_GIS_LAYER_SOURCE_SHP_CLASS +#define IS_GTK_GIS_LAYER_SOURCE_SHP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER_SOURCE_SHP)) + + +GTK_GIS_LAYER_SOURCE_SHP_GET_CLASS +#define GTK_GIS_LAYER_SOURCE_SHP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE_SHP, GtkGisLayerSourceShpClass)) + + +GtkGisLayerSourceShp + + +GtkGisLayerSourceShpClass + + +GtkGisLayerSourceShp +struct _GtkGisLayerSourceShp + { + GtkGisLayerSource parent; + }; + + +GtkGisLayerSourceShpClass +struct _GtkGisLayerSourceShpClass + { + GtkGisLayerSourceClass parent_class; + }; + + +gtk_gis_layer_source_shp_get_type +GType +void + + +gtk_gis_layer_source_shp_new +GtkGisLayerSource * +const gchar *filename + + +gtk_gis_layer_source_shp_new_from_xml +GtkGisLayerSource * +xmlNode *xnode + + +gtk_gis_layer_source_shp_get_filename +gchar * +GtkGisLayerSourceShp *source + + +TYPE_GTK_GIS_GEOMETRY_POLYGON +#define TYPE_GTK_GIS_GEOMETRY_POLYGON (gtk_gis_geometry_polygon_get_type ()) + + +GTK_GIS_GEOMETRY_POLYGON +#define GTK_GIS_GEOMETRY_POLYGON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_GEOMETRY_POLYGON, GtkGisGeometryPolygon)) + + +GTK_GIS_GEOMETRY_POLYGON_CLASS +#define GTK_GIS_GEOMETRY_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_GEOMETRY_POLYGON, GtkGisGeometryPolygonClass)) + + +IS_GTK_GIS_GEOMETRY_POLYGON +#define IS_GTK_GIS_GEOMETRY_POLYGON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_GEOMETRY_POLYGON)) + + +IS_GTK_GIS_GEOMETRY_POLYGON_CLASS +#define IS_GTK_GIS_GEOMETRY_POLYGON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_GEOMETRY_POLYGON)) + + +GTK_GIS_GEOMETRY_POLYGON_GET_CLASS +#define GTK_GIS_GEOMETRY_POLYGON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_GEOMETRY_POLYGON, GtkGisGeometryPolygonClass)) + + +GtkGisGeometryPolygon + + +GtkGisGeometryPolygonClass + + +GtkGisGeometryPolygon +struct _GtkGisGeometryPolygon + { + GtkGisGeometry parent; + }; + + +GtkGisGeometryPolygonClass +struct _GtkGisGeometryPolygonClass + { + GtkGisGeometryClass parent_class; + }; + + +gtk_gis_geometry_polygon_get_type +GType +void + + +gtk_gis_geometry_polygon_new +GtkGisGeometry * +void + + +gtk_gis_geometry_polygon_new_from_line +GtkGisGeometry * +GtkGisGeometryLine *line + + +gtk_gis_geometry_polygon_new_from_list +GtkGisGeometry * +GSList *points + + +gtk_gis_geometry_polygon_add_line +void +GtkGisGeometryPolygon *polygon, GtkGisGeometryLine *line + + +gtk_gis_geometry_polygon_add_line_from_list +void +GtkGisGeometryPolygon *polygon, GSList *points + + +gtk_gis_geometry_polygon_remove_line +void +GtkGisGeometryPolygon *polygon, GtkGisGeometryLine *line + + +TYPE_GTK_GIS +#define TYPE_GTK_GIS (gtk_gis_get_type ()) + + +GTK_GIS +#define GTK_GIS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS, GtkGis)) + + +GTK_GIS_CLASS +#define GTK_GIS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS, GtkGisClass)) + + +IS_GTK_GIS +#define IS_GTK_GIS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS)) + + +IS_GTK_GIS_CLASS +#define IS_GTK_GIS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS)) + + +GTK_GIS_GET_CLASS +#define GTK_GIS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS, GtkGisClass)) + + +GtkGis + + +GtkGisClass + + +GtkGis +struct _GtkGis + { + GtkBin parent; + }; + + +GtkGisClass +struct _GtkGisClass + { + GtkBinClass parent_class; + }; + + +gtk_gis_get_type +GType +void + + +gtk_gis_new +GtkWidget * +void + + +gtk_gis_new_from_xml +GtkWidget * +xmlDoc *xdoc + + +gtk_gis_new_from_file +GtkWidget * +const gchar *file_name + + +gtk_gis_get_xml +xmlDoc * +GtkGis *gtkgis + + +gtk_gis_save_to_xml +void +GtkGis *gtkgis, const gchar *file_name + + +gtk_gis_add_group +void +GtkGis *gtkgis, GtkGisLayersGroup *layers_group + + +gtk_gis_remove_group +void +GtkGis *gtkgis, GtkGisLayersGroup *layers_group + + +gtk_gis_add_layer +void +GtkGis *gtkgis, GtkGisLayer *layer + + +gtk_gis_remove_layer +void +GtkGis *gtkgis, GtkGisLayer *layer + + +gtk_gis_get_layer_by_name +GtkGisLayer * +GtkGis *gtkgis, const gchar *layer_name + + +gtk_gis_draw +void +GtkGis *gtkgis + + +gtk_gis_get_scale +GtkGisScale * +GtkGis *gtkgis + + +gtk_gis_set_scale +void +GtkGis *gtkgis, GtkGisScale *scale + + +gtk_gis_zoom_to_max +void +GtkGis *gtkgis + + +gtk_gis_zoom_to_layer +void +GtkGis *gtkgis, GtkGisLayer *layer + + +gtk_gis_get_legend +GtkWidget * +GtkGis *gtkgis + + +TYPE_GTK_GIS_LAYERS_GROUP +#define TYPE_GTK_GIS_LAYERS_GROUP (gtk_gis_layers_group_get_type ()) + + +GTK_GIS_LAYERS_GROUP +#define GTK_GIS_LAYERS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroup)) + + +GTK_GIS_LAYERS_GROUP_CLASS +#define GTK_GIS_LAYERS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroupClass)) + + +IS_GTK_GIS_LAYERS_GROUP +#define IS_GTK_GIS_LAYERS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYERS_GROUP)) + + +IS_GTK_GIS_LAYERS_GROUP_CLASS +#define IS_GTK_GIS_LAYERS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYERS_GROUP)) + + +GTK_GIS_LAYERS_GROUP_GET_CLASS +#define GTK_GIS_LAYERS_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYERS_GROUP, GtkGisLayersGroupClass)) + + +GtkGisLayersGroup + + +GtkGisLayersGroupClass + + +GtkGisLayersGroup +struct _GtkGisLayersGroup + { + GObject parent; + }; + + +GtkGisLayersGroupClass +struct _GtkGisLayersGroupClass + { + GObjectClass parent_class; + }; + + +gtk_gis_layers_group_get_type +GType +void + + +gtk_gis_layers_group_new +GtkGisLayersGroup * +const gchar *name + + +gtk_gis_layers_group_add_layer +void +GtkGisLayersGroup *layers_group,GtkGisLayer *layer + + +gtk_gis_layers_group_remove_layer +void +GtkGisLayersGroup *layers_group,GtkGisLayer *layer + + +gtk_gis_layers_group_get_name +gchar * +GtkGisLayersGroup *layers_group + + +gtk_gis_layers_group_set_name +void +GtkGisLayersGroup *layers_group,const gchar *name + + +TYPE_GTK_GIS_LAYER +#define TYPE_GTK_GIS_LAYER (gtk_gis_layer_get_type ()) + + +GTK_GIS_LAYER +#define GTK_GIS_LAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER, GtkGisLayer)) + + +GTK_GIS_LAYER_CLASS +#define GTK_GIS_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER, GtkGisLayerClass)) + + +IS_GTK_GIS_LAYER +#define IS_GTK_GIS_LAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER)) + + +IS_GTK_GIS_LAYER_CLASS +#define IS_GTK_GIS_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER)) + + +GTK_GIS_LAYER_GET_CLASS +#define GTK_GIS_LAYER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER, GtkGisLayerClass)) + + +GtkGisLayer + + +GtkGisLayerClass + + +GtkGisLayer +struct _GtkGisLayer + { + GObject parent; + }; + + +GtkGisLayerClass +struct _GtkGisLayerClass + { + GObjectClass parent_class; + }; + + +gtk_gis_layer_get_type +GType +void + + +gtk_gis_layer_new +GtkGisLayer * +GtkGisLayerSource *source,const gchar *name,GtkGisLayerGeometryType geometry_type + + +gtk_gis_layer_new_from_source +GtkGisLayer * +GtkGisLayerSource *source,const gchar *name + + +gtk_gis_layer_get_xml +xmlNode * +GtkGisLayer *layer + + +gtk_gis_layer_get_name +gchar * +GtkGisLayer *layer + + +gtk_gis_layer_get_source +GtkGisLayerSource * +GtkGisLayer *layer + + +gtk_gis_layer_fill_from_source +void +GtkGisLayer *layer + + +gtk_gis_layer_save +void +GtkGisLayer *layer,GtkGisLayerSource *source + + +gtk_gis_layer_add_geometry +void +GtkGisLayer *layer,GtkGisGeometry *geometry + + +gtk_gis_layer_remove_geometry +void +GtkGisLayer *layer,GtkGisGeometry *geometry + + +gtk_gis_layer_get_extent +GtkGisLayerExtent * +GtkGisLayer *layer + + +gtk_gis_layer_get_editable +gboolean +GtkGisLayer *layer + + +gtk_gis_layer_set_editable +void +GtkGisLayer *layer,gboolean editable + + +gtk_gis_layer_draw +void +GtkGisLayer *layer, GooCanvasItem *root, GtkGisScale *scale + + +TYPE_GTK_GIS_GEOMETRY_LINE +#define TYPE_GTK_GIS_GEOMETRY_LINE (gtk_gis_geometry_line_get_type ()) + + +GTK_GIS_GEOMETRY_LINE +#define GTK_GIS_GEOMETRY_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_GEOMETRY_LINE, GtkGisGeometryLine)) + + +GTK_GIS_GEOMETRY_LINE_CLASS +#define GTK_GIS_GEOMETRY_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_GEOMETRY_LINE, GtkGisGeometryLineClass)) + + +IS_GTK_GIS_GEOMETRY_LINE +#define IS_GTK_GIS_GEOMETRY_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_GEOMETRY_LINE)) + + +IS_GTK_GIS_GEOMETRY_LINE_CLASS +#define IS_GTK_GIS_GEOMETRY_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_GEOMETRY_LINE)) + + +GTK_GIS_GEOMETRY_LINE_GET_CLASS +#define GTK_GIS_GEOMETRY_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_GEOMETRY_LINE, GtkGisGeometryLineClass)) + + +GtkGisGeometryLine + + +GtkGisGeometryLineClass + + +GtkGisGeometryLine +struct _GtkGisGeometryLine + { + GtkGisGeometry parent; + }; + + +GtkGisGeometryLineClass +struct _GtkGisGeometryLineClass + { + GtkGisGeometryClass parent_class; + }; + + +gtk_gis_geometry_line_get_type +GType +void + + +gtk_gis_geometry_line_new +GtkGisGeometry * +void + + +gtk_gis_geometry_line_new_from_list +GtkGisGeometry * +GSList *points + + +gtk_gis_geometry_line_add_point +void +GtkGisGeometryLine *line, GtkGisPoint point + + +gtk_gis_geometry_line_add_point_from_coordinates +void +GtkGisGeometryLine *line,gdouble x, gdouble y + + +TYPE_GTK_GIS_GEOMETRY +#define TYPE_GTK_GIS_GEOMETRY (gtk_gis_geometry_get_type ()) + + +GTK_GIS_GEOMETRY +#define GTK_GIS_GEOMETRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_GEOMETRY, GtkGisGeometry)) + + +GTK_GIS_GEOMETRY_CLASS +#define GTK_GIS_GEOMETRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_GEOMETRY, GtkGisGeometryClass)) + + +IS_GTK_GIS_GEOMETRY +#define IS_GTK_GIS_GEOMETRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_GEOMETRY)) + + +IS_GTK_GIS_GEOMETRY_CLASS +#define IS_GTK_GIS_GEOMETRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_GEOMETRY)) + + +GTK_GIS_GEOMETRY_GET_CLASS +#define GTK_GIS_GEOMETRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_GEOMETRY, GtkGisGeometryClass)) + + +GtkGisGeometry + + +GtkGisGeometryClass + + +GtkGisGeometry +struct _GtkGisGeometry + { + GObject parent; + }; + + +GtkGisGeometryClass +struct _GtkGisGeometryClass + { + GObjectClass parent_class; + + GooCanvasItem *(*draw) (GtkGisGeometry *geometry, GtkGisScale *scale); + }; + + +gtk_gis_geometry_get_type +GType +void + + +gtk_gis_geometry_get_editable +gboolean +GtkGisGeometry *geometry + + +gtk_gis_geometry_set_editable +void +GtkGisGeometry *geometry, gboolean editable + + +gtk_gis_geometry_draw +GooCanvasItem * +GtkGisGeometry *geometry, GtkGisScale *scale + + +TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS +#define TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS (gtk_gis_layer_source_postgis_get_type ()) + + +GTK_GIS_LAYER_SOURCE_POSTGIS +#define GTK_GIS_LAYER_SOURCE_POSTGIS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS, GtkGisLayerSourcePostgis)) + + +GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +#define GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS, GtkGisLayerSourcePostgisClass)) + + +IS_GTK_GIS_LAYER_SOURCE_POSTGIS +#define IS_GTK_GIS_LAYER_SOURCE_POSTGIS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS)) + + +IS_GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +#define IS_GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS)) + + +GTK_GIS_LAYER_SOURCE_POSTGIS_GET_CLASS +#define GTK_GIS_LAYER_SOURCE_POSTGIS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS, GtkGisLayerSourcePostgisClass)) + + +GtkGisLayerSourcePostgis + + +GtkGisLayerSourcePostgisClass + + +GtkGisLayerSourcePostgis +struct _GtkGisLayerSourcePostgis + { + GtkGisLayerSource parent; + }; + + +GtkGisLayerSourcePostgisClass +struct _GtkGisLayerSourcePostgisClass + { + GtkGisLayerSourceClass parent_class; + }; + + +gtk_gis_layer_source_postgis_get_type +GType +void + + +gtk_gis_layer_source_postgis_new +GtkGisLayerSource * +gchar *host,gint port,gchar *username,gchar *password + + +gtk_gis_layer_source_postgis_new_from_xml +GtkGisLayerSource * +xmlNode *xnode + + +TYPE_GTK_GIS_LAYER_SOURCE_RASTER +#define TYPE_GTK_GIS_LAYER_SOURCE_RASTER (gtk_gis_layer_source_raster_get_type ()) + + +GTK_GIS_LAYER_SOURCE_RASTER +#define GTK_GIS_LAYER_SOURCE_RASTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRaster)) + + +GTK_GIS_LAYER_SOURCE_RASTER_CLASS +#define GTK_GIS_LAYER_SOURCE_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRasterClass)) + + +IS_GTK_GIS_LAYER_SOURCE_RASTER +#define IS_GTK_GIS_LAYER_SOURCE_RASTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER)) + + +IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS +#define IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER_SOURCE_RASTER)) + + +GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS +#define GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRasterClass)) + + +GtkGisLayerSourceRaster + + +GtkGisLayerSourceRasterClass + + +GtkGisLayerSourceRaster +struct _GtkGisLayerSourceRaster + { + GtkGisLayerSource parent; + }; + + +GtkGisLayerSourceRasterClass +struct _GtkGisLayerSourceRasterClass + { + GtkGisLayerSourceClass parent_class; + }; + + +gtk_gis_layer_source_raster_get_type +GType +void + + +gtk_gis_layer_source_raster_new +GtkGisLayerSource * +const gchar *filename + + +gtk_gis_layer_source_raster_new_from_xml +GtkGisLayerSource * +xmlNode *xnode + + +gtk_gis_layer_source_raster_get_filename +gchar * +GtkGisLayerSourceRaster *source + + +TYPE_GTK_GIS_LAYER_SOURCE +#define TYPE_GTK_GIS_LAYER_SOURCE (gtk_gis_layer_source_get_type ()) + + +GTK_GIS_LAYER_SOURCE +#define GTK_GIS_LAYER_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER_SOURCE, GtkGisLayerSource)) + + +GTK_GIS_LAYER_SOURCE_CLASS +#define GTK_GIS_LAYER_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER_SOURCE, GtkGisLayerSourceClass)) + + +IS_GTK_GIS_LAYER_SOURCE +#define IS_GTK_GIS_LAYER_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER_SOURCE)) + + +IS_GTK_GIS_LAYER_SOURCE_CLASS +#define IS_GTK_GIS_LAYER_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER_SOURCE)) + + +GTK_GIS_LAYER_SOURCE_GET_CLASS +#define GTK_GIS_LAYER_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE, GtkGisLayerSourceClass)) + + +GtkGisLayerSource + + +GtkGisLayerSourceClass + + +GtkGisLayerSource +struct _GtkGisLayerSource + { + GObject parent; + }; + + +GtkGisLayerSourceClass +struct _GtkGisLayerSourceClass + { + GObjectClass parent_class; + + xmlNode *(*get_xml) (GtkGisLayerSource *source); + + void (*set_ogr_datasource) (GtkGisLayerSource *source, + OGRDataSourceH datasource); + void (*set_gdal_dataset) (GtkGisLayerSource *source, + GDALDatasetH hDataset); + }; + + +gtk_gis_layer_source_get_type +GType +void + + +gtk_gis_layer_source_get_xml +xmlNode * +GtkGisLayerSource *source + + +gtk_gis_layer_source_get_geometries +GList * +GtkGisLayerSource *source,const gchar *name + + +gtk_gis_layer_source_get_layer_geometry_type +GtkGisLayerGeometryType +GtkGisLayerSource *source,const gchar *name + + +gtk_gis_layer_source_get_layer_extent +GtkGisLayerExtent * +GtkGisLayerSource *source,const gchar *name + + +gtk_gis_layer_source_set_max_extent +void +GtkGisLayerSource *source,GtkGisLayerExtent *extent + + +GtkGisLayerGeometryType +typedef enum + { + LAYER_GEOMETRY_TYPE_POINT, + LAYER_GEOMETRY_TYPE_LINE, + LAYER_GEOMETRY_TYPE_POLYGON, + LAYER_GEOMETRY_TYPE_RASTER + } GtkGisLayerGeometryType; + + +TYPE_GTK_GIS_GEOMETRY_RASTER +#define TYPE_GTK_GIS_GEOMETRY_RASTER (gtk_gis_geometry_raster_get_type ()) + + +GTK_GIS_GEOMETRY_RASTER +#define GTK_GIS_GEOMETRY_RASTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_GEOMETRY_RASTER, GtkGisGeometryRaster)) + + +GTK_GIS_GEOMETRY_RASTER_CLASS +#define GTK_GIS_GEOMETRY_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_GEOMETRY_RASTER, GtkGisGeometryRasterClass)) + + +IS_GTK_GIS_GEOMETRY_RASTER +#define IS_GTK_GIS_GEOMETRY_RASTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_GEOMETRY_RASTER)) + + +IS_GTK_GIS_GEOMETRY_RASTER_CLASS +#define IS_GTK_GIS_GEOMETRY_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_GEOMETRY_RASTER)) + + +GTK_GIS_GEOMETRY_RASTER_GET_CLASS +#define GTK_GIS_GEOMETRY_RASTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_GEOMETRY_RASTER, GtkGisGeometryRasterClass)) + + +GtkGisGeometryRaster + + +GtkGisGeometryRasterClass + + +GtkGisGeometryRaster +struct _GtkGisGeometryRaster + { + GtkGisGeometry parent; + }; + + +GtkGisGeometryRasterClass +struct _GtkGisGeometryRasterClass + { + GtkGisGeometryClass parent_class; + }; + + +gtk_gis_geometry_raster_get_type +GType +void + + +gtk_gis_geometry_raster_new_from_pixbuf +GtkGisGeometry * +GdkPixbuf *pixbuf, gdouble x, gdouble y + diff --git a/docs/reference/libgtkgis-overrides.txt b/docs/reference/libgtkgis-overrides.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libgtkgis-sections.txt b/docs/reference/libgtkgis-sections.txt new file mode 100644 index 0000000..35fd1d9 --- /dev/null +++ b/docs/reference/libgtkgis-sections.txt @@ -0,0 +1,230 @@ +
+geometrypoint +TYPE_GTK_GIS_GEOMETRY_POINT +GTK_GIS_GEOMETRY_POINT +GTK_GIS_GEOMETRY_POINT_CLASS +IS_GTK_GIS_GEOMETRY_POINT +IS_GTK_GIS_GEOMETRY_POINT_CLASS +GTK_GIS_GEOMETRY_POINT_GET_CLASS +GtkGisGeometryPoint +GtkGisGeometryPoint +gtk_gis_geometry_point_get_type +gtk_gis_geometry_point_new +gtk_gis_geometry_get_point +gtk_gis_geometry_point_get_x +gtk_gis_geometry_point_get_y +
+ +
+layersourceshp +TYPE_GTK_GIS_LAYER_SOURCE_SHP +GTK_GIS_LAYER_SOURCE_SHP +GTK_GIS_LAYER_SOURCE_SHP_CLASS +IS_GTK_GIS_LAYER_SOURCE_SHP +IS_GTK_GIS_LAYER_SOURCE_SHP_CLASS +GTK_GIS_LAYER_SOURCE_SHP_GET_CLASS +GtkGisLayerSourceShp +GtkGisLayerSourceShp +gtk_gis_layer_source_shp_get_type +gtk_gis_layer_source_shp_new +gtk_gis_layer_source_shp_new_from_xml +gtk_gis_layer_source_shp_get_filename +
+ +
+geometrypolygon +TYPE_GTK_GIS_GEOMETRY_POLYGON +GTK_GIS_GEOMETRY_POLYGON +GTK_GIS_GEOMETRY_POLYGON_CLASS +IS_GTK_GIS_GEOMETRY_POLYGON +IS_GTK_GIS_GEOMETRY_POLYGON_CLASS +GTK_GIS_GEOMETRY_POLYGON_GET_CLASS +GtkGisGeometryPolygon +GtkGisGeometryPolygon +gtk_gis_geometry_polygon_get_type +gtk_gis_geometry_polygon_new +gtk_gis_geometry_polygon_new_from_line +gtk_gis_geometry_polygon_new_from_list +gtk_gis_geometry_polygon_add_line +gtk_gis_geometry_polygon_add_line_from_list +gtk_gis_geometry_polygon_remove_line +
+ +
+gtkgis +TYPE_GTK_GIS +GTK_GIS +GTK_GIS_CLASS +IS_GTK_GIS +IS_GTK_GIS_CLASS +GTK_GIS_GET_CLASS +GtkGis +GtkGis +gtk_gis_get_type +gtk_gis_new +gtk_gis_new_from_xml +gtk_gis_new_from_file +gtk_gis_get_xml +gtk_gis_save_to_xml +gtk_gis_add_group +gtk_gis_remove_group +gtk_gis_add_layer +gtk_gis_remove_layer +gtk_gis_get_layer_by_name +gtk_gis_draw +gtk_gis_get_scale +gtk_gis_set_scale +gtk_gis_zoom_to_max +gtk_gis_zoom_to_layer +gtk_gis_get_legend +
+ +
+layersgroup +TYPE_GTK_GIS_LAYERS_GROUP +GTK_GIS_LAYERS_GROUP +GTK_GIS_LAYERS_GROUP_CLASS +IS_GTK_GIS_LAYERS_GROUP +IS_GTK_GIS_LAYERS_GROUP_CLASS +GTK_GIS_LAYERS_GROUP_GET_CLASS +GtkGisLayersGroup +GtkGisLayersGroup +gtk_gis_layers_group_get_type +gtk_gis_layers_group_new +gtk_gis_layers_group_add_layer +gtk_gis_layers_group_remove_layer +gtk_gis_layers_group_get_name +gtk_gis_layers_group_set_name +
+ +
+layer +TYPE_GTK_GIS_LAYER +GTK_GIS_LAYER +GTK_GIS_LAYER_CLASS +IS_GTK_GIS_LAYER +IS_GTK_GIS_LAYER_CLASS +GTK_GIS_LAYER_GET_CLASS +GtkGisLayer +GtkGisLayer +gtk_gis_layer_get_type +gtk_gis_layer_new +gtk_gis_layer_new_from_source +gtk_gis_layer_get_xml +gtk_gis_layer_get_name +gtk_gis_layer_get_source +gtk_gis_layer_fill_from_source +gtk_gis_layer_save +gtk_gis_layer_add_geometry +gtk_gis_layer_remove_geometry +gtk_gis_layer_get_extent +gtk_gis_layer_get_editable +gtk_gis_layer_set_editable +gtk_gis_layer_draw +
+ +
+libgtkgis +
+ +
+geometryline +TYPE_GTK_GIS_GEOMETRY_LINE +GTK_GIS_GEOMETRY_LINE +GTK_GIS_GEOMETRY_LINE_CLASS +IS_GTK_GIS_GEOMETRY_LINE +IS_GTK_GIS_GEOMETRY_LINE_CLASS +GTK_GIS_GEOMETRY_LINE_GET_CLASS +GtkGisGeometryLine +GtkGisGeometryLine +gtk_gis_geometry_line_get_type +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 +
+ +
+geometry +TYPE_GTK_GIS_GEOMETRY +GTK_GIS_GEOMETRY +GTK_GIS_GEOMETRY_CLASS +IS_GTK_GIS_GEOMETRY +IS_GTK_GIS_GEOMETRY_CLASS +GTK_GIS_GEOMETRY_GET_CLASS +GtkGisGeometry +GtkGisGeometry +gtk_gis_geometry_get_type +gtk_gis_geometry_get_editable +gtk_gis_geometry_set_editable +gtk_gis_geometry_draw +
+ +
+layersourcepostgis +TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS +GTK_GIS_LAYER_SOURCE_POSTGIS +GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +GTK_GIS_LAYER_SOURCE_POSTGIS_GET_CLASS +GtkGisLayerSourcePostgis +GtkGisLayerSourcePostgis +gtk_gis_layer_source_postgis_get_type +gtk_gis_layer_source_postgis_new +gtk_gis_layer_source_postgis_new_from_xml +
+ +
+layersourceraster +TYPE_GTK_GIS_LAYER_SOURCE_RASTER +GTK_GIS_LAYER_SOURCE_RASTER +GTK_GIS_LAYER_SOURCE_RASTER_CLASS +IS_GTK_GIS_LAYER_SOURCE_RASTER +IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS +GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS +GtkGisLayerSourceRaster +GtkGisLayerSourceRaster +gtk_gis_layer_source_raster_get_type +gtk_gis_layer_source_raster_new +gtk_gis_layer_source_raster_new_from_xml +gtk_gis_layer_source_raster_get_filename +
+ +
+layersource +TYPE_GTK_GIS_LAYER_SOURCE +GTK_GIS_LAYER_SOURCE +GTK_GIS_LAYER_SOURCE_CLASS +IS_GTK_GIS_LAYER_SOURCE +IS_GTK_GIS_LAYER_SOURCE_CLASS +GTK_GIS_LAYER_SOURCE_GET_CLASS +GtkGisLayerSource +GtkGisLayerSource +gtk_gis_layer_source_get_type +gtk_gis_layer_source_get_xml +gtk_gis_layer_source_get_geometries +gtk_gis_layer_source_get_layer_geometry_type +gtk_gis_layer_source_get_layer_extent +gtk_gis_layer_source_set_max_extent +
+ +
+commons +GtkGisLayerGeometryType +
+ +
+geometryraster +TYPE_GTK_GIS_GEOMETRY_RASTER +GTK_GIS_GEOMETRY_RASTER +GTK_GIS_GEOMETRY_RASTER_CLASS +IS_GTK_GIS_GEOMETRY_RASTER +IS_GTK_GIS_GEOMETRY_RASTER_CLASS +GTK_GIS_GEOMETRY_RASTER_GET_CLASS +GtkGisGeometryRaster +GtkGisGeometryRaster +gtk_gis_geometry_raster_get_type +gtk_gis_geometry_raster_new_from_pixbuf +
+ diff --git a/docs/reference/libgtkgis-undeclared.txt b/docs/reference/libgtkgis-undeclared.txt new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libgtkgis-undocumented.txt b/docs/reference/libgtkgis-undocumented.txt new file mode 100644 index 0000000..c6a1297 --- /dev/null +++ b/docs/reference/libgtkgis-undocumented.txt @@ -0,0 +1,184 @@ +11% symbol docs coverage. +21 symbols documented. +7 symbols incomplete. +169 not documented. + + +GTK_GIS +GTK_GIS_CLASS +GTK_GIS_GEOMETRY +GTK_GIS_GEOMETRY_CLASS +GTK_GIS_GEOMETRY_GET_CLASS +GTK_GIS_GEOMETRY_LINE +GTK_GIS_GEOMETRY_LINE_CLASS +GTK_GIS_GEOMETRY_LINE_GET_CLASS +GTK_GIS_GEOMETRY_POINT +GTK_GIS_GEOMETRY_POINT_CLASS +GTK_GIS_GEOMETRY_POINT_GET_CLASS +GTK_GIS_GEOMETRY_POLYGON +GTK_GIS_GEOMETRY_POLYGON_CLASS +GTK_GIS_GEOMETRY_POLYGON_GET_CLASS +GTK_GIS_GEOMETRY_RASTER +GTK_GIS_GEOMETRY_RASTER_CLASS +GTK_GIS_GEOMETRY_RASTER_GET_CLASS +GTK_GIS_GET_CLASS +GTK_GIS_LAYER +GTK_GIS_LAYERS_GROUP +GTK_GIS_LAYERS_GROUP_CLASS +GTK_GIS_LAYERS_GROUP_GET_CLASS +GTK_GIS_LAYER_CLASS +GTK_GIS_LAYER_GET_CLASS +GTK_GIS_LAYER_SOURCE +GTK_GIS_LAYER_SOURCE_CLASS +GTK_GIS_LAYER_SOURCE_GET_CLASS +GTK_GIS_LAYER_SOURCE_POSTGIS +GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +GTK_GIS_LAYER_SOURCE_POSTGIS_GET_CLASS +GTK_GIS_LAYER_SOURCE_RASTER +GTK_GIS_LAYER_SOURCE_RASTER_CLASS +GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS +GTK_GIS_LAYER_SOURCE_SHP +GTK_GIS_LAYER_SOURCE_SHP_CLASS +GTK_GIS_LAYER_SOURCE_SHP_GET_CLASS +GtkGis +GtkGisGeometry +GtkGisGeometryLine +GtkGisGeometryPoint +GtkGisGeometryPolygon +GtkGisGeometryRaster +GtkGisLayer +GtkGisLayerGeometryType +GtkGisLayerSource +GtkGisLayerSourcePostgis +GtkGisLayerSourceRaster +GtkGisLayerSourceShp +GtkGisLayersGroup +IS_GTK_GIS +IS_GTK_GIS_CLASS +IS_GTK_GIS_GEOMETRY +IS_GTK_GIS_GEOMETRY_CLASS +IS_GTK_GIS_GEOMETRY_LINE +IS_GTK_GIS_GEOMETRY_LINE_CLASS +IS_GTK_GIS_GEOMETRY_POINT +IS_GTK_GIS_GEOMETRY_POINT_CLASS +IS_GTK_GIS_GEOMETRY_POLYGON +IS_GTK_GIS_GEOMETRY_POLYGON_CLASS +IS_GTK_GIS_GEOMETRY_RASTER +IS_GTK_GIS_GEOMETRY_RASTER_CLASS +IS_GTK_GIS_LAYER +IS_GTK_GIS_LAYERS_GROUP +IS_GTK_GIS_LAYERS_GROUP_CLASS +IS_GTK_GIS_LAYER_CLASS +IS_GTK_GIS_LAYER_SOURCE +IS_GTK_GIS_LAYER_SOURCE_CLASS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS +IS_GTK_GIS_LAYER_SOURCE_POSTGIS_CLASS +IS_GTK_GIS_LAYER_SOURCE_RASTER +IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS +IS_GTK_GIS_LAYER_SOURCE_SHP +IS_GTK_GIS_LAYER_SOURCE_SHP_CLASS +TYPE_GTK_GIS +TYPE_GTK_GIS_GEOMETRY +TYPE_GTK_GIS_GEOMETRY_LINE +TYPE_GTK_GIS_GEOMETRY_POINT +TYPE_GTK_GIS_GEOMETRY_POLYGON +TYPE_GTK_GIS_GEOMETRY_RASTER +TYPE_GTK_GIS_LAYER +TYPE_GTK_GIS_LAYERS_GROUP +TYPE_GTK_GIS_LAYER_SOURCE +TYPE_GTK_GIS_LAYER_SOURCE_POSTGIS +TYPE_GTK_GIS_LAYER_SOURCE_RASTER +TYPE_GTK_GIS_LAYER_SOURCE_SHP +gtk_gis_add_group +gtk_gis_add_layer +gtk_gis_draw +gtk_gis_geometry_draw +gtk_gis_geometry_get_editable +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_type +gtk_gis_geometry_point_get_type +gtk_gis_geometry_point_get_x +gtk_gis_geometry_point_get_y +gtk_gis_geometry_polygon_add_line +gtk_gis_geometry_polygon_add_line_from_list +gtk_gis_geometry_polygon_get_type +gtk_gis_geometry_polygon_remove_line +gtk_gis_geometry_raster_get_type +gtk_gis_geometry_raster_new_from_pixbuf (x, y, x, y) +gtk_gis_geometry_set_editable +gtk_gis_get_layer_by_name +gtk_gis_get_legend +gtk_gis_get_scale +gtk_gis_get_type +gtk_gis_get_xml +gtk_gis_layer_add_geometry +gtk_gis_layer_draw +gtk_gis_layer_get_editable +gtk_gis_layer_get_extent +gtk_gis_layer_get_name +gtk_gis_layer_get_source +gtk_gis_layer_get_type +gtk_gis_layer_get_xml +gtk_gis_layer_new (geometrytype, geometry_type) +gtk_gis_layer_remove_geometry +gtk_gis_layer_set_editable +gtk_gis_layer_source_get_geometries (name, name) +gtk_gis_layer_source_get_layer_extent +gtk_gis_layer_source_get_layer_geometry_type +gtk_gis_layer_source_get_type +gtk_gis_layer_source_get_xml +gtk_gis_layer_source_postgis_get_type +gtk_gis_layer_source_postgis_new_from_xml (xnode, xnode) +gtk_gis_layer_source_raster_get_filename +gtk_gis_layer_source_raster_get_type +gtk_gis_layer_source_raster_new_from_xml (xnode, xnode) +gtk_gis_layer_source_set_max_extent +gtk_gis_layer_source_shp_get_filename +gtk_gis_layer_source_shp_get_type +gtk_gis_layer_source_shp_new_from_xml (xnode, xnode) +gtk_gis_layers_group_add_layer +gtk_gis_layers_group_get_name +gtk_gis_layers_group_get_type +gtk_gis_layers_group_new (source, name, geometrytype, name) +gtk_gis_layers_group_remove_layer +gtk_gis_layers_group_set_name +gtk_gis_new_from_file +gtk_gis_new_from_xml +gtk_gis_remove_group +gtk_gis_remove_layer +gtk_gis_save_to_xml +gtk_gis_set_scale +gtk_gis_zoom_to_layer +gtk_gis_zoom_to_max + + +commons:Long_Description +commons:Short_Description +geometry:Long_Description +geometry:Short_Description +geometryline:Long_Description +geometryline:Short_Description +geometrypoint:Long_Description +geometrypoint:Short_Description +geometrypolygon:Long_Description +geometrypolygon:Short_Description +geometryraster:Short_Description +gtkgis:Long_Description +gtkgis:Short_Description +layer:Long_Description +layer:Short_Description +layersgroup:Long_Description +layersgroup:Short_Description +layersource:Long_Description +layersource:Short_Description +layersourcepostgis:Long_Description +layersourcepostgis:Short_Description +layersourceraster:Long_Description +layersourceraster:Short_Description +layersourceshp:Long_Description +layersourceshp:Short_Description +libgtkgis:Long_Description +libgtkgis:Short_Description diff --git a/docs/reference/libgtkgis-unused.txt b/docs/reference/libgtkgis-unused.txt new file mode 100644 index 0000000..84968bc --- /dev/null +++ b/docs/reference/libgtkgis-unused.txt @@ -0,0 +1,12 @@ +GtkGisClass +GtkGisGeometryClass +GtkGisGeometryLineClass +GtkGisGeometryPointClass +GtkGisGeometryPolygonClass +GtkGisGeometryRasterClass +GtkGisLayerClass +GtkGisLayerSourceClass +GtkGisLayerSourcePostgisClass +GtkGisLayerSourceRasterClass +GtkGisLayerSourceShpClass +GtkGisLayersGroupClass diff --git a/docs/reference/libgtkgis.args b/docs/reference/libgtkgis.args new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libgtkgis.hierarchy b/docs/reference/libgtkgis.hierarchy new file mode 100644 index 0000000..0e8ff3b --- /dev/null +++ b/docs/reference/libgtkgis.hierarchy @@ -0,0 +1,28 @@ +GObject + GtkGisGeometry + GtkGisGeometryPoint + GtkGisGeometryPolygon + GtkGisGeometryLine + GtkGisGeometryRaster + GtkGisLayerSource + GtkGisLayerSourceShp + GtkGisLayerSourcePostgis + GtkGisLayerSourceRaster + GInitiallyUnowned + GtkObject + GtkWidget + GtkContainer + GtkBin + GtkGis + GtkGisLayersGroup + GtkGisLayer + GtkStyle + GdkDrawable + GdkWindow + GdkDragContext + GtkTooltip + GdkScreen +GInterface + GTypePlugin + AtkImplementorIface + GtkBuildable diff --git a/docs/reference/libgtkgis.interfaces b/docs/reference/libgtkgis.interfaces new file mode 100644 index 0000000..149f94b --- /dev/null +++ b/docs/reference/libgtkgis.interfaces @@ -0,0 +1,4 @@ +GtkWidget AtkImplementorIface GtkBuildable +GtkContainer AtkImplementorIface GtkBuildable +GtkBin AtkImplementorIface GtkBuildable +GtkGis AtkImplementorIface GtkBuildable diff --git a/docs/reference/libgtkgis.prerequisites b/docs/reference/libgtkgis.prerequisites new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libgtkgis.signals b/docs/reference/libgtkgis.signals new file mode 100644 index 0000000..e69de29 diff --git a/docs/reference/libgtkgis.types b/docs/reference/libgtkgis.types new file mode 100644 index 0000000..59b5ef8 --- /dev/null +++ b/docs/reference/libgtkgis.types @@ -0,0 +1,12 @@ +gtk_gis_geometry_point_get_type +gtk_gis_layer_source_shp_get_type +gtk_gis_geometry_polygon_get_type +gtk_gis_get_type +gtk_gis_layers_group_get_type +gtk_gis_layer_get_type +gtk_gis_geometry_line_get_type +gtk_gis_geometry_get_type +gtk_gis_layer_source_postgis_get_type +gtk_gis_layer_source_raster_get_type +gtk_gis_layer_source_get_type +gtk_gis_geometry_raster_get_type diff --git a/docs/reference/tmpl/commons.sgml b/docs/reference/tmpl/commons.sgml index 613aa2b..a0a520d 100644 --- a/docs/reference/tmpl/commons.sgml +++ b/docs/reference/tmpl/commons.sgml @@ -9,13 +9,11 @@ commons - - diff --git a/docs/reference/tmpl/geometry.sgml b/docs/reference/tmpl/geometry.sgml index e7097f6..e859271 100644 --- a/docs/reference/tmpl/geometry.sgml +++ b/docs/reference/tmpl/geometry.sgml @@ -9,13 +9,11 @@ GtkGisGeometry - - diff --git a/docs/reference/tmpl/geometryline.sgml b/docs/reference/tmpl/geometryline.sgml index 7fbc79d..4d0e081 100644 --- a/docs/reference/tmpl/geometryline.sgml +++ b/docs/reference/tmpl/geometryline.sgml @@ -9,13 +9,11 @@ GtkGisGeometryLine - - diff --git a/docs/reference/tmpl/geometrypoint.sgml b/docs/reference/tmpl/geometrypoint.sgml index d480c60..a91a876 100644 --- a/docs/reference/tmpl/geometrypoint.sgml +++ b/docs/reference/tmpl/geometrypoint.sgml @@ -9,13 +9,11 @@ GtkGisGeometryPoint - - diff --git a/docs/reference/tmpl/geometrypolygon.sgml b/docs/reference/tmpl/geometrypolygon.sgml index b436478..11fceeb 100644 --- a/docs/reference/tmpl/geometrypolygon.sgml +++ b/docs/reference/tmpl/geometrypolygon.sgml @@ -9,13 +9,11 @@ GtkGisGeometryPolygon - - diff --git a/docs/reference/tmpl/geometryraster.sgml b/docs/reference/tmpl/geometryraster.sgml index 3fe0dc2..cc09811 100644 --- a/docs/reference/tmpl/geometryraster.sgml +++ b/docs/reference/tmpl/geometryraster.sgml @@ -9,13 +9,11 @@ GtkGisGeometryRaster - - diff --git a/docs/reference/tmpl/gtkgis.sgml b/docs/reference/tmpl/gtkgis.sgml index 7651d68..b164680 100644 --- a/docs/reference/tmpl/gtkgis.sgml +++ b/docs/reference/tmpl/gtkgis.sgml @@ -9,13 +9,11 @@ GtkGis - - @@ -122,7 +120,6 @@ GtkGis @gtkgis: @file_name: -@Returns: diff --git a/docs/reference/tmpl/layer.sgml b/docs/reference/tmpl/layer.sgml index c1be248..41029a7 100644 --- a/docs/reference/tmpl/layer.sgml +++ b/docs/reference/tmpl/layer.sgml @@ -9,13 +9,11 @@ GtkGisLayer - - diff --git a/docs/reference/tmpl/layersgroup.sgml b/docs/reference/tmpl/layersgroup.sgml index a50d646..6adaf14 100644 --- a/docs/reference/tmpl/layersgroup.sgml +++ b/docs/reference/tmpl/layersgroup.sgml @@ -9,13 +9,11 @@ GtkGisLayersGroup - - diff --git a/docs/reference/tmpl/layersource.sgml b/docs/reference/tmpl/layersource.sgml index d63f8cc..cf3b90a 100644 --- a/docs/reference/tmpl/layersource.sgml +++ b/docs/reference/tmpl/layersource.sgml @@ -9,13 +9,11 @@ GtkGisLayerSource - - diff --git a/docs/reference/tmpl/layersourcepostgis.sgml b/docs/reference/tmpl/layersourcepostgis.sgml index 2cf23a5..a609a04 100644 --- a/docs/reference/tmpl/layersourcepostgis.sgml +++ b/docs/reference/tmpl/layersourcepostgis.sgml @@ -9,13 +9,11 @@ GtkGisLayerSourcePostgis - - diff --git a/docs/reference/tmpl/layersourceraster.sgml b/docs/reference/tmpl/layersourceraster.sgml index 15d8b63..58c208e 100644 --- a/docs/reference/tmpl/layersourceraster.sgml +++ b/docs/reference/tmpl/layersourceraster.sgml @@ -9,13 +9,11 @@ GtkGisLayerSourceRaster - - diff --git a/docs/reference/tmpl/layersourceshp.sgml b/docs/reference/tmpl/layersourceshp.sgml index a56c32e..862db8e 100644 --- a/docs/reference/tmpl/layersourceshp.sgml +++ b/docs/reference/tmpl/layersourceshp.sgml @@ -9,13 +9,11 @@ GtkGisLayerSourceShp - - diff --git a/docs/reference/tmpl/libgtkgis.sgml b/docs/reference/tmpl/libgtkgis.sgml index d24f66a..4370e66 100644 --- a/docs/reference/tmpl/libgtkgis.sgml +++ b/docs/reference/tmpl/libgtkgis.sgml @@ -9,13 +9,11 @@ libgtkgis - - diff --git a/libgtkgis.pc.in b/libgtkgis.pc.in index 0c4b67f..76457fb 100644 --- a/libgtkgis.pc.in +++ b/libgtkgis.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: A Gtk+ widget to embed base GIS functionalities into applications. Version: @PACKAGE_VERSION@ -Requires: gtk+-2.0 goocanvas +Requires: gtk+-2.0 goocanvas libxml-2.0 Libs: -L${libdir} @GDAL_LIBS@ -lgtkgis Cflags: @GDAL_CFLAGS@ -I${includedir}/gtkgis diff --git a/src/geometry.c b/src/geometry.c index 4599eb5..b478024 100644 --- a/src/geometry.c +++ b/src/geometry.c @@ -72,7 +72,7 @@ gtk_gis_geometry_init (GtkGisGeometry *gtk_gis_geometry) /** * gtk_gis_geometry_get_editable: - * @geometry: + * @geometry: a #GtkGisGeometry object. * */ gboolean @@ -85,7 +85,7 @@ gtk_gis_geometry_get_editable (GtkGisGeometry *geometry) /** * gtk_gis_geometry_set_editable: - * @geometry: + * @geometry: a #GtkGisGeometry object. * @editable: * */ @@ -99,7 +99,7 @@ gtk_gis_geometry_set_editable (GtkGisGeometry *geometry, gboolean editable) /** * gtk_gis_geometry_draw: - * @geometry: + * @geometry: a #GtkGisGeometry object. * */ GooCanvasItem diff --git a/src/geometryline.c b/src/geometryline.c index ba25a7c..4341a58 100644 --- a/src/geometryline.c +++ b/src/geometryline.c @@ -95,7 +95,7 @@ GtkGisGeometry /** * gtk_gis_geometry_line_new_from_list: - * @points: + * @points: a #GSList of #GtkGisPoint to add to the line. * * Creates a new #GtkGisGeometryLine object. * @@ -118,8 +118,8 @@ GtkGisGeometry /** * gtk_gis_geometry_line_add_point: - * @line: - * @point: + * @line: a #GtkGisGeometryLine object. + * @point: a #GtkGisPoint to add to the line. */ void gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point) @@ -138,7 +138,7 @@ gtk_gis_geometry_line_add_point (GtkGisGeometryLine *line, GtkGisPoint point) /** * gtk_gis_geometry_line_add_point_from_coordinates: - * @line: + * @line: a #GtkGisGeometryLine object. * @x: * @y: * diff --git a/src/geometrypoint.c b/src/geometrypoint.c index fc4f22f..a0c0572 100644 --- a/src/geometrypoint.c +++ b/src/geometrypoint.c @@ -76,7 +76,7 @@ gtk_gis_geometry_point_init (GtkGisGeometryPoint *gtk_gis_geometry_point) /** * gtk_gis_geometry_point_new: - * @point: + * @point: a #GtkGisPoint struct. * * Creates a new #GtkGisGeometryPoint object. * @@ -102,7 +102,7 @@ GtkGisGeometry /** * gtk_gis_geometry_get_point: - * @point: + * @point: a #GtkGisGeometryPoint object. * * Returns: */ @@ -123,7 +123,7 @@ GtkGisPoint /** * gtk_gis_geometry_point_get_x: - * @point: + * @point: a #GtkGisGeometryPoint object. * */ gdouble @@ -136,7 +136,7 @@ gtk_gis_geometry_point_get_x (GtkGisGeometryPoint *point) /** * gtk_gis_geometry_point_get_y: - * @point: + * @point: a #GtkGisGeometryPoint object. * */ gdouble diff --git a/src/geometrypolygon.c b/src/geometrypolygon.c index 1c24709..96e52cf 100644 --- a/src/geometrypolygon.c +++ b/src/geometrypolygon.c @@ -111,7 +111,7 @@ GtkGisGeometry /** * gtk_gis_geometry_polygon_new_from_list: - * @points: + * @points: a #GSList og #GtkGisPoint to add to the polygon. * * Creates a new #GtkGisGeometryPolygon object. * @@ -136,8 +136,8 @@ GtkGisGeometry /** * gtk_gis_geometry_polygon_add_line: - * @polygon: - * @line: + * @polygon: a #GtkGisGeometryPolygon object. + * @line: a #GtkGisGeometryLine object to add to the polygon. * */ void @@ -151,7 +151,7 @@ gtk_gis_geometry_polygon_add_line (GtkGisGeometryPolygon *polygon, /** * gtk_gis_geometry_polygon_add_line_from_list: - * @polygon: + * @polygon: a #GtkGisGeometryPolygon object. * @points: * */ @@ -171,8 +171,8 @@ gtk_gis_geometry_polygon_add_line_from_list (GtkGisGeometryPolygon *polygon, /** * gtk_gis_geometry_polygon_remove_line: - * @polygon: - * @line: + * @polygon: a #GtkGisGeometryPolygon object. + * @line: a #GtkGisGeometryLine object to remove from the polygon. * */ void diff --git a/src/geometryraster.c b/src/geometryraster.c index 0be8dd7..61dab7f 100644 --- a/src/geometryraster.c +++ b/src/geometryraster.c @@ -80,7 +80,7 @@ gtk_gis_geometry_raster_init (GtkGisGeometryRaster *gtk_gis_geometry_raster) /** * gtk_gis_geometry_raster_new_from_pixbuf: - * @pixbuf: + * @pixbuf: a #GdkPixbuf object from which to create the new #GtkGisGeometryRaster object. * @x: * @y: * diff --git a/src/gtkgis.c b/src/gtkgis.c index ac2db1d..186ceac 100644 --- a/src/gtkgis.c +++ b/src/gtkgis.c @@ -179,7 +179,7 @@ GtkWidget /** * gtk_gis_new_from_xml: - * @xdoc: + * @xdoc: an #xmlDoc that contains the GtkGis definition. * * Returns: the newly created #GtkGis object. */ @@ -292,7 +292,7 @@ GtkWidget /** * gtk_gis_new_from_file: - * @file_name: + * @file_name: the xml file's name that contains the GtkGis definition. * * Returns: the newly created #GtkGis object. */ @@ -323,8 +323,9 @@ GtkWidget /** * gtk_gis_get_xml: - * @gtkgis: + * @gtkgis: a #GtkGis object. * + * Returns: the #xmlDoc with the definition of the #GtkGis object. */ xmlDoc *gtk_gis_get_xml (GtkGis *gtkgis) @@ -365,14 +366,15 @@ xmlDoc /** * gtk_gis_save_to_xml: - * @gtkgis: + * @gtkgis: a #GtkGis object. * @file_name: */ void -*gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *file_name) +gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *file_name) { xmlDoc *xdoc; + g_return_if_fail (IS_GTK_GIS (gtkgis)); g_return_if_fail (file_name != NULL); xdoc = gtk_gis_get_xml (gtkgis); @@ -385,8 +387,8 @@ void /** * gtk_gis_add_layer: - * @gtkgis: - * @layer: + * @gtkgis: a #GtkGis object. + * @layer: a #GtkGisLayer object to add to the #GtkGis widget. */ void gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer) @@ -394,6 +396,8 @@ gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer) GtkGisPrivate *priv; GtkGisLayerExtent *extent; + g_return_if_fail (IS_GTK_GIS (gtkgis)); + priv = GTK_GIS_GET_PRIVATE (gtkgis); priv->layers = g_slist_append (priv->layers, layer); @@ -441,20 +445,24 @@ g_fprintf(stderr,"max extent %f %f %f %f\n",priv->extent->min_x,priv->extent->mi /** * gtk_gis_remove_layer: - * @gtkgis: - * @layer: + * @gtkgis: a #GtkGis object. + * @layer: a #GtkGisLayer object to remove from the #GtkGis widget. */ void gtk_gis_remove_layer (GtkGis *gtkgis, GtkGisLayer *layer) { - GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis); + GtkGisPrivate *priv; + + g_return_if_fail (IS_GTK_GIS (gtkgis)); + + priv = GTK_GIS_GET_PRIVATE (gtkgis); priv->layers = g_slist_remove (priv->layers, layer); } /** * gtk_gis_get_layer_by_name: - * @gtkgis: + * @gtkgis: a #GtkGis object. * @layer_name: * */ @@ -466,7 +474,11 @@ GtkGisLayer GtkGisLayer *layer_tmp; GSList *cur; - GtkGisPrivate *priv = GTK_GIS_GET_PRIVATE (gtkgis); + GtkGisPrivate *priv; + + g_return_val_if_fail (IS_GTK_GIS (gtkgis), NULL); + + priv = GTK_GIS_GET_PRIVATE (gtkgis); cur = priv->layers; while (cur != NULL) @@ -486,7 +498,7 @@ GtkGisLayer /** * gtk_gis_draw: - * @gtkgis: + * @gtkgis: a #GtkGis object. * */ void @@ -516,7 +528,7 @@ gtk_gis_draw (GtkGis *gtkgis) /** * gtk_gis_get_scale: - * @gtkgis: + * @gtkgis: a #GtkGis object. * * Returns: the #GtkGisScale. */ @@ -526,6 +538,8 @@ GtkGisScale GtkGisPrivate *priv; GtkGisScale *scale = NULL; + g_return_val_if_fail (IS_GTK_GIS (gtkgis), NULL); + priv = GTK_GIS_GET_PRIVATE (gtkgis); scale = g_malloc0 (sizeof (GtkGisScale)); @@ -538,7 +552,7 @@ GtkGisScale /** * gtk_gis_set_scale: - * @gtkgis: + * @gtkgis: a #GtkGis object. * @scale: * */ @@ -565,7 +579,7 @@ gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale) /** * gtk_gis_zoom_to_max: - * @gtkgis: + * @gtkgis: a #GtkGis object. * */ void @@ -597,24 +611,56 @@ gtk_gis_zoom_to_max (GtkGis *gtkgis) gdouble extent_width; gdouble extent_height; + gdouble ratio; + gdouble plus; extent_width = priv->extent->max_x - priv->extent->min_x; extent_height = priv->extent->max_y - priv->extent->min_y; g_fprintf(stderr,"extent_width %f extent_height %f\n",extent_width,extent_height); - if (extent_width > extent_height) + ratio = widget_width / widget_height; + + plus = extent_width / ratio; + + if (plus > extent_height) { - plus = (((widget_height * extent_width) / widget_width) - extent_height) / 2; + plus = (plus - extent_height) / 2; priv->extent->min_y -= plus; priv->extent->max_y += plus; } else { - plus = (((widget_width * extent_height) / widget_height) - extent_width) / 2; + plus = extent_height * ratio; + plus = (plus - extent_width) / 2; priv->extent->min_x -= plus; priv->extent->max_x += plus; } + + /*if (extent_width > extent_height) + { + plus = (((widget_height * extent_width) / widget_width) - extent_height) / 2; + if (plus < 0) plus *= -1; + priv->extent->min_y -= plus; + priv->extent->max_y += plus; + } + else + { + if (widget_width > widget_height) + { + plus = (((widget_width * extent_height) / widget_height) - extent_width) / 2; + if (plus < 0) plus *= -1; + priv->extent->min_x -= plus; + priv->extent->max_x += plus; + } + else + { + plus = (((widget_height * extent_width) / widget_width) - extent_height) / 2; + if (plus < 0) plus *= -1; + priv->extent->min_y -= plus; + priv->extent->max_y += plus; + } + }*/ g_fprintf(stderr,"plus %f\n",plus); goo_canvas_set_bounds (GOO_CANVAS (priv->canvas), @@ -637,8 +683,8 @@ g_fprintf(stderr,"scale_x %f scale_y %f scale_xy %f\n",scale->x,scale->y,scale-> /** * gtk_gis_zoom_to_layer: - * @gtkgis: - * @layer: + * @gtkgis: a #GtkGis object. + * @layer: a #GtkGisLayer object at which to zoom. * */ void @@ -646,6 +692,8 @@ gtk_gis_zoom_to_layer (GtkGis *gtkgis, GtkGisLayer *layer) { GtkGisPrivate *priv; + g_return_if_fail (IS_GTK_GIS (gtkgis)); + priv = GTK_GIS_GET_PRIVATE (gtkgis); } @@ -767,7 +815,7 @@ gtk_gis_realize (GtkWidget *widget) | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK; -g_fprintf(stderr,"dentro realize %d %d %d %d\n",attributes.x,attributes.y,attributes.width,attributes.height); + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), @@ -905,7 +953,6 @@ gtk_gis_button_press_event (GtkWidget *widget, priv->sel_start->x = event->x; priv->sel_start->y = event->y; -g_fprintf(stderr,"button press %f %f\n",priv->sel_start->x,priv->sel_start->y); } return FALSE; @@ -949,7 +996,7 @@ gtk_gis_motion_notify_event (GtkWidget *widget, gtkgis = GTK_GIS (widget); priv = GTK_GIS_GET_PRIVATE (gtkgis); -g_fprintf(stderr,"motion\n"); + if (event->is_hint) { gdk_window_get_pointer (event->window, &x, &y, &state); @@ -968,7 +1015,7 @@ g_fprintf(stderr,"motion\n"); GtkAllocation new_allocation; allocation = priv->canvas->allocation; -g_fprintf(stderr,"alloc %d %d sel %f %f event %d %d\n",allocation.x,allocation.y,priv->sel_start->x,priv->sel_start->y,x,y); + new_allocation.x = allocation.x + (x - (gint)priv->sel_start->x); new_allocation.y = allocation.y + (y - (gint)priv->sel_start->y); @@ -990,7 +1037,7 @@ gtk_gis_scroll_event (GtkWidget *widget, GtkGis *gtkgis; GtkGisScale *scale; -g_fprintf(stderr,"dentro scroll event\n"); + g_return_val_if_fail (IS_GTK_GIS (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); @@ -1000,13 +1047,13 @@ g_fprintf(stderr,"dentro scroll event\n"); scale = gtk_gis_get_scale (gtkgis); if (event->direction == GDK_SCROLL_UP) - {g_fprintf(stderr,"dentro scroll up\n"); + { scale->x = (scale->x * 120) / 100; scale->y = (scale->y * 120) / 100; scale->xy = (scale->xy * 120) / 100; } else if (event->direction == GDK_SCROLL_DOWN) - {g_fprintf(stderr,"dentro scroll down\n"); + { scale->x = (scale->x * 80) / 100; scale->y = (scale->y * 80) / 100; scale->xy = (scale->xy * 80) / 100; diff --git a/src/gtkgis.h b/src/gtkgis.h index 68cbec0..2626b28 100644 --- a/src/gtkgis.h +++ b/src/gtkgis.h @@ -60,7 +60,7 @@ GtkWidget *gtk_gis_new_from_xml (xmlDoc *xdoc); GtkWidget *gtk_gis_new_from_file (const gchar *file_name); xmlDoc *gtk_gis_get_xml (GtkGis *gtkgis); -void *gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *file_name); +void gtk_gis_save_to_xml (GtkGis *gtkgis, const gchar *file_name); void gtk_gis_add_group (GtkGis *gtkgis, GtkGisLayersGroup *layers_group); void gtk_gis_remove_group (GtkGis *gtkgis, GtkGisLayersGroup *layers_group); diff --git a/src/layer.c b/src/layer.c index 00b8e37..c967f28 100644 --- a/src/layer.c +++ b/src/layer.c @@ -78,8 +78,8 @@ gtk_gis_layer_init (GtkGisLayer *gtk_gis_layer) /** * gtk_gis_layer_new: - * @source: - * @name: + * @source: a #GtkGisLayerSource object. + * @name: the layer's name to load. * @geometrytype: * * Creates a new empty #GtkGisLayer object. @@ -109,7 +109,7 @@ GtkGisLayer /** * gtk_gis_layer_new_from_source: - * @source: + * @source: a #GtkGisLayerSource object. * @name: the layer's name to load. * * Creates a new #GtkGisLayer object and load its content from the #GtkGisLayerSource. @@ -136,7 +136,7 @@ GtkGisLayer /** * gtk_gis_layer_get_xml: - * @layer: + * @layer: a #GtkGisLayer object. * */ xmlNode @@ -168,7 +168,7 @@ xmlNode /** * gtk_gis_layer_get_name: - * @layer: + * @layer: a #GtkGisLayer object. * * Returns: the #GtkGisLayer's name. */ @@ -182,7 +182,7 @@ gchar /** * gtk_gis_layer_get_source: - * @layer: + * @layer: a #GtkGisLayer object. * * Returns: the #GtkGisLayerSource object associated. */ @@ -196,7 +196,7 @@ GtkGisLayerSource /** * gtk_gis_layer_fill_from_source: - * @layer: + * @layer: a #GtkGisLayer object. * * Loads the #GtkGisLayer's content from the associated #GtkGisLayerSource. * Contents loaded before will be lost. @@ -211,7 +211,7 @@ gtk_gis_layer_fill_from_source (GtkGisLayer *layer) /** * gtk_gis_layer_save: - * @layer: + * @layer: a #GtkGisLayer object. * @source: The #GtkGisLayerSource to use. If NULL, it'll use the associated * #GtkGisLayerSource. * @@ -225,8 +225,8 @@ gtk_gis_layer_save (GtkGisLayer *layer, /** * gtk_gis_layer_add_geometry: - * @layer: - * @geometry: + * @layer: a #GtkGisLayer object. + * @geometry: a #GtkGisGeometry to add to the layer. */ void gtk_gis_layer_add_geometry (GtkGisLayer *layer, GtkGisGeometry *geometry) @@ -238,8 +238,8 @@ gtk_gis_layer_add_geometry (GtkGisLayer *layer, GtkGisGeometry *geometry) /** * gtk_gis_layer_remove_geometry: - * @layer: - * @geometry: + * @layer: a #GtkGisLayer object. + * @geometry: a #GtkGisGeometry to remove from the layer. */ void gtk_gis_layer_remove_geometry (GtkGisLayer *layer, GtkGisGeometry *geometry) @@ -251,7 +251,7 @@ gtk_gis_layer_remove_geometry (GtkGisLayer *layer, GtkGisGeometry *geometry) /** * gtk_gis_layer_get_extent: - * @layer: + * @layer: a #GtkGisLayer object. * */ GtkGisLayerExtent @@ -268,7 +268,7 @@ GtkGisLayerExtent /** * gtk_gis_layer_get_editable: - * @layer: + * @layer: a #GtkGisLayer object. * * Returns: whether the layer is editable. */ @@ -282,7 +282,7 @@ gtk_gis_layer_get_editable (GtkGisLayer *layer) /** * gtk_gis_layer_set_editable: - * @layer: + * @layer: a #GtkGisLayer object. * @editable: */ void @@ -296,8 +296,9 @@ gtk_gis_layer_set_editable (GtkGisLayer *layer, /** * gtk_gis_layer_draw: - * @layer: + * @layer: a #GtkGisLayer object. * @root: + * @scale: * */ void diff --git a/src/layersource.c b/src/layersource.c index 71c679c..42f43c6 100644 --- a/src/layersource.c +++ b/src/layersource.c @@ -89,7 +89,7 @@ gtk_gis_layer_source_init (GtkGisLayerSource *gtk_gis_layer_source) /** * gtk_gis_layer_source_get_xml: - * @source: + * @source: a #GtkGisLayerSource object. * */ xmlNode @@ -114,7 +114,7 @@ xmlNode /** * gtk_gis_layer_source_get_geometries: - * @source: + * @source: a #GtkGisLayerSource object. * @name: * * Loads the #GtkGisLayerSource from the disk. @@ -143,7 +143,7 @@ GList /** * gtk_gis_layer_source_get_layer_geometry_type: - * @source: + * @source: a #GtkGisLayerSource object. * @name: * * Returns: a #GtkGisLayerGeometryType or -1 on error. @@ -197,8 +197,8 @@ gtk_gis_layer_source_get_layer_geometry_type (GtkGisLayerSource *source, /** * gtk_gis_layer_source_get_layer_extent: - * @source: - * @name: + * @source: a #GtkGisLayerSource object. + * @name: the layer's name.' * * Returns: */ @@ -253,6 +253,12 @@ GtkGisLayerExtent return extent; } +/** + * gtk_gis_layer_source_set_max_extent: + * @source: + * @extent: + * + */ void gtk_gis_layer_source_set_max_extent (GtkGisLayerSource *source, GtkGisLayerExtent *extent) diff --git a/tests/from_xml.c b/tests/from_xml.c index 1b49545..2182bd0 100644 --- a/tests/from_xml.c +++ b/tests/from_xml.c @@ -25,10 +25,13 @@ main (int argc, char *argv[]) gtk_gis_draw (GTK_GIS (gtkgis)); scale = gtk_gis_get_scale (GTK_GIS (gtkgis)); - scale->x = (scale->x * 80) / 100; - scale->y = (scale->y * 80) / 100; - scale->xy = (scale->xy * 80) / 100; - gtk_gis_set_scale (GTK_GIS (gtkgis), scale); + if (scale != NULL) + { + scale->x = (scale->x * 80) / 100; + scale->y = (scale->y * 80) / 100; + scale->xy = (scale->xy * 80) / 100; + gtk_gis_set_scale (GTK_GIS (gtkgis), scale); + } gtk_gis_save_to_xml (GTK_GIS (gtkgis), "test_saved.gtkgis"); -- 2.49.0