sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation

Browse Source
This commit is contained in:
Alexander Bruy 2016-03-01 19:02:30 +02:00
parent a4a658a657
commit 0571395919
4 changed files with 91 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/plugins/processing/algs/qgis/DefineProjection.py
View File

@ -63,7 +63,6 @@ class DefineProjection(GeoAlgorithm):
self.addOutput(OutputVector(self.OUTPUT,
self.tr('Layer with projection'), True))
def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName)

1
python/plugins/processing/algs/qgis/SpatialIndex.py
View File

@ -58,7 +58,6 @@ class SpatialIndex(GeoAlgorithm):
self.addOutput(OutputVector(self.OUTPUT,
self.tr('Indexed layer'), True))
def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName)

1
python/plugins/processing/core/Processing.py
View File

@ -375,7 +375,6 @@ class Processing:
progress.close()
return alg
@staticmethod
def tr(string, context=''):
if context == '':

82
python/plugins/processing/gui/menus.py
View File

@ -61,43 +61,44 @@ defaultMenuEntries.update({'qgis:definecurrentprojection':managementToolsMenu,
'qgis:splitvectorlayer': managementToolsMenu,
'qgis:mergevectorlayers': managementToolsMenu,
'qgis:createspatialindex': managementToolsMenu})
#~ rasterMenu = Processing.tr('&Raster')
#~ projectionsMenu = rasterMenu + "/" + Processing.tr('Projections')
#~ defaultMenuEntries.update({'gdalogr:warpreproject':projectionsMenu,
#~ 'gdalogr:assignprojection':projectionsMenu,
#~ 'gdalogr:extractprojection':projectionsMenu})
#~ conversionMenu = rasterMenu + "/" + Processing.tr('Conversion')
#~ defaultMenuEntries.update({'gdalogr:rasterize':conversionMenu,
#~ 'gdalogr:rasterize_over':conversionMenu,
#~ 'gdalogr:polygonize':conversionMenu,
#~ 'gdalogr:translate':conversionMenu,
#~ 'gdalogr:rgbtopct':conversionMenu,
#~ 'gdalogr:pcttorgb':conversionMenu})
#~ extractionMenu = rasterMenu + "/" + Processing.tr('Extraction')
#~ defaultMenuEntries.update({'gdalogr:contour':extractionMenu,
#~ 'gdalogr:cliprasterbyextent':extractionMenu,
#~ 'gdalogr:cliprasterbymasklayer':extractionMenu})
#~ analysisMenu = rasterMenu + "/" + Processing.tr('Analysis')
#~ defaultMenuEntries.update({'gdalogr:sieve':analysisMenu, 'gdalogr:nearblack':analysisMenu,
#~ 'gdalogr:fillnodata':analysisMenu,
#~ 'gdalogr:proximity':analysisMenu,
#~ 'gdalogr:griddatametrics':analysisMenu,
#~ 'gdalogr:gridaverage':analysisMenu,
#~ 'gdalogr:gridinvdist':analysisMenu,
#~ 'gdalogr:gridnearestneighbor':analysisMenu,
#~ 'gdalogr:aspect':analysisMenu,
#~ 'gdalogr:hillshade':analysisMenu,
#~ 'gdalogr:roughness':analysisMenu,
#~ 'gdalogr:slope':analysisMenu,
#~ 'gdalogr:tpi':analysisMenu,
#~ 'gdalogr:tri':analysisMenu})
#~ miscMenu = rasterMenu + "/" + Processing.tr('Miscellaneous')
#~ defaultMenuEntries.update({'gdalogr:buildvirtualraster':miscMenu,
#~ 'gdalogr:merge':miscMenu,
#~ 'gdalogr:rasterinfo':miscMenu,
#~ 'gdalogr:overviews':miscMenu,
#~ 'gdalogr:tileindex':miscMenu})
"""
rasterMenu = Processing.tr('&Raster')
projectionsMenu = rasterMenu + "/" + Processing.tr('Projections')
defaultMenuEntries.update({'gdalogr:warpreproject':projectionsMenu,
'gdalogr:assignprojection':projectionsMenu,
'gdalogr:extractprojection':projectionsMenu})
conversionMenu = rasterMenu + "/" + Processing.tr('Conversion')
defaultMenuEntries.update({'gdalogr:rasterize':conversionMenu,
'gdalogr:rasterize_over':conversionMenu,
'gdalogr:polygonize':conversionMenu,
'gdalogr:translate':conversionMenu,
'gdalogr:rgbtopct':conversionMenu,
'gdalogr:pcttorgb':conversionMenu})
extractionMenu = rasterMenu + "/" + Processing.tr('Extraction')
defaultMenuEntries.update({'gdalogr:contour':extractionMenu,
'gdalogr:cliprasterbyextent':extractionMenu,
'gdalogr:cliprasterbymasklayer':extractionMenu})
analysisMenu = rasterMenu + "/" + Processing.tr('Analysis')
defaultMenuEntries.update({'gdalogr:sieve':analysisMenu, 'gdalogr:nearblack':analysisMenu,
'gdalogr:fillnodata':analysisMenu,
'gdalogr:proximity':analysisMenu,
'gdalogr:griddatametrics':analysisMenu,
'gdalogr:gridaverage':analysisMenu,
'gdalogr:gridinvdist':analysisMenu,
'gdalogr:gridnearestneighbor':analysisMenu,
'gdalogr:aspect':analysisMenu,
'gdalogr:hillshade':analysisMenu,
'gdalogr:roughness':analysisMenu,
'gdalogr:slope':analysisMenu,
'gdalogr:tpi':analysisMenu,
'gdalogr:tri':analysisMenu})
miscMenu = rasterMenu + "/" + Processing.tr('Miscellaneous')
defaultMenuEntries.update({'gdalogr:buildvirtualraster':miscMenu,
'gdalogr:merge':miscMenu,
'gdalogr:rasterinfo':miscMenu,
'gdalogr:overviews':miscMenu,
'gdalogr:tileindex':miscMenu})
"""
def initializeMenus():
@ -109,10 +110,12 @@ def initializeMenus():
ProcessingConfig.readSettings()
def updateMenus():
removeMenus()
createMenus()
def createMenus():
for provider in Processing.algs.values():
for alg in provider.values():
@ -130,6 +133,7 @@ def removeMenus():
paths = menuPath.split("/")
removeAlgorithmEntry(alg, paths[0], paths[-1])
def addAlgorithmEntry(alg, menuName, submenuName, actionText=None, icon=None, addButton=False):
action = QAction(icon or alg.getIcon(), actionText or alg.name, iface.mainWindow())
action.triggered.connect(lambda: _executeAlgorithm(alg))
@ -145,6 +149,7 @@ def addAlgorithmEntry(alg, menuName, submenuName, actionText=None, icon=None, ad
algorithmsToolbar = iface.addToolBar('ProcessingAlgorithms')
algorithmsToolbar.addAction(action)
def removeAlgorithmEntry(alg, menuName, submenuName, actionText=None, delButton=True):
if menuName:
menu = getMenu(menuName, iface.mainWindow().menuBar())
@ -163,6 +168,7 @@ def removeAlgorithmEntry(alg, menuName, submenuName, actionText=None, delButton=
if action is not None:
algorithmsToolbar.removeAction(action)
def _executeAlgorithm(alg):
message = alg.checkBeforeOpeningParametersDialog()
if message:
@ -188,6 +194,7 @@ def _executeAlgorithm(alg):
pass
canvas.setMapTool(prevMapTool)
def getMenu(name, parent):
menus = [c for c in parent.children() if isinstance(c, QMenu)]
menusDict = {m.title(): m for m in menus}
@ -198,6 +205,7 @@ def getMenu(name, parent):
parent.addMenu(menu)
return menu
def findAction(actions, alg, actionText=None):
for action in actions:
if action.text() in [actionText, alg.name]: