add advanced selection tools from Jeremy Palmer. Thanks. (apply #2938)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14071 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 12, 2010 · 305272c · 305272c
1 parent 1c804db
commit 305272c
Show file tree

Hide file tree

Showing 31 changed files with 1,350 additions and 156 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -194,6 +194,10 @@
     <file>themes/default/mActionSaveMapAsImage.png</file>
     <file>themes/default/mActionScaleBar.png</file>
     <file>themes/default/mActionSelect.png</file>
+    <file>themes/default/mActionSelectRectangle.png</file>
+    <file>themes/default/mActionSelectFreehand.png</file>
+    <file>themes/default/mActionSelectPolygon.png</file>
+    <file>themes/default/mActionSelectRadius.png</file>
     <file>themes/default/mActionSelectedToTop.png</file>
     <file>themes/default/mActionSelectPan.png</file>
     <file>themes/default/mActionShowAllLayers.png</file>

diff --git a/images/themes/default/mActionDeselectAll.png b/images/themes/default/mActionDeselectAll.png
diff --git a/images/themes/default/mActionSelect.png b/images/themes/default/mActionSelect.png
diff --git a/images/themes/default/mActionSelectFreehand.png b/images/themes/default/mActionSelectFreehand.png
diff --git a/images/themes/default/mActionSelectPolygon.png b/images/themes/default/mActionSelectPolygon.png
diff --git a/images/themes/default/mActionSelectRadius.png b/images/themes/default/mActionSelectRadius.png
diff --git a/images/themes/default/mActionSelectRectangle.png b/images/themes/default/mActionSelectRectangle.png
diff --git a/images/themes/default/selectTools.svg b/images/themes/default/selectTools.svg
diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -193,6 +193,10 @@ class QgisInterface : QObject
     virtual QAction *actionZoomIn() = 0;
     virtual QAction *actionZoomOut() = 0;
     virtual QAction *actionSelect() = 0;
+    virtual QAction *actionSelectRectangle() = 0;
+    virtual QAction *actionSelectPolygon() = 0;
+    virtual QAction *actionSelectFreehand() = 0;
+    virtual QAction *actionSelectRadius() = 0;
     virtual QAction *actionIdentify() = 0;
     virtual QAction *actionMeasure() = 0;
     virtual QAction *actionMeasureArea() = 0;

diff --git a/python/gui/qgsrubberband.sip b/python/gui/qgsrubberband.sip
@@ -57,6 +57,10 @@ class QgsRubberBand: QgsMapCanvasItem
 
     /**Return vertex*/
     const QgsPoint *getPoint(int i, int j=0) const;
+
+    /**Returns the rubberband as a Geometry.
+    * added in 1.6 */
+    QgsGeometry* asGeometry();
 
   protected:
     virtual void paint(QPainter* p);

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -49,6 +49,11 @@ SET(QGIS_APP_SRCS
   qgsmaptoolreshape.cpp
   qgsmaptoolrotatepointsymbols.cpp
   qgsmaptoolselect.cpp
+  qgsmaptoolselectrectangle.cpp
+  qgsmaptoolselectfreehand.cpp
+  qgsmaptoolselectpolygon.cpp
+  qgsmaptoolselectradius.cpp
+  qgsmaptoolselectutils.cpp
   qgsmaptoolsimplify.cpp
   qgsmaptoolsplitfeatures.cpp
   qgsmaptooltextannotation.cpp
@@ -163,6 +168,10 @@ SET (QGIS_APP_MOC_HDRS
   qgsmaptoolreshape.h
   qgsmaptoolrotatepointsymbols.h
   qgsmaptoolselect.h
+  qgsmaptoolselectrectangle.h
+  qgsmaptoolselectfreehand.h
+  qgsmaptoolselectpolygon.h
+  qgsmaptoolselectradius.h
   qgsmaptooladdvertex.h
   qgsmaptooldeletering.h
   qgsmaptooldeletepart.h