Skip to content

Commit 305272c

Browse files
author
jef
committedAug 12, 2010
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
·
final-1_7_1final-1_7_0
1 parent 1c804db commit 305272c

31 files changed

+1350
-156
lines changed
 

‎images/images.qrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,10 @@
194194
<file>themes/default/mActionSaveMapAsImage.png</file>
195195
<file>themes/default/mActionScaleBar.png</file>
196196
<file>themes/default/mActionSelect.png</file>
197+
<file>themes/default/mActionSelectRectangle.png</file>
198+
<file>themes/default/mActionSelectFreehand.png</file>
199+
<file>themes/default/mActionSelectPolygon.png</file>
200+
<file>themes/default/mActionSelectRadius.png</file>
197201
<file>themes/default/mActionSelectedToTop.png</file>
198202
<file>themes/default/mActionSelectPan.png</file>
199203
<file>themes/default/mActionShowAllLayers.png</file>

‎images/themes/default/mActionDeselectAll.png

224 Bytes
Loading

‎images/themes/default/mActionSelect.png

302 Bytes
Loading

‎images/themes/default/mActionSelectFreehand.png

2.01 KB
Loading

‎images/themes/default/mActionSelectPolygon.png

1.93 KB
Loading

‎images/themes/default/mActionSelectRadius.png

1.92 KB
Loading

‎images/themes/default/mActionSelectRectangle.png

1.84 KB
Loading

‎images/themes/default/selectTools.svg

Lines changed: 220 additions & 0 deletions
Loading

‎python/gui/qgisinterface.sip

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,10 @@ class QgisInterface : QObject
193193
virtual QAction *actionZoomIn() = 0;
194194
virtual QAction *actionZoomOut() = 0;
195195
virtual QAction *actionSelect() = 0;
196+
virtual QAction *actionSelectRectangle() = 0;
197+
virtual QAction *actionSelectPolygon() = 0;
198+
virtual QAction *actionSelectFreehand() = 0;
199+
virtual QAction *actionSelectRadius() = 0;
196200
virtual QAction *actionIdentify() = 0;
197201
virtual QAction *actionMeasure() = 0;
198202
virtual QAction *actionMeasureArea() = 0;

‎python/gui/qgsrubberband.sip

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ class QgsRubberBand: QgsMapCanvasItem
5757

5858
/**Return vertex*/
5959
const QgsPoint *getPoint(int i, int j=0) const;
60+
61+
/**Returns the rubberband as a Geometry.
62+
* added in 1.6 */
63+
QgsGeometry* asGeometry();
6064

6165
protected:
6266
virtual void paint(QPainter* p);

‎src/app/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ SET(QGIS_APP_SRCS
4949
qgsmaptoolreshape.cpp
5050
qgsmaptoolrotatepointsymbols.cpp
5151
qgsmaptoolselect.cpp
52+
qgsmaptoolselectrectangle.cpp
53+
qgsmaptoolselectfreehand.cpp
54+
qgsmaptoolselectpolygon.cpp
55+
qgsmaptoolselectradius.cpp
56+
qgsmaptoolselectutils.cpp
5257
qgsmaptoolsimplify.cpp
5358
qgsmaptoolsplitfeatures.cpp
5459
qgsmaptooltextannotation.cpp
@@ -163,6 +168,10 @@ SET (QGIS_APP_MOC_HDRS
163168
qgsmaptoolreshape.h
164169
qgsmaptoolrotatepointsymbols.h
165170
qgsmaptoolselect.h
171+
qgsmaptoolselectrectangle.h
172+
qgsmaptoolselectfreehand.h
173+
qgsmaptoolselectpolygon.h
174+
qgsmaptoolselectradius.h
166175
qgsmaptooladdvertex.h
167176
qgsmaptooldeletering.h
168177
qgsmaptooldeletepart.h

0 commit comments

Comments
 (0)
Please sign in to comment.