Skip to content

Commit

Permalink
cleanup in fTools menu creation code
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy committed Aug 14, 2012
1 parent 6649738 commit 880354f
Showing 1 changed file with 98 additions and 116 deletions.
214 changes: 98 additions & 116 deletions python/plugins/fTools/fTools.py
Expand Up @@ -185,70 +185,55 @@ def initGui(self):
self.dataManageMenu.addActions([self.define, self.spatJoin, self.splitVect, self.mergeShapes, self.spatialIndex]) self.dataManageMenu.addActions([self.define, self.spatJoin, self.splitVect, self.mergeShapes, self.spatialIndex])
self.updateThemeIcons("theme") self.updateThemeIcons("theme")


self.menu = None menuName = QCoreApplication.translate("fTools", "&Analysis Tools")
if hasattr(self.iface, "addPluginToVectorMenu"): self.iface.addPluginToVectorMenu(menuName, self.distMatrix)
menuName = QCoreApplication.translate("fTools", "&Analysis Tools") self.iface.addPluginToVectorMenu(menuName, self.sumLines)
self.iface.addPluginToVectorMenu(menuName, self.distMatrix) self.iface.addPluginToVectorMenu(menuName, self.pointsPoly)
self.iface.addPluginToVectorMenu(menuName, self.sumLines) self.iface.addPluginToVectorMenu(menuName, self.listUnique)
self.iface.addPluginToVectorMenu(menuName, self.pointsPoly) self.iface.addPluginToVectorMenu(menuName, self.compStats)
self.iface.addPluginToVectorMenu(menuName, self.listUnique) self.iface.addPluginToVectorMenu(menuName, self.nearestNeigh)
self.iface.addPluginToVectorMenu(menuName, self.compStats) self.iface.addPluginToVectorMenu(menuName, self.meanCoords)
self.iface.addPluginToVectorMenu(menuName, self.nearestNeigh) self.iface.addPluginToVectorMenu(menuName, self.intLines)
self.iface.addPluginToVectorMenu(menuName, self.meanCoords)
self.iface.addPluginToVectorMenu(menuName, self.intLines) menuName = QCoreApplication.translate("fTools", "&Research Tools")

self.iface.addPluginToVectorMenu(menuName, self.randSel)
menuName = QCoreApplication.translate("fTools", "&Research Tools") self.iface.addPluginToVectorMenu(menuName, self.randSub)
self.iface.addPluginToVectorMenu(menuName, self.randSel) self.iface.addPluginToVectorMenu(menuName, self.randPoints)
self.iface.addPluginToVectorMenu(menuName, self.randSub) self.iface.addPluginToVectorMenu(menuName, self.regPoints)
self.iface.addPluginToVectorMenu(menuName, self.randPoints) self.iface.addPluginToVectorMenu(menuName, self.vectGrid)
self.iface.addPluginToVectorMenu(menuName, self.regPoints) self.iface.addPluginToVectorMenu(menuName, self.selectLocation)
self.iface.addPluginToVectorMenu(menuName, self.vectGrid) self.iface.addPluginToVectorMenu(menuName, self.layerExtent)
self.iface.addPluginToVectorMenu(menuName, self.selectLocation)
self.iface.addPluginToVectorMenu(menuName, self.layerExtent) menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools")

self.iface.addPluginToVectorMenu(menuName, self.minConvex)
menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools") self.iface.addPluginToVectorMenu(menuName, self.dynaBuffer)
self.iface.addPluginToVectorMenu(menuName, self.minConvex) self.iface.addPluginToVectorMenu(menuName, self.intersect)
self.iface.addPluginToVectorMenu(menuName, self.dynaBuffer) self.iface.addPluginToVectorMenu(menuName, self.union)
self.iface.addPluginToVectorMenu(menuName, self.intersect) self.iface.addPluginToVectorMenu(menuName, self.symDifference)
self.iface.addPluginToVectorMenu(menuName, self.union) self.iface.addPluginToVectorMenu(menuName, self.clip)
self.iface.addPluginToVectorMenu(menuName, self.symDifference) self.iface.addPluginToVectorMenu(menuName, self.erase)
self.iface.addPluginToVectorMenu(menuName, self.clip) self.iface.addPluginToVectorMenu(menuName, self.dissolve)
self.iface.addPluginToVectorMenu(menuName, self.erase)
self.iface.addPluginToVectorMenu(menuName, self.dissolve) menuName = QCoreApplication.translate("fTools", "G&eometry Tools")

self.iface.addPluginToVectorMenu(menuName, self.checkGeom)
menuName = QCoreApplication.translate("fTools", "G&eometry Tools") self.iface.addPluginToVectorMenu(menuName, self.compGeo)
self.iface.addPluginToVectorMenu(menuName, self.checkGeom) self.iface.addPluginToVectorMenu(menuName, self.centroids)
self.iface.addPluginToVectorMenu(menuName, self.compGeo) self.iface.addPluginToVectorMenu(menuName, self.delaunay)
self.iface.addPluginToVectorMenu(menuName, self.centroids) self.iface.addPluginToVectorMenu(menuName, self.voronoi)
self.iface.addPluginToVectorMenu(menuName, self.delaunay) self.iface.addPluginToVectorMenu(menuName, self.simplify)
self.iface.addPluginToVectorMenu(menuName, self.voronoi) self.iface.addPluginToVectorMenu(menuName, self.densify)
self.iface.addPluginToVectorMenu(menuName, self.simplify) self.iface.addPluginToVectorMenu(menuName, self.multiToSingle)
self.iface.addPluginToVectorMenu(menuName, self.densify) self.iface.addPluginToVectorMenu(menuName, self.singleToMulti)
self.iface.addPluginToVectorMenu(menuName, self.multiToSingle) self.iface.addPluginToVectorMenu(menuName, self.polysToLines)
self.iface.addPluginToVectorMenu(menuName, self.singleToMulti) self.iface.addPluginToVectorMenu(menuName, self.linesToPolys)
self.iface.addPluginToVectorMenu(menuName, self.polysToLines) self.iface.addPluginToVectorMenu(menuName, self.extNodes)
self.iface.addPluginToVectorMenu(menuName, self.linesToPolys)
self.iface.addPluginToVectorMenu(menuName, self.extNodes) menuName = QCoreApplication.translate("fTools", "&Data Management Tools")

self.iface.addPluginToVectorMenu(menuName, self.define)
menuName = QCoreApplication.translate("fTools", "&Data Management Tools") self.iface.addPluginToVectorMenu(menuName, self.spatJoin)
self.iface.addPluginToVectorMenu(menuName, self.define) self.iface.addPluginToVectorMenu(menuName, self.splitVect)
self.iface.addPluginToVectorMenu(menuName, self.spatJoin) self.iface.addPluginToVectorMenu(menuName, self.mergeShapes)
self.iface.addPluginToVectorMenu(menuName, self.splitVect) self.iface.addPluginToVectorMenu(menuName, self.spatialIndex)
self.iface.addPluginToVectorMenu(menuName, self.mergeShapes)
self.iface.addPluginToVectorMenu(menuName, self.spatialIndex)
else:
self.menu = QMenu()
self.menu.setTitle(QCoreApplication.translate("fTools", "Vect&or"))
self.menu.addMenu(self.analysisMenu)
self.menu.addMenu(self.researchMenu)
self.menu.addMenu(self.geoMenu)
self.menu.addMenu(self.conversionMenu)
self.menu.addMenu(self.dataManageMenu)

menu_bar = self.iface.mainWindow().menuBar()
actions = menu_bar.actions()
lastAction = actions[len(actions) - 1]
menu_bar.insertMenu(lastAction, self.menu)


QObject.connect(self.distMatrix, SIGNAL("triggered()"), self.dodistMatrix) QObject.connect(self.distMatrix, SIGNAL("triggered()"), self.dodistMatrix)
QObject.connect(self.sumLines, SIGNAL("triggered()"), self.dosumLines) QObject.connect(self.sumLines, SIGNAL("triggered()"), self.dosumLines)
Expand Down Expand Up @@ -296,58 +281,55 @@ def initGui(self):
QObject.connect(self.spatialIndex, SIGNAL("triggered()"), self.doSpatIndex) QObject.connect(self.spatialIndex, SIGNAL("triggered()"), self.doSpatIndex)


def unload(self): def unload(self):
if self.menu == None: menuName = QCoreApplication.translate("fTools", "&Analysis Tools")
menuName = QCoreApplication.translate("fTools", "&Analysis Tools") self.iface.removePluginVectorMenu(menuName, self.distMatrix)
self.iface.removePluginVectorMenu(menuName, self.distMatrix) self.iface.removePluginVectorMenu(menuName, self.sumLines)
self.iface.removePluginVectorMenu(menuName, self.sumLines) self.iface.removePluginVectorMenu(menuName, self.pointsPoly)
self.iface.removePluginVectorMenu(menuName, self.pointsPoly) self.iface.removePluginVectorMenu(menuName, self.listUnique)
self.iface.removePluginVectorMenu(menuName, self.listUnique) self.iface.removePluginVectorMenu(menuName, self.compStats)
self.iface.removePluginVectorMenu(menuName, self.compStats) self.iface.removePluginVectorMenu(menuName, self.nearestNeigh)
self.iface.removePluginVectorMenu(menuName, self.nearestNeigh) self.iface.removePluginVectorMenu(menuName, self.meanCoords)
self.iface.removePluginVectorMenu(menuName, self.meanCoords) self.iface.removePluginVectorMenu(menuName, self.intLines)
self.iface.removePluginVectorMenu(menuName, self.intLines)

menuName = QCoreApplication.translate("fTools", "&Research Tools")
menuName = QCoreApplication.translate("fTools", "&Research Tools") self.iface.removePluginVectorMenu(menuName, self.randSel)
self.iface.removePluginVectorMenu(menuName, self.randSel) self.iface.removePluginVectorMenu(menuName, self.randSub)
self.iface.removePluginVectorMenu(menuName, self.randSub) self.iface.removePluginVectorMenu(menuName, self.randPoints)
self.iface.removePluginVectorMenu(menuName, self.randPoints) self.iface.removePluginVectorMenu(menuName, self.regPoints)
self.iface.removePluginVectorMenu(menuName, self.regPoints) self.iface.removePluginVectorMenu(menuName, self.vectGrid)
self.iface.removePluginVectorMenu(menuName, self.vectGrid) self.iface.removePluginVectorMenu(menuName, self.selectLocation)
self.iface.removePluginVectorMenu(menuName, self.selectLocation) self.iface.removePluginVectorMenu(menuName, self.layerExtent)
self.iface.removePluginVectorMenu(menuName, self.layerExtent)

menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools")
menuName = QCoreApplication.translate("fTools", "&Geoprocessing Tools") self.iface.removePluginVectorMenu(menuName, self.minConvex)
self.iface.removePluginVectorMenu(menuName, self.minConvex) self.iface.removePluginVectorMenu(menuName, self.dynaBuffer)
self.iface.removePluginVectorMenu(menuName, self.dynaBuffer) self.iface.removePluginVectorMenu(menuName, self.intersect)
self.iface.removePluginVectorMenu(menuName, self.intersect) self.iface.removePluginVectorMenu(menuName, self.union)
self.iface.removePluginVectorMenu(menuName, self.union) self.iface.removePluginVectorMenu(menuName, self.symDifference)
self.iface.removePluginVectorMenu(menuName, self.symDifference) self.iface.removePluginVectorMenu(menuName, self.clip)
self.iface.removePluginVectorMenu(menuName, self.clip) self.iface.removePluginVectorMenu(menuName, self.erase)
self.iface.removePluginVectorMenu(menuName, self.erase) self.iface.removePluginVectorMenu(menuName, self.dissolve)
self.iface.removePluginVectorMenu(menuName, self.dissolve)

menuName = QCoreApplication.translate("fTools", "G&eometry Tools")
menuName = QCoreApplication.translate("fTools", "G&eometry Tools") self.iface.removePluginVectorMenu(menuName, self.checkGeom)
self.iface.removePluginVectorMenu(menuName, self.checkGeom) self.iface.removePluginVectorMenu(menuName, self.compGeo)
self.iface.removePluginVectorMenu(menuName, self.compGeo) self.iface.removePluginVectorMenu(menuName, self.centroids)
self.iface.removePluginVectorMenu(menuName, self.centroids) self.iface.removePluginVectorMenu(menuName, self.delaunay)
self.iface.removePluginVectorMenu(menuName, self.delaunay) self.iface.removePluginVectorMenu(menuName, self.voronoi)
self.iface.removePluginVectorMenu(menuName, self.voronoi) self.iface.removePluginVectorMenu(menuName, self.simplify)
self.iface.removePluginVectorMenu(menuName, self.simplify) self.iface.removePluginVectorMenu(menuName, self.densify)
self.iface.removePluginVectorMenu(menuName, self.densify) self.iface.removePluginVectorMenu(menuName, self.multiToSingle)
self.iface.removePluginVectorMenu(menuName, self.multiToSingle) self.iface.removePluginVectorMenu(menuName, self.singleToMulti)
self.iface.removePluginVectorMenu(menuName, self.singleToMulti) self.iface.removePluginVectorMenu(menuName, self.polysToLines)
self.iface.removePluginVectorMenu(menuName, self.polysToLines) self.iface.removePluginVectorMenu(menuName, self.linesToPolys)
self.iface.removePluginVectorMenu(menuName, self.linesToPolys) self.iface.removePluginVectorMenu(menuName, self.extNodes)
self.iface.removePluginVectorMenu(menuName, self.extNodes)

menuName = QCoreApplication.translate("fTools", "&Data Management Tools")
menuName = QCoreApplication.translate("fTools", "&Data Management Tools") self.iface.removePluginVectorMenu(menuName, self.define)
self.iface.removePluginVectorMenu(menuName, self.define) self.iface.removePluginVectorMenu(menuName, self.spatJoin)
self.iface.removePluginVectorMenu(menuName, self.spatJoin) self.iface.removePluginVectorMenu(menuName, self.splitVect)
self.iface.removePluginVectorMenu(menuName, self.splitVect) self.iface.removePluginVectorMenu(menuName, self.mergeShapes)
self.iface.removePluginVectorMenu(menuName, self.mergeShapes) self.iface.removePluginVectorMenu(menuName, self.spatialIndex)
self.iface.removePluginVectorMenu(menuName, self.spatialIndex)
else:
pass


def doSimplify(self): def doSimplify(self):
d = doSimplify.Dialog(self.iface, 1) d = doSimplify.Dialog(self.iface, 1)
Expand Down

0 comments on commit 880354f

Please sign in to comment.