Fix performance issues with moving selection on canvas (Funded by good will)

m-kuhn · m-kuhn · commit 68c49fe09a4e · 2014-09-22T12:30:48.000+02:00
Fix #11197
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;

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,9 @@ void QgsMapToolMoveFeature::canvasPressEvent( QMouseEvent * e )`
`120`	`120`	`mMovedFeatures = vlayer->selectedFeaturesIds();`
`121`	`121`
`122`	`122`	`mRubberBand = createRubberBand( vlayer->geometryType() );`
`123`		`- for ( int i = 0; i < vlayer->selectedFeatureCount(); i++ )`
	`123`	`+ Q_FOREACH( const QgsFeature& feat, vlayer->selectedFeatures() )`
`124`	`124`	`{`
`125`		`- mRubberBand->addGeometry( vlayer->selectedFeatures()[i].geometry(), vlayer );`
	`125`	`+ mRubberBand->addGeometry( feat.geometry(), vlayer );`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`