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

[processing] indentation fixes

Browse Source
This commit is contained in:
volaya 2016-01-08 12:52:19 +01:00
parent b0a8c182f3
commit 931ca4d6d6
8 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/gdal/extractprojection.py
View File

@ -77,7 +77,7 @@ class ExtractProjection(GdalAlgorithm):
wld.write('%0.8f\n' % geotransform[2]) wld.write('%0.8f\n' % geotransform[2])
wld.write('%0.8f\n' % geotransform[5]) wld.write('%0.8f\n' % geotransform[5])
wld.write('%0.8f\n' % (geotransform[0] + 0.5 * geotransform[1] + 0.5 wld.write('%0.8f\n' % (geotransform[0] + 0.5 * geotransform[1] + 0.5
* geotransform[2])) * geotransform[2]))
wld.write('%0.8f\n' % (geotransform[3] + 0.5 * geotransform[4] + 0.5 wld.write('%0.8f\n' % (geotransform[3] + 0.5 * geotransform[4] + 0.5
* geotransform[5])) * geotransform[5]))
wld.close() wld.close()

3
python/plugins/processing/algs/gdal/translate.py
View File

@ -68,8 +68,7 @@ class translate(GdalAlgorithm):
def defineCharacteristics(self): def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Translate (convert format)') self.name, self.i18n_name = self.trAlgorithm('Translate (convert format)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Conversion') self.group, self.i18n_group = self.trAlgorithm('[GDAL] Conversion')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
False))
self.addParameter(ParameterNumber(self.OUTSIZE, self.addParameter(ParameterNumber(self.OUTSIZE,
self.tr('Set the size of the output file (In pixels or %)'), self.tr('Set the size of the output file (In pixels or %)'),
1, None, 100)) 1, None, 100))

5
python/plugins/processing/algs/saga/SagaAlgorithm212.py
View File

@ -102,7 +102,7 @@ class SagaAlgorithm212(GeoAlgorithm):
# An extent parameter that wraps 4 SAGA numerical parameters # An extent parameter that wraps 4 SAGA numerical parameters
self.extentParamNames = line[6:].strip().split(' ') self.extentParamNames = line[6:].strip().split(' ')
self.addParameter(ParameterExtent(self.OUTPUT_EXTENT, self.addParameter(ParameterExtent(self.OUTPUT_EXTENT,
'Output extent', '0,1,0,1')) 'Output extent', '0,1,0,1'))
else: else:
self.addOutput(getOutputFromString(line)) self.addOutput(getOutputFromString(line))
line = lines.readline().strip('\n').strip() line = lines.readline().strip('\n').strip()
@ -179,8 +179,7 @@ class SagaAlgorithm212(GeoAlgorithm):
for param in self.parameters: for param in self.parameters:
if param.value is None: if param.value is None:
continue continue
if isinstance(param, (ParameterRaster, ParameterVector, if isinstance(param, (ParameterRaster, ParameterVector, ParameterTable)):
ParameterTable)):
value = param.value value = param.value
if value in self.exportedLayers.keys(): if value in self.exportedLayers.keys():
command += ' -' + param.name + ' "' \ command += ' -' + param.name + ' "' \

2
python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
View File

@ -72,7 +72,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
self.tr('Log console output'), True)) self.tr('Log console output'), True))
ProcessingConfig.settingIcons["SAGA"] = self.getIcon() ProcessingConfig.settingIcons["SAGA"] = self.getIcon()
ProcessingConfig.addSetting(Setting("SAGA", "ACTIVATE_SAGA", ProcessingConfig.addSetting(Setting("SAGA", "ACTIVATE_SAGA",
self.tr('Activate'), self.activate)) self.tr('Activate'), self.activate))
def unload(self): def unload(self):
AlgorithmProvider.unload(self) AlgorithmProvider.unload(self)

2
python/plugins/processing/core/AlgorithmProvider.py
View File

@ -74,7 +74,7 @@ class AlgorithmProvider(object):
ProcessingConfig.settingIcons[self.getDescription()] = self.getIcon() ProcessingConfig.settingIcons[self.getDescription()] = self.getIcon()
name = 'ACTIVATE_' + self.getName().upper().replace(' ', '_') name = 'ACTIVATE_' + self.getName().upper().replace(' ', '_')
ProcessingConfig.addSetting(Setting(self.getDescription(), name, ProcessingConfig.addSetting(Setting(self.getDescription(), name,
self.tr('Activate'), self.activate)) self.tr('Activate'), self.activate))
def unload(self): def unload(self):
"""Do here anything that you want to be done when the provider """Do here anything that you want to be done when the provider

11
python/plugins/processing/core/GeoAlgorithm.py
View File

@ -219,8 +219,7 @@ class GeoAlgorithm:
def _checkParameterValuesBeforeExecuting(self): def _checkParameterValuesBeforeExecuting(self):
for param in self.parameters: for param in self.parameters:
if isinstance(param, (ParameterRaster, ParameterVector, if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
ParameterMultipleInput)):
if param.value: if param.value:
if isinstance(param, ParameterMultipleInput): if isinstance(param, ParameterMultipleInput):
inputlayers = param.value.split(';') inputlayers = param.value.split(';')
@ -368,8 +367,7 @@ class GeoAlgorithm:
def setOutputCRS(self): def setOutputCRS(self):
layers = dataobjects.getAllLayers() layers = dataobjects.getAllLayers()
for param in self.parameters: for param in self.parameters:
if isinstance(param, (ParameterRaster, ParameterVector, if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
ParameterMultipleInput)):
if param.value: if param.value:
if isinstance(param, ParameterMultipleInput): if isinstance(param, ParameterMultipleInput):
inputlayers = param.value.split(';') inputlayers = param.value.split(';')
@ -395,7 +393,7 @@ class GeoAlgorithm:
layers = dataobjects.getAllLayers() layers = dataobjects.getAllLayers()
for param in self.parameters: for param in self.parameters:
if isinstance(param, (ParameterRaster, ParameterVector, ParameterTable, if isinstance(param, (ParameterRaster, ParameterVector, ParameterTable,
ParameterMultipleInput)): ParameterMultipleInput)):
if param.value: if param.value:
if isinstance(param, ParameterMultipleInput): if isinstance(param, ParameterMultipleInput):
inputlayers = param.value.split(';') inputlayers = param.value.split(';')
@ -414,8 +412,7 @@ class GeoAlgorithm:
""" """
crsList = [] crsList = []
for param in self.parameters: for param in self.parameters:
if isinstance(param, (ParameterRaster, ParameterVector, if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
ParameterMultipleInput)):
if param.value: if param.value:
if isinstance(param, ParameterMultipleInput): if isinstance(param, ParameterMultipleInput):
layers = param.value.split(';') layers = param.value.split(';')

8
python/plugins/processing/gui/ProcessingToolbox.py
View File

@ -82,10 +82,10 @@ class ProcessingToolbox(BASE, WIDGET):
self.fillTree() self.fillTree()
def showDisabled(self): def showDisabled(self):
self.txtDisabled.setVisible(False) self.txtDisabled.setVisible(False)
for providerName in self.disabledWithMatchingAlgs: for providerName in self.disabledWithMatchingAlgs:
self.disabledProviderItems[providerName].setHidden(False) self.disabledProviderItems[providerName].setHidden(False)
self.algorithmTree.expandAll() self.algorithmTree.expandAll()
def disabledProviders(self): def disabledProviders(self):
for providerName in Processing.algs.keys(): for providerName in Processing.algs.keys():

56
python/plugins/processing/modeler/ModelerDialog.py
View File

@ -258,8 +258,8 @@ class ModelerDialog(BASE, WIDGET):
def exportAsImage(self): def exportAsImage(self):
filename = unicode(QFileDialog.getSaveFileName(self, filename = unicode(QFileDialog.getSaveFileName(self,
self.tr('Save Model As Image'), '', self.tr('Save Model As Image'), '',
self.tr('PNG files (*.png *.PNG)'))) self.tr('PNG files (*.png *.PNG)')))
if not filename: if not filename:
return return
@ -284,8 +284,8 @@ class ModelerDialog(BASE, WIDGET):
def exportAsPython(self): def exportAsPython(self):
filename = unicode(QFileDialog.getSaveFileName(self, filename = unicode(QFileDialog.getSaveFileName(self,
self.tr('Save Model As Python Script'), '', self.tr('Save Model As Python Script'), '',
self.tr('Python files (*.py *.PY)'))) self.tr('Python files (*.py *.PY)')))
if not filename: if not filename:
return return
@ -311,9 +311,9 @@ class ModelerDialog(BASE, WIDGET):
filename = self.alg.descriptionFile filename = self.alg.descriptionFile
else: else:
filename = unicode(QFileDialog.getSaveFileName(self, filename = unicode(QFileDialog.getSaveFileName(self,
self.tr('Save Model'), self.tr('Save Model'),
ModelerUtils.modelsFolder(), ModelerUtils.modelsFolder(),
self.tr('Processing models (*.model)'))) self.tr('Processing models (*.model)')))
if filename: if filename:
if not filename.endswith('.model'): if not filename.endswith('.model'):
filename += '.model' filename += '.model'
@ -343,8 +343,8 @@ class ModelerDialog(BASE, WIDGET):
def openModel(self): def openModel(self):
filename = unicode(QFileDialog.getOpenFileName(self, filename = unicode(QFileDialog.getOpenFileName(self,
self.tr('Open Model'), ModelerUtils.modelsFolder(), self.tr('Open Model'), ModelerUtils.modelsFolder(),
self.tr('Processing models (*.model *.MODEL)'))) self.tr('Processing models (*.model *.MODEL)')))
if filename: if filename:
try: try:
alg = ModelerAlgorithm.fromFile(filename) alg = ModelerAlgorithm.fromFile(filename)
@ -372,7 +372,7 @@ class ModelerDialog(BASE, WIDGET):
def repaintModel(self): def repaintModel(self):
self.scene = ModelerScene() self.scene = ModelerScene()
self.scene.setSceneRect(QRectF(0, 0, ModelerAlgorithm.CANVAS_SIZE, self.scene.setSceneRect(QRectF(0, 0, ModelerAlgorithm.CANVAS_SIZE,
ModelerAlgorithm.CANVAS_SIZE)) ModelerAlgorithm.CANVAS_SIZE))
self.scene.paintModel(self.alg) self.scene.paintModel(self.alg)
self.view.setScene(self.scene) self.view.setScene(self.scene)
@ -426,24 +426,24 @@ class ModelerDialog(BASE, WIDGET):
self._addAlgorithm(alg.getCopy()) self._addAlgorithm(alg.getCopy())
def _addAlgorithm(self, alg, pos=None): def _addAlgorithm(self, alg, pos=None):
dlg = alg.getCustomModelerParametersDialog(self.alg) dlg = alg.getCustomModelerParametersDialog(self.alg)
if not dlg: if not dlg:
dlg = ModelerParametersDialog(alg, self.alg) dlg = ModelerParametersDialog(alg, self.alg)
dlg.exec_() dlg.exec_()
if dlg.alg is not None: if dlg.alg is not None:
if pos is None: if pos is None:
dlg.alg.pos = self.getPositionForAlgorithmItem() dlg.alg.pos = self.getPositionForAlgorithmItem()
else: else:
dlg.alg.pos = pos dlg.alg.pos = pos
if isinstance(dlg.alg.pos, QPoint): if isinstance(dlg.alg.pos, QPoint):
dlg.alg.pos = QPointF(pos) dlg.alg.pos = QPointF(pos)
from processing.modeler.ModelerGraphicItem import ModelerGraphicItem from processing.modeler.ModelerGraphicItem import ModelerGraphicItem
for i, out in enumerate(dlg.alg.outputs): for i, out in enumerate(dlg.alg.outputs):
dlg.alg.outputs[out].pos = dlg.alg.pos + QPointF(ModelerGraphicItem.BOX_WIDTH, (i + 1.5) dlg.alg.outputs[out].pos = dlg.alg.pos + QPointF(ModelerGraphicItem.BOX_WIDTH, (i + 1.5)
* ModelerGraphicItem.BOX_HEIGHT) * ModelerGraphicItem.BOX_HEIGHT)
self.alg.addAlgorithm(dlg.alg) self.alg.addAlgorithm(dlg.alg)
self.repaintModel() self.repaintModel()
self.hasChanged = True self.hasChanged = True
def getPositionForAlgorithmItem(self): def getPositionForAlgorithmItem(self):
MARGIN = 20 MARGIN = 20