apply patch #3280 from Jeremy Palmer

borysiasty · borysiasty · commit 16f326f0af1e · 2010-12-02T08:44:48.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14826 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -135,9 +135,15 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
   while( vlayer->nextFeature( f ) )
   {
     QgsGeometry* g = f.geometry();
-    if( doContains && !selectGeomTrans.contains( g ) )
+    if( doContains )
     {
-      continue;
+      if ( !selectGeomTrans.contains( g ) )
+        continue;
+    }
+    else
+    {
+      if ( !selectGeomTrans.intersects( g ) )
+        continue;
     }
     if( singleSelect )
     {

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,15 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,`
`135`	`135`	`while( vlayer->nextFeature( f ) )`
`136`	`136`	`{`
`137`	`137`	`QgsGeometry* g = f.geometry();`
`138`		`- if( doContains && !selectGeomTrans.contains( g ) )`
	`138`	`+ if( doContains )`
`139`	`139`	`{`
`140`		`- continue;`
	`140`	`+ if ( !selectGeomTrans.contains( g ) )`
	`141`	`+ continue;`
	`142`	`+ }`
	`143`	`+ else`
	`144`	`+ {`
	`145`	`+ if ( !selectGeomTrans.intersects( g ) )`
	`146`	`+ continue;`
`141`	`147`	`}`
`142`	`148`	`if( singleSelect )`
`143`	`149`	`{`