Skip to content

Commit 5bb820b

Browse files
author
cfarmer
committedMar 9, 2009
add two new tools - polygon from layer extent - delaunay triangulaltion
changes to menu item - sampling tools -> research tools git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10265 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 4fe08d0 commit 5bb820b

File tree

15 files changed

+1418
-121
lines changed

15 files changed

+1418
-121
lines changed
 

‎python/plugins/fTools/fTools.py

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ def initGui( self ):
9797
self.analysisMenu.addActions( [ self.distMatrix, self.sumLines, self.pointsPoly,
9898
self.listUnique, self.compStats, self.nearestNeigh, self.meanCoords, self.intLines ] )
9999

100-
self.samplingMenu = QMenu( QCoreApplication.translate( "fTools", "&Sampling Tools" ) )
101-
self.samplingMenu.setIcon( QIcon( self.getThemeIcon( "sampling.png" ) ) )
100+
self.researchMenu = QMenu( QCoreApplication.translate( "fTools", "&Research Tools" ) )
101+
self.researchMenu.setIcon( QIcon( self.getThemeIcon( "sampling.png" ) ) )
102102
self.randSel = QAction( QIcon( self.getThemeIcon( "random_selection.png" ) ),
103103
QCoreApplication.translate( "fTools", "Random selection" ),self.iface.mainWindow() )
104104
self.randSub = QAction( QIcon( self.getThemeIcon( "sub_selection.png" ) ),
@@ -111,8 +111,10 @@ def initGui( self ):
111111
QCoreApplication.translate( "fTools", "Vector grid" ), self.iface.mainWindow() )
112112
self.selectLocation = QAction( QIcon( self.getThemeIcon( "select_location.png" ) ),
113113
QCoreApplication.translate( "fTools", "Select by location" ), self.iface.mainWindow() )
114-
self.samplingMenu.addActions( [ self.randSel, self.randSub, self.randPoints,
115-
self.regPoints, self.vectGrid, self.selectLocation ] )
114+
self.layerExtent = QAction( QIcon( self.getThemeIcon( "layer_extent.png" ) ),
115+
QCoreApplication.translate( "fTools", "Polygon from layer extent" ), self.iface.mainWindow() )
116+
self.researchMenu.addActions( [ self.randSel, self.randSub, self.randPoints,
117+
self.regPoints, self.vectGrid, self.selectLocation, self.layerExtent ] )
116118

117119
self.geoMenu = QMenu( QCoreApplication.translate( "fTools", "&Geoprocessing Tools" ) )
118120
self.geoMenu.setIcon( QIcon( self.getThemeIcon( "geoprocessing.png" ) ) )
@@ -143,6 +145,8 @@ def initGui( self ):
143145
QCoreApplication.translate( "fTools", "Check geometry validity" ),self.iface.mainWindow() )
144146
self.centroids = QAction( QIcon( self.getThemeIcon( "centroids.png") ),
145147
QCoreApplication.translate( "fTools", "Polygon centroids" ),self.iface.mainWindow() )
148+
self.delaunay = QAction( QIcon( self.getThemeIcon( "delaunay.png") ),
149+
QCoreApplication.translate( "fTools", "Delaunay triangulation" ),self.iface.mainWindow() )
146150
self.extNodes = QAction( QIcon( self.getThemeIcon( "extract_nodes.png") ),
147151
QCoreApplication.translate( "fTools", "Extract nodes" ),self.iface.mainWindow() )
148152
self.simplify = QAction( QIcon( self.getThemeIcon( "simplify.png") ),
@@ -153,8 +157,8 @@ def initGui( self ):
153157
QCoreApplication.translate( "fTools", "Singleparts to multipart" ),self.iface.mainWindow() )
154158
self.polysToLines = QAction( QIcon( self.getThemeIcon( "to_lines.png") ),
155159
QCoreApplication.translate( "fTools", "Polygons to lines" ),self.iface.mainWindow() )
156-
self.conversionMenu.addActions( [ self.checkGeom, self.compGeo, self.centroids, self.simplify,
157-
self.multiToSingle, self.singleToMulti, self.polysToLines, self.extNodes ] )
160+
self.conversionMenu.addActions( [ self.checkGeom, self.compGeo, self.centroids, self.delaunay,
161+
self.simplify, self.multiToSingle, self.singleToMulti, self.polysToLines, self.extNodes] )
158162

159163
self.dataManageMenu = QMenu( QCoreApplication.translate( "fTools", "&Data Management Tools") )
160164
self.dataManageMenu.setIcon( QIcon( self.getThemeIcon( "management.png") ) )
@@ -170,21 +174,21 @@ def initGui( self ):
170174
QCoreApplication.translate( "fTools", "Split vector layer" ), self.iface.mainWindow() )
171175
self.dataManageMenu.addActions( [ self.project, self.define, self.joinAttr, self.spatJoin, self.splitVect ] )
172176

173-
self.ftools_about = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ),
174-
QCoreApplication.translate( "fTools", "About fTools" ), self.iface.mainWindow() )
177+
self.ftools_aboot = QAction( QIcon( self.getThemeIcon( "ftools_logo.png" ) ),
178+
QCoreApplication.translate( "fTools", "fTools About" ), self.iface.mainWindow() )
175179

176180
self.menu.addMenu( self.analysisMenu )
177-
self.menu.addMenu( self.samplingMenu )
181+
self.menu.addMenu( self.researchMenu )
178182
self.menu.addMenu( self.geoMenu )
179183
self.menu.addMenu( self.conversionMenu )
180184
self.menu.addMenu( self.dataManageMenu )
181185
self.menu.addSeparator()
182-
self.menu.addAction( self.ftools_about )
186+
self.menu.addAction( self.ftools_aboot )
183187

184188
menuBar = self.iface.mainWindow().menuBar()
185189
actions = menuBar.actions()
186-
helpAction = actions[ len( actions ) - 1 ]
187-
menuBar.insertMenu( helpAction, self.menu )
190+
lastAction = actions[ len( actions ) - 1 ]
191+
menuBar.insertMenu( lastAction, self.menu )
188192

189193
QObject.connect( self.distMatrix, SIGNAL("triggered()"), self.dodistMatrix )
190194
QObject.connect( self.sumLines, SIGNAL("triggered()"), self.dosumLines )
@@ -201,6 +205,7 @@ def initGui( self ):
201205
QObject.connect( self.regPoints, SIGNAL("triggered()"), self.doregPoints )
202206
QObject.connect( self.vectGrid, SIGNAL("triggered()"), self.dovectGrid )
203207
QObject.connect( self.selectLocation, SIGNAL("triggered()"), self.doselectLocation )
208+
QObject.connect( self.layerExtent, SIGNAL("triggered()"), self.doextent )
204209

205210
QObject.connect( self.minConvex, SIGNAL("triggered()"), self.dominConvex )
206211
QObject.connect( self.intersect, SIGNAL("triggered()"), self.dointersect )
@@ -216,6 +221,7 @@ def initGui( self ):
216221
QObject.connect( self.checkGeom, SIGNAL("triggered()"), self.docheckGeom )
217222
QObject.connect( self.simplify, SIGNAL("triggered()"), self.dosimplify )
218223
QObject.connect( self.centroids, SIGNAL("triggered()"), self.docentroids )
224+
QObject.connect( self.delaunay, SIGNAL("triggered()"), self.dodelaunay )
219225
QObject.connect( self.polysToLines, SIGNAL("triggered()"), self.dopolysToLines )
220226
QObject.connect( self.compGeo, SIGNAL("triggered()"), self.docompGeo )
221227
QObject.connect( self.extNodes, SIGNAL("triggered()"), self.doextNodes )
@@ -226,7 +232,7 @@ def initGui( self ):
226232
QObject.connect( self.spatJoin, SIGNAL("triggered()"), self.dospatJoin )
227233
QObject.connect( self.splitVect, SIGNAL("triggered()"), self.dosplitVect )
228234

229-
QObject.connect( self.ftools_about, SIGNAL("triggered()"), self.doabout )
235+
QObject.connect( self.ftools_aboot, SIGNAL("triggered()"), self.doaboot )
230236

231237
def unload( self ):
232238
pass
@@ -302,6 +308,14 @@ def dodistMatrix( self ):
302308
def docentroids( self ):
303309
d = doGeometry.GeometryDialog( self.iface, 7 )
304310
d.exec_()
311+
312+
def dodelaunay( self ):
313+
d = doGeometry.GeometryDialog( self.iface, 8 )
314+
d.exec_()
315+
316+
def doextent( self ):
317+
d = doGeometry.GeometryDialog( self.iface, 9 )
318+
d.exec_()
305319

306320
def dosumLines(self):
307321
d = doSumLines.Dialog(self.iface)
@@ -371,6 +385,6 @@ def dospatJoin( self ):
371385
d = doSpatialJoin.Dialog( self.iface )
372386
d.exec_()
373387

374-
def doabout( self ):
388+
def doaboot( self ):
375389
d = doAbout.Dialog( self.iface )
376390
d.exec_()

‎python/plugins/fTools/icons/default/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ vector_grid.png
4343
random_selection.png
4444
ftools_logo.png
4545
regular_points.png
46+
delaunay.png
47+
layer_extent.png
4648
)
4749
INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons/default)

‎python/plugins/fTools/icons/default/delaunay.png

1.39 KB
Loading

‎python/plugins/fTools/icons/default/layer_extent.png

607 Bytes
Loading

‎python/plugins/fTools/icons/gis-0.1.svg

Lines changed: 58 additions & 27 deletions
Loading

‎python/plugins/fTools/icons/gis/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ vector_grid.png
4343
random_selection.png
4444
ftools_logo.png
4545
regular_points.png
46+
delaunay.png
47+
layer_extent.png
4648
)
4749
INSTALL(FILES ${ICON_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/fTools/icons/gis)

‎python/plugins/fTools/icons/gis/delaunay.png

1.39 KB
Loading

‎python/plugins/fTools/icons/gis/layer_extent.png

607 Bytes
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.