Merge pull request #6835 from wonder-sk/identify-selection-modes

[FEATURE] Identify: more selection modes (simple / polygon / freehand / radius)
qgis · Apr 26, 2018 · e811c54 · e811c54
2 parents 16a6a90 + f2a2eeb
commit e811c54
Show file tree

Hide file tree

Showing 30 changed files with 1,268 additions and 950 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -649,6 +649,10 @@
         <file>themes/default/mActionNewReport.svg</file>
         <file>themes/default/mIconReport.svg</file>
         <file>themes/default/downloading_svg.svg</file>
+        <file>themes/default/mActionIdentifyByFreehand.svg</file>
+        <file>themes/default/mActionIdentifyByPolygon.svg</file>
+        <file>themes/default/mActionIdentifyByRadius.svg</file>
+        <file>themes/default/mActionIdentifyByRectangle.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mActionIdentifyByFreehand.svg b/images/themes/default/mActionIdentifyByFreehand.svg
diff --git a/images/themes/default/mActionIdentifyByPolygon.svg b/images/themes/default/mActionIdentifyByPolygon.svg
diff --git a/images/themes/default/mActionIdentifyByRadius.svg b/images/themes/default/mActionIdentifyByRadius.svg
diff --git a/images/themes/default/mActionIdentifyByRectangle.svg b/images/themes/default/mActionIdentifyByRectangle.svg
diff --git a/python/gui/qgsmaptoolidentify.sip.in b/python/gui/qgsmaptoolidentify.sip.in
@@ -108,6 +108,16 @@ this has been made private and two publics methods are offered
 :return: a list of IdentifyResult*
 %End
 
+    QList<QgsMapToolIdentify::IdentifyResult> identify( const QgsGeometry &geometry, IdentifyMode mode, LayerType layerType );
+%Docstring
+Performs identification based on a geometry (in map coordinates)
+%End
+    QList<QgsMapToolIdentify::IdentifyResult> identify( const QgsGeometry &geometry, IdentifyMode mode, const QList<QgsMapLayer *> &layerList, LayerType layerType );
+%Docstring
+Performs identification based on a geometry (in map coordinates)
+%End
+
+
     QgsIdentifyMenu *identifyMenu();
 %Docstring
 return a pointer to the identify menu which will be used in layer selection mode

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -97,10 +97,7 @@ SET(QGIS_APP_SRCS
   qgsmaptoolrotatelabel.cpp
   qgsmaptoolrotatepointsymbols.cpp
   qgsmaptoolselect.cpp
-  qgsmaptoolselectrectangle.cpp
-  qgsmaptoolselectfreehand.cpp
-  qgsmaptoolselectpolygon.cpp
-  qgsmaptoolselectradius.cpp
+  qgsmaptoolselectionhandler.cpp
   qgsmaptoolselectutils.cpp
   qgsmaptoolsimplify.cpp
   qgsmaptoolsplitfeatures.cpp
@@ -310,11 +307,8 @@ SET (QGIS_APP_MOC_HDRS
   qgsmaptoolrotatefeature.h
   qgsmaptoolrotatelabel.h
   qgsmaptoolrotatepointsymbols.h
-  qgsmaptoolselectfreehand.h
   qgsmaptoolselect.h
-  qgsmaptoolselectpolygon.h
-  qgsmaptoolselectradius.h
-  qgsmaptoolselectrectangle.h
+  qgsmaptoolselectionhandler.h
   qgsmaptoolsimplify.h
   qgsmaptoolsplitfeatures.h
   qgsmaptoolsplitparts.h

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -386,10 +386,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgsmaptooloffsetpointsymbol.h"
 #include "qgsmaptoolpan.h"
 #include "qgsmaptoolselect.h"
-#include "qgsmaptoolselectrectangle.h"
-#include "qgsmaptoolselectfreehand.h"
-#include "qgsmaptoolselectpolygon.h"
-#include "qgsmaptoolselectradius.h"
 #include "qgsmaptoolsvgannotation.h"
 #include "qgsmaptoolreshape.h"
 #include "qgsmaptoolrotatepointsymbols.h"
@@ -1317,7 +1313,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   // should come after fileNewBlank to ensure project is properly set up to receive any data source files
   QgsApplication::setFileOpenEventReceiver( this );
 
-
 #ifdef ANDROID
   toggleFullScreen();
 #endif
@@ -3413,14 +3408,18 @@ void QgisApp::createCanvasTools()
   mMapTools.mSplitFeatures->setAction( mActionSplitFeatures );
   mMapTools.mSplitParts = new QgsMapToolSplitParts( mMapCanvas );
   mMapTools.mSplitParts->setAction( mActionSplitParts );
-  mMapTools.mSelectFeatures = new QgsMapToolSelectFeatures( mMapCanvas );
+  mMapTools.mSelectFeatures = new QgsMapToolSelect( mMapCanvas );
   mMapTools.mSelectFeatures->setAction( mActionSelectFeatures );
-  mMapTools.mSelectPolygon = new QgsMapToolSelectPolygon( mMapCanvas );
+  mMapTools.mSelectFeatures->setSelectionMode( QgsMapToolSelectionHandler::SelectSimple );
+  mMapTools.mSelectPolygon = new QgsMapToolSelect( mMapCanvas );
   mMapTools.mSelectPolygon->setAction( mActionSelectPolygon );
-  mMapTools.mSelectFreehand = new QgsMapToolSelectFreehand( mMapCanvas );
+  mMapTools.mSelectPolygon->setSelectionMode( QgsMapToolSelectionHandler::SelectPolygon );
+  mMapTools.mSelectFreehand = new QgsMapToolSelect( mMapCanvas );
   mMapTools.mSelectFreehand->setAction( mActionSelectFreehand );
-  mMapTools.mSelectRadius = new QgsMapToolSelectRadius( mMapCanvas );
+  mMapTools.mSelectFreehand->setSelectionMode( QgsMapToolSelectionHandler::SelectFreehand );
+  mMapTools.mSelectRadius = new QgsMapToolSelect( mMapCanvas );
   mMapTools.mSelectRadius->setAction( mActionSelectRadius );
+  mMapTools.mSelectRadius->setSelectionMode( QgsMapToolSelectionHandler::SelectRadius );
   mMapTools.mAddRing = new QgsMapToolAddRing( mMapCanvas );
   mMapTools.mAddRing->setAction( mActionAddRing );
   mMapTools.mFillRing = new QgsMapToolFillRing( mMapCanvas );