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

[API] remove QgsVectorDataProvider::enableGeometrylessFeatures(bool)

Browse Source 
Geometryless features are not skipped by default anymore.
This commit is contained in:
Martin Dobias 2013-04-11 23:38:10 +02:00
parent efe3c55cd8
commit 94639ee61e
5 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/qgsvectordataprovider.sip
View File

@ -220,12 +220,6 @@ class QgsVectorDataProvider : QgsDataProvider
*/
virtual QHash<int, QString> palAttributeIndexNames() const;
/**
* Set whether provider should also return features that don't have
* associated geometry. false by default
*/
void enableGeometrylessFeatures( bool fetch );
/**
* check if provider supports type of field
* @note added in 1.2

8
src/app/qgsattributetypeloaddialog.cpp
View File

@ -127,9 +127,6 @@ void QgsAttributeTypeLoadDialog::createPreview( int fieldIndex, bool full )
return;
}
QgsVectorDataProvider* dataProvider = vLayer->dataProvider();
dataProvider->enableGeometrylessFeatures( true );
QgsAttributeList attributeList = QgsAttributeList();
attributeList.append( idx );
attributeList.append( idx2 );
@ -158,7 +155,6 @@ void QgsAttributeTypeLoadDialog::createPreview( int fieldIndex, bool full )
previewTableWidget->setItem( row, 1, new QTableWidgetItem( mit.key() ) );
}
dataProvider->enableGeometrylessFeatures( false );
}
QMap<QString, QVariant> &QgsAttributeTypeLoadDialog::valueMap()
@ -178,9 +174,6 @@ void QgsAttributeTypeLoadDialog::loadDataToValueMap()
return;
}
QgsVectorDataProvider* dataProvider = vLayer->dataProvider();
dataProvider->enableGeometrylessFeatures( true );
QgsAttributeList attributeList = QgsAttributeList();
attributeList.append( idx );
attributeList.append( idx2 );
@ -196,7 +189,6 @@ void QgsAttributeTypeLoadDialog::loadDataToValueMap()
mValueMap.insert( f.attribute( idx2 ).toString(), val );
}
}
dataProvider->enableGeometrylessFeatures( false );
}

6
src/core/qgsvectordataprovider.cpp
View File

@ -30,7 +30,6 @@
QgsVectorDataProvider::QgsVectorDataProvider( QString uri )
: QgsDataProvider( uri )
, mCacheMinMaxDirty( true )
, mFetchFeaturesWithoutGeom( true )
, mAttrPalIndexName( QgsAttrPalIndexNameHash() )
{
QSettings settings;
@ -238,11 +237,6 @@ QgsAttributeList QgsVectorDataProvider::attributeIndexes()
return list;
}
void QgsVectorDataProvider::enableGeometrylessFeatures( bool fetch )
{
mFetchFeaturesWithoutGeom = fetch;
}
const QList< QgsVectorDataProvider::NativeType > &QgsVectorDataProvider::nativeTypes() const
{
return mNativeTypes;

6
src/core/qgsvectordataprovider.h
View File

@ -279,12 +279,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
*/
virtual QgsAttrPalIndexNameHash palAttributeIndexNames() const { return mAttrPalIndexName; }
/**
* Set whether provider should also return features that don't have
* associated geometry. false by default
*/
void enableGeometrylessFeatures( bool fetch );
/**
* check if provider supports type of field
* @note added in 1.2

15
src/providers/ogr/qgsogrfeatureiterator.cpp
View File

@ -101,14 +101,6 @@ bool QgsOgrFeatureIterator::nextFeature( QgsFeature& feature )
return false;
}
// skip features without geometry
if ( !OGR_F_GetGeometryRef( fet ) && !P->mFetchFeaturesWithoutGeom )
{
OGR_F_Destroy( fet );
close();
return false;
}
readFeature( fet, feature );
feature.setValid( true );
@ -120,13 +112,6 @@ bool QgsOgrFeatureIterator::nextFeature( QgsFeature& feature )
while (( fet = OGR_L_GetNextFeature( P->ogrLayer ) ) )
{
// skip features without geometry
if ( !P->mFetchFeaturesWithoutGeom && !OGR_F_GetGeometryRef( fet ) )
{
OGR_F_Destroy( fet );
continue;
}
if ( !readFeature( fet, feature ) )
continue;