.tm_project2.cache
aclocal.m4
autom4te.cache/
+change_for_git
config.guess
config.h
config.log
tests/.deps
tests/.libs
tests/from_xml
+tests/samples
# temporarily
TODO.tasks
<!ELEMENT layer (source)>
<!ATTLIST layer
- name CDATA #REQUIRED
- visible (y | n) "y"
+ name CDATA #REQUIRED
+ visible (y | n) "y"
>
-<!ELEMENT source (shape | postgis)>
+<!ELEMENT source (shape | postgis | raster)>
<!ELEMENT shape>
<!ATTLIST
- filename CDATA #REQUIRED
+ filename CDATA #REQUIRED
>
<!ELEMENT postgis>
<!ATTLIST
- host CDATA #REQUIRED
- port CDATA #REQUIRED
- username CDATA #REQUIRED
- password CDATA #REQUIRED
+ host CDATA #REQUIRED
+ port CDATA #REQUIRED
+ username CDATA #REQUIRED
+ password CDATA #REQUIRED
+>
+
+<!ELEMENT raster>
+<!ATTLIST
+ filename CDATA #REQUIRED
>
layersource.c \
layersourceshp.c \
layersourcepostgis.c \
+ layersourceraster.c \
geometry.c \
geometrypoint.c \
geometryline.c \
layersource.h \
layersourceshp.h \
layersourcepostgis.h \
+ layersourceraster.h \
geometry.h \
geometrypoint.h \
geometryline.h \
static void gtk_gis_geometry_raster_class_init (GtkGisGeometryRasterClass *klass);
static void gtk_gis_geometry_raster_init (GtkGisGeometryRaster *gtk_gis_geometry_raster);
+static
+GooCanvasItem *gtk_gis_geometry_raster_draw (GtkGisGeometry *raster, GtkGisScale *scale);
+
static void gtk_gis_geometry_raster_set_property (GObject *object,
guint property_id,
const GValue *value,
typedef struct _GtkGisGeometryRasterPrivate GtkGisGeometryRasterPrivate;
struct _GtkGisGeometryRasterPrivate
{
+ GdkPixbuf *pixbuf;
+
+ gdouble x;
+ gdouble y;
};
G_DEFINE_TYPE (GtkGisGeometryRaster, gtk_gis_geometry_raster, TYPE_GTK_GIS_GEOMETRY)
gtk_gis_geometry_raster_class_init (GtkGisGeometryRasterClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkGisGeometryClass *geometry_class = GTK_GIS_GEOMETRY_CLASS (klass);
g_type_class_add_private (object_class, sizeof (GtkGisGeometryRasterPrivate));
object_class->set_property = gtk_gis_geometry_raster_set_property;
object_class->get_property = gtk_gis_geometry_raster_get_property;
+
+ geometry_class->draw = gtk_gis_geometry_raster_draw;
}
static void
gtk_gis_geometry_raster_init (GtkGisGeometryRaster *gtk_gis_geometry_raster)
{
GtkGisGeometryRasterPrivate *priv = GTK_GIS_GEOMETRY_RASTER_GET_PRIVATE (gtk_gis_geometry_raster);
+
+ priv->pixbuf = NULL;
}
/**
- * gtk_gis_geometry_raster_new:
+ * gtk_gis_geometry_raster_new_from_pixbuf:
+ * @pixbuf:
+ * @x:
+ * @y:
*
* Creates a new #GtkGisGeometryRaster object.
*
* Returns: the newly created #GtkGisGeometryRaster object.
*/
GtkGisGeometry
-*gtk_gis_geometry_raster_new ()
+*gtk_gis_geometry_raster_new_from_pixbuf (GdkPixbuf *pixbuf, gdouble x, gdouble y)
{
GtkGisGeometry *raster;
+ GtkGisGeometryRasterPrivate *priv;
raster = g_object_new (gtk_gis_geometry_raster_get_type (), NULL);
+ priv = GTK_GIS_GEOMETRY_RASTER_GET_PRIVATE (raster);
+
+ priv->pixbuf = pixbuf;
+ priv->x = x;
+ priv->y = y;
+
return raster;
}
+static GooCanvasItem
+*gtk_gis_geometry_raster_draw (GtkGisGeometry *raster, GtkGisScale *scale)
+{
+ GooCanvasItem *item = NULL;
+
+ GtkGisGeometryRasterPrivate *priv = GTK_GIS_GEOMETRY_RASTER_GET_PRIVATE (GTK_GIS_GEOMETRY_RASTER (raster));
+
+ if (priv->pixbuf != NULL)
+ {
+ item = goo_canvas_image_new (NULL,
+ priv->pixbuf,
+ priv->x, priv->y,
+ NULL);
+ }
+
+ return item;
+}
+
static void
gtk_gis_geometry_raster_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
{
#ifndef __GTK_GIS_GEOMETRY_RASTER_H__
#define __GTK_GIS_GEOMETRY_RASTER_H__
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
#include "geometry.h"
G_BEGIN_DECLS
GType gtk_gis_geometry_raster_get_type (void) G_GNUC_CONST;
-GtkGisGeometry *gtk_gis_geometry_raster_new (void);
+GtkGisGeometry *gtk_gis_geometry_raster_new_from_pixbuf (GdkPixbuf *pixbuf, gdouble x, gdouble y);
G_END_DECLS
#include "layersource.h"
#include "layersourceshp.h"
#include "layersourcepostgis.h"
+#include "layersourceraster.h"
static void gtk_gis_class_init (GtkGisClass *klass);
static void gtk_gis_init (GtkGis *gtk_gis);
{
if (cur->type == XML_ELEMENT_NODE
&& (xmlStrcmp (cur->name, "shape") == 0
- || xmlStrcmp (cur->name, "postgis") == 0))
+ || xmlStrcmp (cur->name, "postgis") == 0
+ || xmlStrcmp (cur->name, "raster") == 0))
{
xmlNode *xml_source_spec;
GtkGisLayer *layer = NULL;
xmlGetProp (cur, (const xmlChar *)"username"),
xmlGetProp (cur, (const xmlChar *)"password"));
}
+ else if (xmlStrcmp (cur->name, "raster") == 0)
+ {
+ gchar *filename;
+
+ filename = xmlGetProp (cur, (const xmlChar *)"filename");
+ if (filename != NULL)
+ {
+ if (!g_path_is_absolute (filename))
+ {
+ filename = g_build_filename (g_get_current_dir (),
+ filename,
+ NULL);
+ }
+
+ layer_source = gtk_gis_layer_source_raster_new ((const gchar *)filename);
+ }
+ }
if (layer_source != NULL)
{
gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer)
{
GtkGisPrivate *priv;
- GtkGisLayerExtent extent;
+ GtkGisLayerExtent *extent;
priv = GTK_GIS_GET_PRIVATE (gtkgis);
extent = gtk_gis_layer_get_extent (layer);
- if (priv->extent == NULL)
+ if (extent != NULL)
{
- priv->extent = g_malloc (sizeof (GtkGisLayerExtent));
- priv->extent->min_x = extent.min_x;
- priv->extent->max_x = extent.max_x;
- priv->extent->min_y = extent.min_y;
- priv->extent->max_y = extent.max_y;
- }
- else
- {
- if (extent.min_x < priv->extent->min_x)
+ if (priv->extent == NULL)
{
- priv->extent->min_x = extent.min_x;
+ priv->extent = g_malloc (sizeof (GtkGisLayerExtent));
+ priv->extent->min_x = extent->min_x;
+ priv->extent->max_x = extent->max_x;
+ priv->extent->min_y = extent->min_y;
+ priv->extent->max_y = extent->max_y;
}
- if (extent.min_y < priv->extent->min_y)
- {
- priv->extent->min_y = extent.min_y;
- }
- if (extent.max_x > priv->extent->max_x)
- {
- priv->extent->max_x = extent.max_x;
- }
- if (extent.max_y > priv->extent->max_y)
+ else
{
- priv->extent->max_y = extent.max_y;
+ if (extent->min_x < priv->extent->min_x)
+ {
+ priv->extent->min_x = extent->min_x;
+ }
+ if (extent->min_y < priv->extent->min_y)
+ {
+ priv->extent->min_y = extent->min_y;
+ }
+ if (extent->max_x > priv->extent->max_x)
+ {
+ priv->extent->max_x = extent->max_x;
+ }
+ if (extent->max_y > priv->extent->max_y)
+ {
+ priv->extent->max_y = extent->max_y;
+ }
}
- }
- goo_canvas_set_bounds (GOO_CANVAS (priv->canvas),
- priv->extent->min_x,
- priv->extent->min_y,
- priv->extent->max_x,
- priv->extent->max_y);
+ goo_canvas_set_bounds (GOO_CANVAS (priv->canvas),
+ priv->extent->min_x,
+ priv->extent->min_y,
+ priv->extent->max_x,
+ priv->extent->max_y);
+ }
}
/**
GtkGisPrivate *priv;
GtkGisScale *scale;
+ gdouble extx = 1.0;
+ gdouble exty = 1.0;
+
priv = GTK_GIS_GET_PRIVATE (gtkgis);
scale = g_malloc0 (sizeof (GtkGisScale));
- scale->x = GTK_WIDGET (gtkgis)->allocation.width / (priv->extent->max_x - priv->extent->min_x);
- scale->y = GTK_WIDGET (gtkgis)->allocation.height / (priv->extent->max_y - priv->extent->min_y);
+ if (priv->extent != NULL)
+ {
+ extx = priv->extent->max_x - priv->extent->min_x;
+ exty = priv->extent->max_y - priv->extent->min_y;
+ }
+
+ scale->x = GTK_WIDGET (gtkgis)->allocation.width / extx;
+ scale->y = GTK_WIDGET (gtkgis)->allocation.height / exty;
scale->xy = (scale->x + scale->y) / 2;
gtk_gis_set_scale (gtkgis, scale);
*
*/
GtkGisLayerExtent
-gtk_gis_layer_get_extent (GtkGisLayer *layer)
+*gtk_gis_layer_get_extent (GtkGisLayer *layer)
{
GtkGisLayerPrivate *priv = GTK_GIS_LAYER_GET_PRIVATE (layer);
- GtkGisLayerExtent extent;
+ GtkGisLayerExtent *extent;
extent = gtk_gis_layer_source_get_layer_extent (priv->source, priv->name);
void gtk_gis_layer_remove_geometry (GtkGisLayer *layer,
GtkGisGeometry *geometry);
-GtkGisLayerExtent gtk_gis_layer_get_extent (GtkGisLayer *layer);
+GtkGisLayerExtent *gtk_gis_layer_get_extent (GtkGisLayer *layer);
gboolean gtk_gis_layer_get_editable (GtkGisLayer *layer);
void gtk_gis_layer_set_editable (GtkGisLayer *layer,
#include <config.h>
#endif
-#include <ogr_api.h>
-#include <ogr_core.h>
-
#include "layersource.h"
#include "geometry.h"
#include "geometryline.h"
static void gtk_gis_layer_source_class_init (GtkGisLayerSourceClass *klass);
static void gtk_gis_layer_source_init (GtkGisLayerSource *gtk_gis_layer_source);
+static GList
+*gtk_gis_layer_source_get_geometries_from_ogr (GtkGisLayerSource *source,
+ const gchar *name);
+static GList
+*gtk_gis_layer_source_get_geometries_from_gdal (GtkGisLayerSource *source,
+ const gchar *name);
+
static void
gtk_gis_layer_source_set_ogr_datasource (GtkGisLayerSource *source,
- OGRDataSourceH datasource);
+ OGRDataSourceH datasource);
+static void
+gtk_gis_layer_source_set_gdal_dataset (GtkGisLayerSource *source,
+ GDALDatasetH hDataset);
static void gtk_gis_layer_source_set_property (GObject *object,
guint property_id,
struct _GtkGisLayerSourcePrivate
{
OGRDataSourceH datasource;
+ GDALDatasetH dataset;
GtkGisLayerExtent *max_extent;
};
g_type_class_add_private (object_class, sizeof (GtkGisLayerSourcePrivate));
klass->set_ogr_datasource = gtk_gis_layer_source_set_ogr_datasource;
+ klass->set_gdal_dataset = gtk_gis_layer_source_set_gdal_dataset;
object_class->set_property = gtk_gis_layer_source_set_property;
object_class->get_property = gtk_gis_layer_source_get_property;
GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (gtk_gis_layer_source);
}
-static void
-gtk_gis_layer_source_set_ogr_datasource (GtkGisLayerSource *source,
- OGRDataSourceH datasource)
-{
- GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
-
- priv->datasource = datasource;
-
- priv->max_extent = NULL;
-}
-
-
/**
* gtk_gis_layer_source_get_geometries:
* @source:
{
GList *geometries = NULL;
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ if (priv->datasource != NULL)
+ {
+ geometries = gtk_gis_layer_source_get_geometries_from_ogr (source, name);
+ }
+ else if (priv->dataset != NULL)
+ {
+ geometries = gtk_gis_layer_source_get_geometries_from_gdal (source, name);
+ }
+
+ return geometries;
+}
+
+/**
+ * gtk_gis_layer_source_get_layer_geometry_type:
+ * @source:
+ * @name:
+ *
+ * Returns: a #GtkGisLayerGeometryType or -1 on error.
+ */
+GtkGisLayerGeometryType
+gtk_gis_layer_source_get_layer_geometry_type (GtkGisLayerSource *source,
+ const gchar *name)
+{
+ GtkGisLayerGeometryType type = -1;
+
+ OGRLayerH layer;
+ OGRFeatureH feature;
+
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ if (priv->datasource != NULL)
+ {
+ layer = OGR_DS_GetLayerByName (priv->datasource, name);
+
+ feature = OGR_L_GetNextFeature (layer);
+
+ if (feature != NULL)
+ {
+ OGRGeometryH poGeometry;
+
+ poGeometry = OGR_F_GetGeometryRef (feature);
+ if (poGeometry != NULL
+ && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbPoint)
+ {
+ type = LAYER_GEOMETRY_TYPE_POINT;
+ }
+ else if (poGeometry != NULL
+ && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbLineString)
+ {
+ type = LAYER_GEOMETRY_TYPE_LINE;
+ }
+ else if (poGeometry != NULL
+ && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbPolygon)
+ {
+ type = LAYER_GEOMETRY_TYPE_POLYGON;
+ }
+ }
+ }
+ else if (priv->dataset != NULL)
+ {
+ type = LAYER_GEOMETRY_TYPE_RASTER;
+ }
+
+ return type;
+}
+
+/**
+ * gtk_gis_layer_source_get_layer_extent:
+ * @source:
+ * @name:
+ *
+ * Returns:
+ */
+GtkGisLayerExtent
+*gtk_gis_layer_source_get_layer_extent (GtkGisLayerSource *source,
+ const gchar *name)
+{
+ GtkGisLayerExtent *extent = NULL;
+
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ if (priv->datasource != NULL)
+ {
+ OGRLayerH layer;
+ OGREnvelope psExtent;
+
+ layer = OGR_DS_GetLayerByName (priv->datasource, name);
+
+ if (layer != NULL)
+ {
+ extent = g_malloc0 (sizeof (GtkGisLayerExtent));
+
+ OGR_L_GetExtent (layer, &psExtent, 1);
+
+ extent->min_x = psExtent.MinX;
+ extent->min_y = psExtent.MinY;
+ extent->max_x = psExtent.MaxX;
+ extent->max_y = psExtent.MaxY;
+ }
+ }
+ else if (priv->dataset != NULL)
+ {
+ gdouble adfGeoTransform[6];
+
+ if (GDALGetGeoTransform (priv->dataset, adfGeoTransform) == CE_None)
+ {
+ extent = g_malloc0 (sizeof (GtkGisLayerExtent));
+
+ extent->min_x = adfGeoTransform[0];
+ extent->min_y = adfGeoTransform[3];
+ extent->max_x = extent->min_x + GDALGetRasterXSize (priv->dataset);
+ extent->max_y = extent->min_y + GDALGetRasterYSize (priv->dataset);
+ }
+ }
+
+ return extent;
+}
+
+void
+gtk_gis_layer_source_set_max_extent (GtkGisLayerSource *source,
+ GtkGisLayerExtent *extent)
+{
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ if (priv->max_extent == NULL)
+ {
+ priv->max_extent = g_malloc0 (sizeof (GtkGisLayerExtent));
+ }
+
+ priv->max_extent->min_x = extent->min_x;
+ priv->max_extent->max_x = extent->max_x;
+ priv->max_extent->min_y = extent->min_y;
+ priv->max_extent->max_y = extent->max_y;
+}
+
+static void
+gtk_gis_layer_source_set_ogr_datasource (GtkGisLayerSource *source,
+ OGRDataSourceH datasource)
+{
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ priv->datasource = datasource;
+ priv->dataset = NULL;
+
+ priv->max_extent = NULL;
+}
+
+static void
+gtk_gis_layer_source_set_gdal_dataset (GtkGisLayerSource *source,
+ GDALDatasetH hDataset)
+{
+ GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+
+ priv->datasource = NULL;
+ priv->dataset = hDataset;
+
+ priv->max_extent = NULL;
+}
+
+static GList
+*gtk_gis_layer_source_get_geometries_from_ogr (GtkGisLayerSource *source,
+ const gchar *name)
+{
+ GList *geometries = NULL;
+
OGRLayerH layer;
OGRFeatureH feature;
GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
- g_return_if_fail (priv->datasource != NULL);
-
layer = OGR_DS_GetLayerByName (priv->datasource, name);
g_return_if_fail (layer != NULL);
return geometries;
}
-/**
- * gtk_gis_layer_source_get_layer_geometry_type:
- * @source:
- * @name:
- *
- * Returns: a #GtkGisLayerGeometryType or -1 on error.
- */
-GtkGisLayerGeometryType
-gtk_gis_layer_source_get_layer_geometry_type (GtkGisLayerSource *source,
- const gchar *name)
+static GList
+*gtk_gis_layer_source_get_geometries_from_gdal (GtkGisLayerSource *source,
+ const gchar *name)
{
- GtkGisLayerGeometryType type = -1;
+ GList *geometries = NULL;
+ GtkGisGeometry *geometry;
- OGRLayerH layer;
- OGRFeatureH feature;
+ gdouble adfGeoTransform[6];
GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
- layer = OGR_DS_GetLayerByName (priv->datasource, name);
+ if (GDALGetGeoTransform (priv->dataset, adfGeoTransform) == CE_None)
+ {
+ GdkPixbuf *pixbuf;
+ guchar *pixbuf_data = NULL;
+ gint pixbuf_size;
- feature = OGR_L_GetNextFeature (layer);
+ gint bands;
+ gint band;
- if (feature != NULL)
- {
- OGRGeometryH poGeometry;
+ gdouble x;
+ gdouble y;
+ gdouble width;
+ gdouble height;
- poGeometry = OGR_F_GetGeometryRef (feature);
- if (poGeometry != NULL
- && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbPoint)
- {
- type = LAYER_GEOMETRY_TYPE_POINT;
- }
- else if (poGeometry != NULL
- && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbLineString)
+ gint i;
+
+ GDALRasterBandH hBand;
+
+ guint8 *pafScanlineR;
+ guint8 *pafScanlineG;
+ guint8 *pafScanlineB;
+ guint8 *pafScanline;
+
+ gint nXSize;
+ gint nYSize;
+
+ gdouble fixy;
+
+ /*if (priv->max_extent == NULL)
{
- type = LAYER_GEOMETRY_TYPE_LINE;
+ fixy = 0.0f;
}
- else if (poGeometry != NULL
- && wkbFlatten (OGR_G_GetGeometryType(poGeometry)) == wkbPolygon)
+ else
+ {*/
+ fixy = priv->max_extent->max_y + priv->max_extent->min_y;
+ //}
+
+ /* making the pixbuf */
+ for (band = 1; band < 4; band++)
{
- type = LAYER_GEOMETRY_TYPE_POLYGON;
- }
- }
+ hBand = GDALGetRasterBand (priv->dataset, band);
- return type;
-}
+ nXSize = GDALGetRasterBandXSize (hBand);
+ nYSize = GDALGetRasterBandYSize (hBand);
-/**
- * gtk_gis_layer_source_get_layer_extent:
- * @source:
- * @name:
- *
- * Returns:
- */
-GtkGisLayerExtent
-gtk_gis_layer_source_get_layer_extent (GtkGisLayerSource *source,
- const gchar *name)
-{
- OGRLayerH layer;
- OGREnvelope psExtent;
- GtkGisLayerExtent extent;
+ switch (band)
+ {
+ case 1:
+ pafScanlineR = (guint8 *) g_malloc (sizeof (guint8) * nXSize * nYSize);
+ pafScanline = pafScanlineR;
+ break;
+
+ case 2:
+ pafScanlineG = (guint8 *) g_malloc (sizeof (guint8) * nXSize * nYSize);
+ pafScanline = pafScanlineG;
+ break;
+
+ case 3:
+ pafScanlineB = (guint8 *) g_malloc (sizeof (guint8) * nXSize * nYSize);
+ pafScanline = pafScanlineB;
+ break;
+ }
- GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+ GDALRasterIO (hBand, GF_Read, 0, 0, nXSize, nYSize,
+ pafScanline, nXSize, nYSize, GDT_Byte,
+ 0, 0);
+ }
- layer = OGR_DS_GetLayerByName (priv->datasource, name);
+ x = adfGeoTransform[0];
+ y = /*fixy -*/ adfGeoTransform[3];
+ width = GDALGetRasterXSize (priv->dataset);
+ height = GDALGetRasterYSize (priv->dataset);
- OGR_L_GetExtent (layer, &psExtent, 1);
+ pixbuf_size = width * height;
+ pixbuf_data = (guint8 *) g_malloc (sizeof (guint8) * pixbuf_size * 3);
- extent.min_x = psExtent.MinX;
- extent.min_y = psExtent.MinY;
- extent.max_x = psExtent.MaxX;
- extent.max_y = psExtent.MaxY;
+ for (i = 0; i < pixbuf_size; i++)
+ {
+ pixbuf_data[(i * 3)] = pafScanlineR[i];
+ pixbuf_data[(i * 3) + 1] = pafScanlineG[i];
+ pixbuf_data[(i * 3) + 2] = pafScanlineB[i];
+ }
- return extent;
-}
+ pixbuf = gdk_pixbuf_new_from_data (pixbuf_data,
+ GDK_COLORSPACE_RGB,
+ FALSE,
+ 8,
+ (int)width,
+ (int)height,
+ (int)width * 3,
+ NULL,
+ NULL);
-void
-gtk_gis_layer_source_set_max_extent (GtkGisLayerSource *source,
- GtkGisLayerExtent *extent)
-{
- GtkGisLayerSourcePrivate *priv = GTK_GIS_LAYER_SOURCE_GET_PRIVATE (source);
+ geometry = gtk_gis_geometry_raster_new_from_pixbuf (pixbuf, x, y);
- if (priv->max_extent == NULL)
- {
- priv->max_extent = g_malloc0 (sizeof (GtkGisLayerExtent));
+ if (geometry != NULL)
+ {
+ geometries = g_list_append (geometries, geometry);
+ }
}
- priv->max_extent->min_x = extent->min_x;
- priv->max_extent->max_x = extent->max_x;
- priv->max_extent->min_y = extent->min_y;
- priv->max_extent->max_y = extent->max_y;
+ return geometries;
}
static void
#include <glib.h>
#include <glib-object.h>
+#include <gdal.h>
#include <ogr_api.h>
#include <ogr_core.h>
void (*set_ogr_datasource) (GtkGisLayerSource *source,
OGRDataSourceH datasource);
+ void (*set_gdal_dataset) (GtkGisLayerSource *source,
+ GDALDatasetH hDataset);
};
GType gtk_gis_layer_source_get_type (void) G_GNUC_CONST;
GtkGisLayerGeometryType gtk_gis_layer_source_get_layer_geometry_type (GtkGisLayerSource *source,
const gchar *name);
-GtkGisLayerExtent gtk_gis_layer_source_get_layer_extent (GtkGisLayerSource *source,
- const gchar *name);
+GtkGisLayerExtent *gtk_gis_layer_source_get_layer_extent (GtkGisLayerSource *source,
+ const gchar *name);
void gtk_gis_layer_source_set_max_extent (GtkGisLayerSource *source,
GtkGisLayerExtent *extent);
--- /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
+ */
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#include <gdal.h>
+
+#include "layersourceraster.h"
+
+static void gtk_gis_layer_source_raster_class_init (GtkGisLayerSourceRasterClass *klass);
+static void gtk_gis_layer_source_raster_init (GtkGisLayerSourceRaster *gtk_gis_layer_source_raster);
+
+static void
+gtk_gis_layer_source_raster_set_gdal_dataset (GtkGisLayerSource *source,
+ GDALDatasetH hDataset);
+
+static void gtk_gis_layer_source_raster_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_gis_layer_source_raster_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+
+#define GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRasterPrivate))
+
+typedef struct _GtkGisLayerSourceRasterPrivate GtkGisLayerSourceRasterPrivate;
+struct _GtkGisLayerSourceRasterPrivate
+ {
+ gchar *filename;
+ };
+
+G_DEFINE_TYPE (GtkGisLayerSourceRaster, gtk_gis_layer_source_raster, TYPE_GTK_GIS_LAYER_SOURCE)
+
+static void
+gtk_gis_layer_source_raster_class_init (GtkGisLayerSourceRasterClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkGisLayerSourceClass *gtkgislayersource_class = GTK_GIS_LAYER_SOURCE_CLASS (klass);
+
+ g_type_class_add_private (object_class, sizeof (GtkGisLayerSourceRasterPrivate));
+
+ object_class->set_property = gtk_gis_layer_source_raster_set_property;
+ object_class->get_property = gtk_gis_layer_source_raster_get_property;
+}
+
+static void
+gtk_gis_layer_source_raster_init (GtkGisLayerSourceRaster *gtk_gis_layer_source_raster)
+{
+ GtkGisLayerSourceRasterPrivate *priv = GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE (gtk_gis_layer_source_raster);
+}
+
+/**
+ * gtk_gis_layer_source_raster_new:
+ * @filename: a file name.
+ *
+ * Creates a new #GtkGisLayerSourceRaster object.
+ *
+ * Returns: the newly created #GtkGisLayerSourceRaster object.
+ */
+GtkGisLayerSource
+*gtk_gis_layer_source_raster_new (const gchar *filename)
+{
+ GtkGisLayerSource *source;
+ GtkGisLayerSourceRasterPrivate *priv;
+
+ source = g_object_new (gtk_gis_layer_source_raster_get_type (), NULL);
+
+ priv = GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE (GTK_GIS_LAYER_SOURCE_RASTER (source));
+
+ priv->filename = g_strdup (filename);
+
+ /* Register all GDAL drivers */
+ GDALAllRegister ();
+
+ /* Open dataset */
+ gtk_gis_layer_source_raster_set_gdal_dataset (source,
+ GDALOpen (priv->filename, GA_ReadOnly));
+
+ return source;
+}
+
+/**
+ * gtk_gis_layer_source_raster_get_filename:
+ * @source:
+ *
+ * Returns: the #GtkGisLayerSourceRaster's file name.
+ */
+gchar
+*gtk_gis_layer_source_raster_get_filename (GtkGisLayerSourceRaster *source)
+{
+ GtkGisLayerSourceRasterPrivate *priv = GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE (source);
+
+ return g_strdup (priv->filename);
+}
+
+static void
+gtk_gis_layer_source_raster_set_gdal_dataset (GtkGisLayerSource *source,
+ GDALDatasetH hDataset)
+{
+ if (IS_GTK_GIS_LAYER_SOURCE (source) && GTK_GIS_LAYER_SOURCE_GET_CLASS (source)->set_gdal_dataset != NULL)
+ {
+ GTK_GIS_LAYER_SOURCE_GET_CLASS (source)->set_gdal_dataset (source, hDataset);
+ }
+}
+
+static void
+gtk_gis_layer_source_raster_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+{
+ GtkGisLayerSourceRaster *source = GTK_GIS_LAYER_SOURCE_RASTER (object);
+
+ GtkGisLayerSourceRasterPrivate *priv = GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE (source);
+
+ switch (property_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_gis_layer_source_raster_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+{
+ GtkGisLayerSourceRaster *source = GTK_GIS_LAYER_SOURCE_RASTER (object);
+
+ GtkGisLayerSourceRasterPrivate *priv = GTK_GIS_LAYER_SOURCE_RASTER_GET_PRIVATE (source);
+
+ switch (property_id)
+ {
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
--- /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
+ *
+ */
+
+#ifndef __GTK_GIS_LAYER_SOURCE_RASTER_H__
+#define __GTK_GIS_LAYER_SOURCE_RASTER_H__
+
+#include "layersource.h"
+
+G_BEGIN_DECLS
+
+
+#define TYPE_GTK_GIS_LAYER_SOURCE_RASTER (gtk_gis_layer_source_raster_get_type ())
+#define GTK_GIS_LAYER_SOURCE_RASTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRaster))
+#define GTK_GIS_LAYER_SOURCE_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRasterClass))
+#define IS_GTK_GIS_LAYER_SOURCE_RASTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER))
+#define IS_GTK_GIS_LAYER_SOURCE_RASTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_GIS_LAYER_SOURCE_RASTER))
+#define GTK_GIS_LAYER_SOURCE_RASTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_GIS_LAYER_SOURCE_RASTER, GtkGisLayerSourceRasterClass))
+
+
+typedef struct _GtkGisLayerSourceRaster GtkGisLayerSourceRaster;
+typedef struct _GtkGisLayerSourceRasterClass GtkGisLayerSourceRasterClass;
+
+struct _GtkGisLayerSourceRaster
+ {
+ GtkGisLayerSource parent;
+ };
+
+struct _GtkGisLayerSourceRasterClass
+ {
+ GtkGisLayerSourceClass parent_class;
+ };
+
+GType gtk_gis_layer_source_raster_get_type (void) G_GNUC_CONST;
+
+
+GtkGisLayerSource *gtk_gis_layer_source_raster_new (const gchar *filename);
+
+gchar *gtk_gis_layer_source_raster_get_filename (GtkGisLayerSourceRaster *source);
+
+
+G_END_DECLS
+
+#endif /* __GTK_GIS_LAYER_SOURCE_RASTER_H__ */
}
/**
- * gtk_gis_layer_source_shp_new:
+ * gtk_gis_layer_source_shp_get_filename:
* @source:
*
* Returns: the #GtkGisLayerSourceShp's file name.
*/
gchar
-*gtk_gis_layer_get_filename (GtkGisLayerSourceShp *source)
+*gtk_gis_layer_source_shp_get_filename (GtkGisLayerSourceShp *source)
{
GtkGisLayerSourceShpPrivate *priv = GTK_GIS_LAYER_SOURCE_SHP_GET_PRIVATE (source);
GtkGisLayerSource *gtk_gis_layer_source_shp_new (const gchar *filename);
-gchar *gtk_gis_layer_get_filename (GtkGisLayerSourceShp *source);
+gchar *gtk_gis_layer_source_shp_get_filename (GtkGisLayerSourceShp *source);
G_END_DECLS
#include <gtkgis/layersource.h>
#include <gtkgis/layersourceshp.h>
#include <gtkgis/layersourcepostgis.h>
+#include <gtkgis/layersourceraster.h>
#include <gtkgis/geometry.h>
#include <gtkgis/geometrypoint.h>
#include <gtkgis/geometryline.h>
+++ /dev/null
-PROJCS["Albers",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.978698213898]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]]
\ No newline at end of file
+++ /dev/null
-PROJCS["Albers Equal Area",GEOGCS["clark66",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]]
\ No newline at end of file
+++ /dev/null
-PROJCS["Albers",GEOGCS["GCS_North_American_1927",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.978698213898]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]]
\ No newline at end of file
+++ /dev/null
-PROJCS["Albers Equal Area",GEOGCS["clark66",DATUM["D_North_American_1927",SPHEROID["Clarke_1866",6378206.4,294.9786982]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers"],PARAMETER["standard_parallel_1",55],PARAMETER["standard_parallel_2",65],PARAMETER["latitude_of_origin",50],PARAMETER["central_meridian",-154],PARAMETER["false_easting",0],PARAMETER["false_northing",0],UNIT["Foot_US",0.30480060960121924]]
\ No newline at end of file
projects / libgtkgis / commitdiff