Fix performance issues with moving selection on canvas (Funded by goo…

…d will) Fix #11197
qgis · Sep 22, 2014 · 68c49fe · 68c49fe
1 parent 96e39f7
commit 68c49fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp
@@ -120,9 +120,9 @@ void QgsMapToolMoveFeature::canvasPressEvent( QMouseEvent * e )
     mMovedFeatures = vlayer->selectedFeaturesIds();
 
     mRubberBand = createRubberBand( vlayer->geometryType() );
-    for ( int i = 0; i < vlayer->selectedFeatureCount(); i++ )
+    Q_FOREACH( const QgsFeature& feat, vlayer->selectedFeatures() )
     {
-      mRubberBand->addGeometry( vlayer->selectedFeatures()[i].geometry(), vlayer );
+      mRubberBand->addGeometry( feat.geometry(), vlayer );
     }
   }
 

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2305,10 +2305,14 @@ QgsFeatureList QgsVectorLayer::selectedFeatures()
   if ( geometryType() == QGis::NoGeometry )
     req.setFlags( QgsFeatureRequest::NoGeometry );
 
-  foreach ( QgsFeatureId fid, mSelectedFeatureIds )
+  req.setFilterFids( mSelectedFeatureIds );
+
+  QgsFeatureIterator it = getFeatures( req );
+
+  QgsFeature f;
+  while ( it.nextFeature( f ) )
   {
-    features.push_back( QgsFeature() );
-    getFeatures( req.setFilterFid( fid ) ).nextFeature( features.back() );
+    features.push_back( f );
   }
 
   return features;