sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Applied patch #1290 with modifications

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11257 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2009-08-03 20:46:18 +00:00
parent 37fef1b145
commit a0addcee64
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsvectordataprovider.cpp
View File

@ -28,7 +28,7 @@
QgsVectorDataProvider::QgsVectorDataProvider( QString uri )
: QgsDataProvider( uri ),
mCacheMinMaxDirty( TRUE ),
mFetchFeaturesWithoutGeom( FALSE )
mFetchFeaturesWithoutGeom( TRUE )
{
QSettings settings;
setEncoding( settings.value( "/UI/encoding", QString( "System" ) ).toString() );

26
src/providers/ogr/qgsogrprovider.cpp
View File

@ -318,11 +318,19 @@ bool QgsOgrProvider::featureAtId( int featureId,
return false;
feature.setFeatureId( OGR_F_GetFID( fet ) );
// skip features without geometry
if ( OGR_F_GetGeometryRef( fet ) == NULL && !mFetchFeaturesWithoutGeom )
{
OGR_F_Destroy( fet );
return false;
}
/* fetch geometry */
if ( fetchGeometry )
{
OGRGeometryH geom = OGR_F_GetGeometryRef( fet );
// skip features without geometry
// get the wkb representation
unsigned char *wkb = new unsigned char[OGR_G_WkbSize( geom )];
@ -337,8 +345,15 @@ bool QgsOgrProvider::featureAtId( int featureId,
getFeatureAttribute( fet, feature, *it );
}
if ( OGR_F_GetGeometryRef( fet ) != NULL )
{
feature.setValid( true );
}
else
{
feature.setValid( false );
}
OGR_F_Destroy( fet );
feature.setValid( true );
return true;
}
@ -414,8 +429,15 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
if ( fet )
{
if ( OGR_F_GetGeometryRef( fet ) != NULL )
{
feature.setValid( true );
}
else
{
feature.setValid( false );
}
OGR_F_Destroy( fet );
feature.setValid( true );
return true;
}
else