Skip to content

Commit

Permalink
add advanced selection tools from Jeremy Palmer. Thanks. (apply #2938)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14071 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 12, 2010
1 parent 2843a93 commit 29fa6f2
Show file tree
Hide file tree
Showing 31 changed files with 1,350 additions and 156 deletions.
4 changes: 4 additions & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file modified images/themes/default/mActionDeselectAll.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/themes/default/mActionSelect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/themes/default/mActionSelectFreehand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/themes/default/mActionSelectPolygon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/themes/default/mActionSelectRadius.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/themes/default/mActionSelectRectangle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
220 changes: 220 additions & 0 deletions images/themes/default/selectTools.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions python/gui/qgisinterface.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions python/gui/qgsrubberband.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 29fa6f2

Please sign in to comment.