From c1c81eae94e86f3e8f17456ae0c5a8d9f1a9ac15 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 22 Sep 2014 18:34:37 +0200 Subject: [PATCH] Update sip bindings --- python/core/qgsvectorlayer.sip | 12 ++++++++++++ src/core/qgsvectorlayer.cpp | 1 - src/core/qgsvectorlayer.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip index e351e8fc75c..83d2988e90d 100644 --- a/python/core/qgsvectorlayer.sip +++ b/python/core/qgsvectorlayer.sip @@ -372,6 +372,18 @@ class QgsVectorLayer : QgsMapLayer */ QgsFeatureList selectedFeatures(); + /** + * Get an iterator of the selected features + * + * @param request You may specify a request, e.g. to limit the set of requested attributes. + * Any filter on the request will be discarded. + * + * @return Iterator over the selected features + * + * @see selectedFeaturesIds() + */ + QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() ); + /** * Return reference to identifiers of selected features * diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 8c2044da828..84b776cd2da 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -2296,7 +2296,6 @@ const QgsFeatureIds& QgsVectorLayer::selectedFeaturesIds() const return mSelectedFeatureIds; } - QgsFeatureList QgsVectorLayer::selectedFeatures() { QgsFeatureList features; diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 6297f5707ec..c0ffe75409a 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -731,6 +731,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * @return A list of { @link QgsFeature } 's * * @see selectedFeaturesIds() + * @see selectedFeaturesIterator() which is more memory friendly when handling large selections */ QgsFeatureList selectedFeatures(); @@ -743,6 +744,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * @return Iterator over the selected features * * @see selectedFeaturesIds() + * @see selectedFeatures() */ QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() );