File tree 1 file changed +6
-12
lines changed
1 file changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -246,9 +246,6 @@ void QgsFieldCalculator::accept()
246
246
bool calculationSuccess = true ;
247
247
QString error;
248
248
249
- bool onlySelected = mOnlyUpdateSelectedCheckBox ->isChecked ();
250
- QgsFeatureIds selectedIds = mVectorLayer ->selectedFeaturesIds ();
251
-
252
249
bool useGeometry = exp .needsGeometry ();
253
250
int rownum = 1 ;
254
251
@@ -259,17 +256,14 @@ void QgsFieldCalculator::accept()
259
256
if ( newField )
260
257
emptyAttribute = QVariant ( field.type () );
261
258
262
- QgsFeatureIterator fit = mVectorLayer ->getFeatures ( QgsFeatureRequest ().setFlags ( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) );
259
+ QgsFeatureRequest req = QgsFeatureRequest ().setFlags ( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry );
260
+ if ( mOnlyUpdateSelectedCheckBox ->isChecked () )
261
+ {
262
+ req.setFilterFids ( mVectorLayer ->selectedFeaturesIds () );
263
+ }
264
+ QgsFeatureIterator fit = mVectorLayer ->getFeatures ( req );
263
265
while ( fit.nextFeature ( feature ) )
264
266
{
265
- if ( onlySelected )
266
- {
267
- if ( !selectedIds.contains ( feature.id () ) )
268
- {
269
- continue ;
270
- }
271
- }
272
-
273
267
expContext.setFeature ( feature );
274
268
expContext.lastScope ()->setVariable ( QString ( " row_number" ), rownum );
275
269
You can’t perform that action at this time.
0 commit comments