sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -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.addOutput(OutputVector(self.OUTPUT,
self.tr('Layer with projection'), True)) self.tr('Layer with projection'), True))
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT) fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName) 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.addOutput(OutputVector(self.OUTPUT,
self.tr('Indexed layer'), True)) self.tr('Indexed layer'), True))
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
fileName = self.getParameterValue(self.INPUT) fileName = self.getParameterValue(self.INPUT)
layer = dataobjects.getObjectFromUri(fileName) layer = dataobjects.getObjectFromUri(fileName)

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

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

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

@ -10,94 +10,95 @@ algorithmsToolbar = None
defaultMenuEntries = {} defaultMenuEntries = {}
vectorMenu = Processing.tr('Vect&or') vectorMenu = Processing.tr('Vect&or')
analysisToolsMenu = vectorMenu + "/" + Processing.tr('&Analysis Tools') analysisToolsMenu = vectorMenu + "/" + Processing.tr('&Analysis Tools')
defaultMenuEntries.update({'qgis:distancematrix':analysisToolsMenu, defaultMenuEntries.update({'qgis:distancematrix': analysisToolsMenu,
'qgis:sumlinelengths':analysisToolsMenu, 'qgis:sumlinelengths': analysisToolsMenu,
'qgis:pointsinpolygon':analysisToolsMenu, 'qgis:pointsinpolygon': analysisToolsMenu,
'qgis:listuniquevalues':analysisToolsMenu, 'qgis:listuniquevalues': analysisToolsMenu,
'qgis:basicstatisticsfornumericfields':analysisToolsMenu, 'qgis:basicstatisticsfornumericfields': analysisToolsMenu,
'qgis:basicstatisticsfortextfields':analysisToolsMenu, 'qgis:basicstatisticsfortextfields': analysisToolsMenu,
'qgis:nearestneighbouranalysis':analysisToolsMenu, 'qgis:nearestneighbouranalysis': analysisToolsMenu,
'qgis:meancoordinates':analysisToolsMenu, 'qgis:meancoordinates': analysisToolsMenu,
'qgis:lineintersecions':analysisToolsMenu}) 'qgis:lineintersecions': analysisToolsMenu})
researchToolsMenu = vectorMenu + "/" + Processing.tr('&Research Tools') researchToolsMenu = vectorMenu + "/" + Processing.tr('&Research Tools')
defaultMenuEntries.update({'qgis:randomselection':researchToolsMenu, defaultMenuEntries.update({'qgis:randomselection': researchToolsMenu,
'qgis:randomselectionwithinsubsets':researchToolsMenu, 'qgis:randomselectionwithinsubsets': researchToolsMenu,
'qgis:randompointsinextent':researchToolsMenu, 'qgis:randompointsinextent': researchToolsMenu,
'qgis:randompointsinlayerbounds':researchToolsMenu, 'qgis:randompointsinlayerbounds': researchToolsMenu,
'qgis:randompointsinsidepolygonsfixed':researchToolsMenu, 'qgis:randompointsinsidepolygonsfixed': researchToolsMenu,
'qgis:randompointsinsidepolygonsvariable':researchToolsMenu, 'qgis:randompointsinsidepolygonsvariable': researchToolsMenu,
'qgis:regularpoints':researchToolsMenu, 'qgis:regularpoints': researchToolsMenu,
'qgis:vectorgrid':researchToolsMenu, 'qgis:vectorgrid': researchToolsMenu,
'qgis:selectbylocation':researchToolsMenu, 'qgis:selectbylocation': researchToolsMenu,
'qgis:polygonfromlayerextent':researchToolsMenu}) 'qgis:polygonfromlayerextent': researchToolsMenu})
geoprocessingToolsMenu = vectorMenu + "/" + Processing.tr('&Geoprocessing Tools') geoprocessingToolsMenu = vectorMenu + "/" + Processing.tr('&Geoprocessing Tools')
defaultMenuEntries.update({'qgis:convexhull':geoprocessingToolsMenu, defaultMenuEntries.update({'qgis:convexhull': geoprocessingToolsMenu,
'qgis:fixeddistancebuffer':geoprocessingToolsMenu, 'qgis:fixeddistancebuffer': geoprocessingToolsMenu,
'qgis:variabledistancebuffer':geoprocessingToolsMenu, 'qgis:variabledistancebuffer': geoprocessingToolsMenu,
'qgis:intersection':geoprocessingToolsMenu, 'qgis:intersection': geoprocessingToolsMenu,
'qgis:union':geoprocessingToolsMenu, 'qgis:union': geoprocessingToolsMenu,
'qgis:symmetricaldifference':geoprocessingToolsMenu, 'qgis:symmetricaldifference': geoprocessingToolsMenu,
'qgis:clip':geoprocessingToolsMenu, 'qgis:clip': geoprocessingToolsMenu,
'qgis:difference':geoprocessingToolsMenu, 'qgis:difference': geoprocessingToolsMenu,
'qgis:dissolve':geoprocessingToolsMenu, 'qgis:dissolve': geoprocessingToolsMenu,
'qgis:eliminatesliverpolygons':geoprocessingToolsMenu}) 'qgis:eliminatesliverpolygons': geoprocessingToolsMenu})
geometryToolsMenu = vectorMenu + "/" + Processing.tr('G&eometry Tools') geometryToolsMenu = vectorMenu + "/" + Processing.tr('G&eometry Tools')
defaultMenuEntries.update({'qgis:checkvalidity':geometryToolsMenu, defaultMenuEntries.update({'qgis:checkvalidity': geometryToolsMenu,
'qgis:exportaddgeometrycolumns':geometryToolsMenu, 'qgis:exportaddgeometrycolumns': geometryToolsMenu,
'qgis:polygoncentroids':geometryToolsMenu, 'qgis:polygoncentroids': geometryToolsMenu,
'qgis:delaunaytriangulation':geometryToolsMenu, 'qgis:delaunaytriangulation': geometryToolsMenu,
'qgis:voronoipolygons':geometryToolsMenu, 'qgis:voronoipolygons': geometryToolsMenu,
'qgis:simplifygeometries':geometryToolsMenu, 'qgis:simplifygeometries': geometryToolsMenu,
'qgis:densifygeometries':geometryToolsMenu, 'qgis:densifygeometries': geometryToolsMenu,
'qgis:multiparttosingleparts':geometryToolsMenu, 'qgis:multiparttosingleparts': geometryToolsMenu,
'qgis:singlepartstomultipart':geometryToolsMenu, 'qgis:singlepartstomultipart': geometryToolsMenu,
'qgis:polygonstolines':geometryToolsMenu, 'qgis:polygonstolines': geometryToolsMenu,
'qgis:linestopolygons':geometryToolsMenu, 'qgis:linestopolygons': geometryToolsMenu,
'qgis:extractnodes':geometryToolsMenu}) 'qgis:extractnodes': geometryToolsMenu})
managementToolsMenu = vectorMenu + "/" + Processing.tr('&Data Management Tools') managementToolsMenu = vectorMenu + "/" + Processing.tr('&Data Management Tools')
defaultMenuEntries.update({'qgis:definecurrentprojection':managementToolsMenu, defaultMenuEntries.update({'qgis:definecurrentprojection': managementToolsMenu,
'qgis:joinattributesbylocation':managementToolsMenu, 'qgis:joinattributesbylocation': managementToolsMenu,
'qgis:splitvectorlayer':managementToolsMenu, 'qgis:splitvectorlayer': managementToolsMenu,
'qgis:mergevectorlayers':managementToolsMenu, 'qgis:mergevectorlayers': managementToolsMenu,
'qgis:createspatialindex':managementToolsMenu}) 'qgis:createspatialindex': managementToolsMenu})
"""
#~ rasterMenu = Processing.tr('&Raster') rasterMenu = Processing.tr('&Raster')
#~ projectionsMenu = rasterMenu + "/" + Processing.tr('Projections') projectionsMenu = rasterMenu + "/" + Processing.tr('Projections')
#~ defaultMenuEntries.update({'gdalogr:warpreproject':projectionsMenu, defaultMenuEntries.update({'gdalogr:warpreproject':projectionsMenu,
#~ 'gdalogr:assignprojection':projectionsMenu, 'gdalogr:assignprojection':projectionsMenu,
#~ 'gdalogr:extractprojection':projectionsMenu}) 'gdalogr:extractprojection':projectionsMenu})
#~ conversionMenu = rasterMenu + "/" + Processing.tr('Conversion') conversionMenu = rasterMenu + "/" + Processing.tr('Conversion')
#~ defaultMenuEntries.update({'gdalogr:rasterize':conversionMenu, defaultMenuEntries.update({'gdalogr:rasterize':conversionMenu,
#~ 'gdalogr:rasterize_over':conversionMenu, 'gdalogr:rasterize_over':conversionMenu,
#~ 'gdalogr:polygonize':conversionMenu, 'gdalogr:polygonize':conversionMenu,
#~ 'gdalogr:translate':conversionMenu, 'gdalogr:translate':conversionMenu,
#~ 'gdalogr:rgbtopct':conversionMenu, 'gdalogr:rgbtopct':conversionMenu,
#~ 'gdalogr:pcttorgb':conversionMenu}) 'gdalogr:pcttorgb':conversionMenu})
#~ extractionMenu = rasterMenu + "/" + Processing.tr('Extraction') extractionMenu = rasterMenu + "/" + Processing.tr('Extraction')
#~ defaultMenuEntries.update({'gdalogr:contour':extractionMenu, defaultMenuEntries.update({'gdalogr:contour':extractionMenu,
#~ 'gdalogr:cliprasterbyextent':extractionMenu, 'gdalogr:cliprasterbyextent':extractionMenu,
#~ 'gdalogr:cliprasterbymasklayer':extractionMenu}) 'gdalogr:cliprasterbymasklayer':extractionMenu})
#~ analysisMenu = rasterMenu + "/" + Processing.tr('Analysis') analysisMenu = rasterMenu + "/" + Processing.tr('Analysis')
#~ defaultMenuEntries.update({'gdalogr:sieve':analysisMenu, 'gdalogr:nearblack':analysisMenu, defaultMenuEntries.update({'gdalogr:sieve':analysisMenu, 'gdalogr:nearblack':analysisMenu,
#~ 'gdalogr:fillnodata':analysisMenu, 'gdalogr:fillnodata':analysisMenu,
#~ 'gdalogr:proximity':analysisMenu, 'gdalogr:proximity':analysisMenu,
#~ 'gdalogr:griddatametrics':analysisMenu, 'gdalogr:griddatametrics':analysisMenu,
#~ 'gdalogr:gridaverage':analysisMenu, 'gdalogr:gridaverage':analysisMenu,
#~ 'gdalogr:gridinvdist':analysisMenu, 'gdalogr:gridinvdist':analysisMenu,
#~ 'gdalogr:gridnearestneighbor':analysisMenu, 'gdalogr:gridnearestneighbor':analysisMenu,
#~ 'gdalogr:aspect':analysisMenu, 'gdalogr:aspect':analysisMenu,
#~ 'gdalogr:hillshade':analysisMenu, 'gdalogr:hillshade':analysisMenu,
#~ 'gdalogr:roughness':analysisMenu, 'gdalogr:roughness':analysisMenu,
#~ 'gdalogr:slope':analysisMenu, 'gdalogr:slope':analysisMenu,
#~ 'gdalogr:tpi':analysisMenu, 'gdalogr:tpi':analysisMenu,
#~ 'gdalogr:tri':analysisMenu}) 'gdalogr:tri':analysisMenu})
#~ miscMenu = rasterMenu + "/" + Processing.tr('Miscellaneous') miscMenu = rasterMenu + "/" + Processing.tr('Miscellaneous')
#~ defaultMenuEntries.update({'gdalogr:buildvirtualraster':miscMenu, defaultMenuEntries.update({'gdalogr:buildvirtualraster':miscMenu,
#~ 'gdalogr:merge':miscMenu, 'gdalogr:merge':miscMenu,
#~ 'gdalogr:rasterinfo':miscMenu, 'gdalogr:rasterinfo':miscMenu,
#~ 'gdalogr:overviews':miscMenu, 'gdalogr:overviews':miscMenu,
#~ 'gdalogr:tileindex':miscMenu}) 'gdalogr:tileindex':miscMenu})
"""
def initializeMenus(): def initializeMenus():
@ -109,10 +110,12 @@ def initializeMenus():
ProcessingConfig.readSettings() ProcessingConfig.readSettings()
def updateMenus(): def updateMenus():
removeMenus() removeMenus()
createMenus() createMenus()
def createMenus(): def createMenus():
for provider in Processing.algs.values(): for provider in Processing.algs.values():
for alg in provider.values(): for alg in provider.values():
@ -130,6 +133,7 @@ def removeMenus():
paths = menuPath.split("/") paths = menuPath.split("/")
removeAlgorithmEntry(alg, paths[0], paths[-1]) removeAlgorithmEntry(alg, paths[0], paths[-1])
def addAlgorithmEntry(alg, menuName, submenuName, actionText=None, icon=None, addButton=False): def addAlgorithmEntry(alg, menuName, submenuName, actionText=None, icon=None, addButton=False):
action = QAction(icon or alg.getIcon(), actionText or alg.name, iface.mainWindow()) action = QAction(icon or alg.getIcon(), actionText or alg.name, iface.mainWindow())
action.triggered.connect(lambda: _executeAlgorithm(alg)) 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 = iface.addToolBar('ProcessingAlgorithms')
algorithmsToolbar.addAction(action) algorithmsToolbar.addAction(action)
def removeAlgorithmEntry(alg, menuName, submenuName, actionText=None, delButton=True): def removeAlgorithmEntry(alg, menuName, submenuName, actionText=None, delButton=True):
if menuName: if menuName:
menu = getMenu(menuName, iface.mainWindow().menuBar()) menu = getMenu(menuName, iface.mainWindow().menuBar())
@ -163,6 +168,7 @@ def removeAlgorithmEntry(alg, menuName, submenuName, actionText=None, delButton=
if action is not None: if action is not None:
algorithmsToolbar.removeAction(action) algorithmsToolbar.removeAction(action)
def _executeAlgorithm(alg): def _executeAlgorithm(alg):
message = alg.checkBeforeOpeningParametersDialog() message = alg.checkBeforeOpeningParametersDialog()
if message: if message:
@ -188,6 +194,7 @@ def _executeAlgorithm(alg):
pass pass
canvas.setMapTool(prevMapTool) canvas.setMapTool(prevMapTool)
def getMenu(name, parent): def getMenu(name, parent):
menus = [c for c in parent.children() if isinstance(c, QMenu)] menus = [c for c in parent.children() if isinstance(c, QMenu)]
menusDict = {m.title(): m for m in menus} menusDict = {m.title(): m for m in menus}
@ -198,6 +205,7 @@ def getMenu(name, parent):
parent.addMenu(menu) parent.addMenu(menu)
return menu return menu
def findAction(actions, alg, actionText=None): def findAction(actions, alg, actionText=None):
for action in actions: for action in actions:
if action.text() in [actionText, alg.name]: if action.text() in [actionText, alg.name]: