Merge pull request #4282 from nyalldawson/sel

nyalldawson · web-flow · commit f1d4ac33e74b · 2017-04-27T11:24:42.000+10:00
Rename QgsVectorLayer::selectedFeaturesIterator to getSelectedFeatures
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -2100,6 +2100,7 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
 - Deprecated editor widget methods and enums and structs: struct RangeData, enum FeatureFormSuppress, enum EditType, addAttributeEditorWidget(), editorWidgetV2(), editorWidgetConfig(), attributeEditorElements(), editType(), setEditType(), editorLayout(), setEditorLayout, setEditorWidgetV2Config(), setCheckedState(), editForm(), setEditForm(), featureFormSuppress(), setFeatureFormSuppress(), editFormInit(), setEditFormInit(), valueMap(), range(), dateFormat(), fieldEditable(), labelOnTop(), setFieldEditable() and setLabelOnTop().  Use editFormConfig()
 - select() replaced by selectByRect()
 - selectedFeaturesIds() replaced by selectedFeatureIds()
+- selectedFeaturesIterator() was replaced by getSelectedFeatures()
 - setSelectedFeatures() replaced by selectByIds()
 - applyNamedStyle() replaced by applyNamedStyle()
 - isReadOnly() use readOnly()
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -586,11 +586,11 @@ Get all feature Ids
  :return: A list of QgsFeature
 
  \see    selectedFeatureIds()
- \see    selectedFeaturesIterator() which is more memory friendly when handling large selections
+ \see    getSelectedFeatures() which is more memory friendly when handling large selections
  :rtype: QgsFeatureList
 %End
 
-    QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() ) const;
+    QgsFeatureIterator getSelectedFeatures( QgsFeatureRequest request = QgsFeatureRequest() ) const;
 %Docstring
  Get an iterator of the selected features
 
diff --git a/python/plugins/processing/algs/qgis/SaveSelectedFeatures.py b/python/plugins/processing/algs/qgis/SaveSelectedFeatures.py
@@ -67,7 +67,7 @@ def processAlgorithm(self, context, feedback):
 
         writer = output.getVectorWriter(vectorLayer.fields(), vectorLayer.wkbType(), vectorLayer.crs(), context)
 
-        features = vectorLayer.selectedFeaturesIterator()
+        features = vectorLayer.getSelectedFeatures()
         total = 100.0 / int(vectorLayer.selectedFeatureCount())
         for current, feat in enumerate(features):
             writer.addFeature(feat)
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -179,7 +179,7 @@ def spatialindex(layer):
     request.setSubsetOfAttributes([])
     if ProcessingConfig.getSetting(ProcessingConfig.USE_SELECTED) \
             and layer.selectedFeatureCount() > 0:
-        idx = QgsSpatialIndex(layer.selectedFeaturesIterator(request))
+        idx = QgsSpatialIndex(layer.getSelectedFeatures(request))
     else:
         idx = QgsSpatialIndex(layer.getFeatures(request))
     return idx
diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp
@@ -134,7 +134,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
       mRubberBand = createRubberBand( vlayer->geometryType() );
       QgsFeature feat;
-      QgsFeatureIterator it = vlayer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
+      QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
 
       while ( it.nextFeature( feat ) )
       {
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -284,7 +284,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
       mRubberBand = createRubberBand( vlayer->geometryType() ) ;
 
       QgsFeature feat;
-      QgsFeatureIterator it = vlayer->selectedFeaturesIterator();
+      QgsFeatureIterator it = vlayer->getSelectedFeatures();
       while ( it.nextFeature( feat ) )
       {
         mRubberBand->addGeometry( feat.geometry(), vlayer );
diff --git a/src/core/processing/qgsprocessingutils.cpp b/src/core/processing/qgsprocessingutils.cpp
@@ -182,7 +182,7 @@ QgsFeatureIterator QgsProcessingUtils::getFeatures( QgsVectorLayer *layer, const
   req.setInvalidGeometryCallback( context.invalidGeometryCallback() );
   if ( useSelection )
   {
-    return layer->selectedFeaturesIterator( req );
+    return layer->getSelectedFeatures( req );
   }
   else
   {
@@ -220,7 +220,7 @@ QList<QVariant> QgsProcessingUtils::uniqueValues( QgsVectorLayer *layer, int fie
     // using selection, so we have to iterate through selected features
     QSet<QVariant> values;
     QgsFeature f;
-    QgsFeatureIterator it = layer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() << fieldIndex ).setFlags( QgsFeatureRequest::NoGeometry ) );
+    QgsFeatureIterator it = layer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() << fieldIndex ).setFlags( QgsFeatureRequest::NoGeometry ) );
     while ( it.nextFeature( f ) )
     {
       values.insert( f.attribute( fieldIndex ) );
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2531,7 +2531,7 @@ QgsFeatureList QgsVectorLayer::selectedFeatures() const
   }
   else
   {
-    QgsFeatureIterator it = selectedFeaturesIterator();
+    QgsFeatureIterator it = getSelectedFeatures();
 
     while ( it.nextFeature( f ) )
     {
@@ -2542,7 +2542,7 @@ QgsFeatureList QgsVectorLayer::selectedFeatures() const
   return features;
 }
 
-QgsFeatureIterator QgsVectorLayer::selectedFeaturesIterator( QgsFeatureRequest request ) const
+QgsFeatureIterator QgsVectorLayer::getSelectedFeatures( QgsFeatureRequest request ) const
 {
   if ( mSelectedFeatureIds.isEmpty() )
     return QgsFeatureIterator();
@@ -3451,7 +3451,7 @@ QList<QVariant> QgsVectorLayer::getValues( const QString &fieldOrExpression, boo
   }
   else
   {
-    fit = selectedFeaturesIterator( request );
+    fit = getSelectedFeatures( request );
   }
 
   // create list of non-null attribute values
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -608,7 +608,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * \returns A list of QgsFeature
      *
      * \see    selectedFeatureIds()
-     * \see    selectedFeaturesIterator() which is more memory friendly when handling large selections
+     * \see    getSelectedFeatures() which is more memory friendly when handling large selections
      */
     QgsFeatureList selectedFeatures() const;
 
@@ -623,7 +623,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * \see    selectedFeatureIds()
      * \see    selectedFeatures()
      */
-    QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() ) const;
+    QgsFeatureIterator getSelectedFeatures( QgsFeatureRequest request = QgsFeatureRequest() ) const;
 
     /**
      * Return reference to identifiers of selected features
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -322,7 +322,7 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint> &splitLine, bo
 
   if ( !selectedIds.isEmpty() ) //consider only the selected features if there is a selection
   {
-    features = L->selectedFeaturesIterator();
+    features = L->getSelectedFeatures();
   }
   else //else consider all the feature that intersect the bounding box of the split line
   {
@@ -431,7 +431,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint> &splitLine, bool
 
   if ( L->selectedFeatureCount() > 0 ) //consider only the selected features if there is a selection
   {
-    fit = L->selectedFeaturesIterator();
+    fit = L->getSelectedFeatures();
   }
   else //else consider all the feature that intersect the bounding box of the split line
   {
diff --git a/src/plugins/spatialquery/qgsreaderfeatures.cpp b/src/plugins/spatialquery/qgsreaderfeatures.cpp
@@ -37,7 +37,7 @@ void QgsReaderFeatures::initReader( bool useSelection )
 {
   if ( useSelection )
   {
-    mFit = mLayer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
+    mFit = mLayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`134`	`134`
`135`	`135`	`mRubberBand = createRubberBand( vlayer->geometryType() );`
`136`	`136`	`QgsFeature feat;`
`137`		`- QgsFeatureIterator it = vlayer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );`
	`137`	`+ QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );`
`138`	`138`
`139`	`139`	`while ( it.nextFeature( feat ) )`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )`
`284`	`284`	`mRubberBand = createRubberBand( vlayer->geometryType() ) ;`
`285`	`285`
`286`	`286`	`QgsFeature feat;`
`287`		`- QgsFeatureIterator it = vlayer->selectedFeaturesIterator();`
	`287`	`+ QgsFeatureIterator it = vlayer->getSelectedFeatures();`
`288`	`288`	`while ( it.nextFeature( feat ) )`
`289`	`289`	`{`
`290`	`290`	`mRubberBand->addGeometry( feat.geometry(), vlayer );`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ QgsFeatureIterator QgsProcessingUtils::getFeatures( QgsVectorLayer *layer, const`
`182`	`182`	`req.setInvalidGeometryCallback( context.invalidGeometryCallback() );`
`183`	`183`	`if ( useSelection )`
`184`	`184`	`{`
`185`		`- return layer->selectedFeaturesIterator( req );`
	`185`	`+ return layer->getSelectedFeatures( req );`
`186`	`186`	`}`
`187`	`187`	`else`
`188`	`188`	`{`
`@@ -220,7 +220,7 @@ QList<QVariant> QgsProcessingUtils::uniqueValues( QgsVectorLayer *layer, int fie`
`220`	`220`	`// using selection, so we have to iterate through selected features`
`221`	`221`	`QSet<QVariant> values;`
`222`	`222`	`QgsFeature f;`
`223`		`- QgsFeatureIterator it = layer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() << fieldIndex ).setFlags( QgsFeatureRequest::NoGeometry ) );`
	`223`	`+ QgsFeatureIterator it = layer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() << fieldIndex ).setFlags( QgsFeatureRequest::NoGeometry ) );`
`224`	`224`	`while ( it.nextFeature( f ) )`
`225`	`225`	`{`
`226`	`226`	`values.insert( f.attribute( fieldIndex ) );`
Original file line number	Diff line number	Diff line change
`@@ -2531,7 +2531,7 @@ QgsFeatureList QgsVectorLayer::selectedFeatures() const`
`2531`	`2531`	`}`
`2532`	`2532`	`else`
`2533`	`2533`	`{`
`2534`		`- QgsFeatureIterator it = selectedFeaturesIterator();`
	`2534`	`+ QgsFeatureIterator it = getSelectedFeatures();`
`2535`	`2535`
`2536`	`2536`	`while ( it.nextFeature( f ) )`
`2537`	`2537`	`{`
`@@ -2542,7 +2542,7 @@ QgsFeatureList QgsVectorLayer::selectedFeatures() const`
`2542`	`2542`	`return features;`
`2543`	`2543`	`}`
`2544`	`2544`
`2545`		`-QgsFeatureIterator QgsVectorLayer::selectedFeaturesIterator( QgsFeatureRequest request ) const`
	`2545`	`+QgsFeatureIterator QgsVectorLayer::getSelectedFeatures( QgsFeatureRequest request ) const`
`2546`	`2546`	`{`
`2547`	`2547`	`if ( mSelectedFeatureIds.isEmpty() )`
`2548`	`2548`	`return QgsFeatureIterator();`
`@@ -3451,7 +3451,7 @@ QList<QVariant> QgsVectorLayer::getValues( const QString &fieldOrExpression, boo`
`3451`	`3451`	`}`
`3452`	`3452`	`else`
`3453`	`3453`	`{`
`3454`		`- fit = selectedFeaturesIterator( request );`
	`3454`	`+ fit = getSelectedFeatures( request );`
`3455`	`3455`	`}`
`3456`	`3456`
`3457`	`3457`	`// create list of non-null attribute values`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint> &splitLine, bo`
`322`	`322`
`323`	`323`	`if ( !selectedIds.isEmpty() ) //consider only the selected features if there is a selection`
`324`	`324`	`{`
`325`		`- features = L->selectedFeaturesIterator();`
	`325`	`+ features = L->getSelectedFeatures();`
`326`	`326`	`}`
`327`	`327`	`else //else consider all the feature that intersect the bounding box of the split line`
`328`	`328`	`{`
`@@ -431,7 +431,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint> &splitLine, bool`
`431`	`431`
`432`	`432`	`if ( L->selectedFeatureCount() > 0 ) //consider only the selected features if there is a selection`
`433`	`433`	`{`
`434`		`- fit = L->selectedFeaturesIterator();`
	`434`	`+ fit = L->getSelectedFeatures();`
`435`	`435`	`}`
`436`	`436`	`else //else consider all the feature that intersect the bounding box of the split line`
`437`	`437`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void QgsReaderFeatures::initReader( bool useSelection )`
`37`	`37`	`{`
`38`	`38`	`if ( useSelection )`
`39`	`39`	`{`
`40`		`- mFit = mLayer->selectedFeaturesIterator( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );`
	`40`	`+ mFit = mLayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );`
`41`	`41`	`}`
`42`	`42`	`else`
`43`	`43`	`{`