Apply non-string parts of patch #2938

mhugent · mhugent · commit d3319b0b7b62 · 2010-11-03T11:57:34.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14497 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -29,15 +29,15 @@
 
 
 QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas )
-    : QgsMapTool( canvas )
+  : QgsMapTool( canvas )
 {
   mCursor = Qt::ArrowCursor;
 }
 
 void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
 {
   QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas );
-  if ( vlayer == NULL )
+  if( vlayer == NULL )
   {
     return;
   }
@@ -46,9 +46,8 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
   QgsMapToolSelectUtils::expandSelectRectangle( selectRect, vlayer, e->pos() );
   QgsMapToolSelectUtils::setRubberBand( mCanvas, selectRect, &rubberBand );
   QgsGeometry* selectGeom = rubberBand.asGeometry();
-  bool addSelection = e->modifiers() & Qt::ControlModifier ? true : false;
-  bool substractSelection = e->modifiers() & Qt::ShiftModifier ? true : false;
-  QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, addSelection, substractSelection, true );
+  bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
+  QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, doDifference, true );
   delete selectGeom;
   rubberBand.reset( true );
 }
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -81,8 +81,7 @@ void QgsMapToolSelectUtils::expandSelectRectangle( QRect& selectRect,
 void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
     QgsGeometry* selectGeometry,
     bool doContains,
-    bool addSelection,
-    bool substractSelection,
+    bool doDifference,
     bool singleSelect )
 {
   if( selectGeometry->type() != QGis::Polygon )
@@ -124,8 +123,7 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
   QgsDebugMsg( "Selection layer: " + vlayer->name() );
   QgsDebugMsg( "Selection polygon: " + selectGeomTrans.exportToWkt() );
   QgsDebugMsg( "doContains: " + QString( doContains ? "T" : "F" ) );
-  QgsDebugMsg( "addSelection: " + QString( addSelection ? "T" : "F" ) );
-  QgsDebugMsg( "substractSelection: " + QString( substractSelection ? "T" : "F" ) );
+  QgsDebugMsg( "doDifference: " + QString( doDifference ? "T" : "F" ) );
 
   vlayer->select( QgsAttributeList(), selectGeomTrans.boundingBox(), true, true );
 
@@ -161,20 +159,10 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
     newSelectedFeatures.insert( closestFeatureId );
   }
 
-  QgsDebugMsg( "Number of selected features: " + QString::number( newSelectedFeatures.size() ) );
+  QgsDebugMsg( "Number of new selected features: " + QString::number( newSelectedFeatures.size() ) );
 
   QgsFeatureIds layerSelectedFeatures;
-  if( addSelection )
-  {
-    layerSelectedFeatures = vlayer->selectedFeaturesIds();
-    QgsFeatureIds::const_iterator i = newSelectedFeatures.constEnd();
-    while( i != newSelectedFeatures.constBegin() )
-    {
-      --i;
-      layerSelectedFeatures.insert( *i );
-    }
-  }
-  else if( substractSelection )
+  if( doDifference )
   {
     layerSelectedFeatures = vlayer->selectedFeaturesIds();
     QgsFeatureIds::const_iterator i = newSelectedFeatures.constEnd();
@@ -185,6 +173,10 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
       {
         layerSelectedFeatures.remove( *i );
       }
+      else
+      {
+        layerSelectedFeatures.insert( *i );
+      }
     }
   }
   else
@@ -198,8 +190,7 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
 
 void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas, QgsGeometry* selectGeometry, QMouseEvent * e )
 {
-  bool doContains = e->modifiers() & Qt::AltModifier ? true : false;
-  bool addSelection = e->modifiers() & Qt::ControlModifier ? true : false;
-  bool substractSelection = e->modifiers() & Qt::ShiftModifier ? true : false;
-  setSelectFeatures( canvas, selectGeometry, doContains, addSelection, substractSelection );
+  bool doContains = e->modifiers() & Qt::ShiftModifier ? true : false;
+  bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
+  setSelectFeatures( canvas, selectGeometry, doContains, doDifference );
 }
diff --git a/src/app/qgsmaptoolselectutils.h b/src/app/qgsmaptoolselectutils.h
@@ -40,17 +40,14 @@ namespace QgsMapToolSelectUtils
     must be in terms of the canvas coordinate system.
     @param doContains Features will only be selected if contained within the
     selection rubber band.
-    @param addSelection New selected features will be added to the layer's
-    currently selected features.
-    @param substractSelection New selected features will be subtracted from
-    the layer's currently selected features.
+    @param doDifference Take the symmetric difference of the the current selected
+    features and the new features found within the provided selectGeometry.
     @param singleSelect Only selects the closest feature to the selectGeometry.
   */
   void setSelectFeatures( QgsMapCanvas* canvas,
                           QgsGeometry* selectGeometry,
                           bool doContains = true,
-                          bool addSelection = false,
-                          bool substractSelection = false,
+                          bool doDifference = false,
                           bool singleSelect = false );
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@`
`29`	`29`
`30`	`30`
`31`	`31`	`QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas )`
`32`		`- : QgsMapTool( canvas )`
	`32`	`+ : QgsMapTool( canvas )`
`33`	`33`	`{`
`34`	`34`	`mCursor = Qt::ArrowCursor;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )`
`38`	`38`	`{`
`39`	`39`	`QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas );`
`40`		`- if ( vlayer == NULL )`
	`40`	`+ if( vlayer == NULL )`
`41`	`41`	`{`
`42`	`42`	`return;`
`43`	`43`	`}`
`@@ -46,9 +46,8 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )`
`46`	`46`	`QgsMapToolSelectUtils::expandSelectRectangle( selectRect, vlayer, e->pos() );`
`47`	`47`	`QgsMapToolSelectUtils::setRubberBand( mCanvas, selectRect, &rubberBand );`
`48`	`48`	`QgsGeometry* selectGeom = rubberBand.asGeometry();`
`49`		`- bool addSelection = e->modifiers() & Qt::ControlModifier ? true : false;`
`50`		`- bool substractSelection = e->modifiers() & Qt::ShiftModifier ? true : false;`
`51`		`- QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, addSelection, substractSelection, true );`
	`49`	`+ bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;`
	`50`	`+ QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, doDifference, true );`
`52`	`51`	`delete selectGeom;`
`53`	`52`	`rubberBand.reset( true );`
`54`	`53`	`}`