Skip to content

Commit c5b9fa2

Browse files
nyalldawsonnyalldawson
committedSep 22, 2017
Formatting
·
ltr-3_40final-3_0_0
1 parent 94530a9 commit c5b9fa2

File tree

2 files changed

+104
-63
lines changed

2 files changed

+104
-63
lines changed
 

‎python/plugins/processing/gui/wrappers.py

Lines changed: 77 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
***************************************************************************
1919
"""
2020

21-
2221
__author__ = 'Arnaud Morvan'
2322
__date__ = 'May 2016'
2423
__copyright__ = '(C) 2016, Arnaud Morvan'
@@ -27,7 +26,6 @@
2726

2827
__revision__ = '$Format:%H$'
2928

30-
3129
import locale
3230
import os
3331
from functools import cmp_to_key
@@ -124,6 +122,7 @@
124122
from processing.gui.FixedTablePanel import FixedTablePanel
125123
from processing.gui.ExtentSelectionPanel import ExtentSelectionPanel
126124
from processing.gui.ParameterGuiUtils import getFileFilter
125+
127126
DIALOG_STANDARD = 'standard'
128127
DIALOG_BATCH = 'batch'
129128
DIALOG_MODELER = 'modeler'
@@ -147,7 +146,6 @@ def getExtendedLayerName(layer):
147146

148147

149148
class WidgetWrapper(QObject):
150-
151149
widgetValueHasChanged = pyqtSignal(object)
152150

153151
def __init__(self, param, dialog, row=0, col=0, **kwargs):
@@ -324,8 +322,10 @@ def createWidget(self):
324322
crss = self.dialog.getAvailableValuesOfType(QgsProcessingParameterCrs)
325323
for crs in crss:
326324
self.combo.addItem(self.dialog.resolveValueDescription(crs), crs)
327-
raster = self.dialog.getAvailableValuesOfType(QgsProcessingParameterRasterLayer, QgsProcessingOutputRasterLayer)
328-
vector = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer)
325+
raster = self.dialog.getAvailableValuesOfType(QgsProcessingParameterRasterLayer,
326+
QgsProcessingOutputRasterLayer)
327+
vector = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource,
328+
QgsProcessingOutputVectorLayer)
329329
for r in raster:
330330
self.combo.addItem("Crs of layer " + self.dialog.resolveValueDescription(r), r)
331331
for v in vector:
@@ -378,7 +378,6 @@ def value(self):
378378

379379

380380
class ExtentWidgetWrapper(WidgetWrapper):
381-
382381
USE_MIN_COVERING_EXTENT = "[Use min covering extent]"
383382

384383
def createWidget(self):
@@ -390,8 +389,10 @@ def createWidget(self):
390389
extents = self.dialog.getAvailableValuesOfType(QgsProcessingParameterExtent, OutputExtent)
391390
if self.param.flags() & QgsProcessingParameterDefinition.FlagOptional:
392391
widget.addItem(self.USE_MIN_COVERING_EXTENT, None)
393-
raster = self.dialog.getAvailableValuesOfType(QgsProcessingParameterRasterLayer, QgsProcessingOutputRasterLayer)
394-
vector = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource, QgsProcessingOutputVectorLayer)
392+
raster = self.dialog.getAvailableValuesOfType(QgsProcessingParameterRasterLayer,
393+
QgsProcessingOutputRasterLayer)
394+
vector = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFeatureSource,
395+
QgsProcessingOutputVectorLayer)
395396
for ex in extents:
396397
widget.addItem(self.dialog.resolveValueDescription(ex), ex)
397398
for r in raster:
@@ -482,7 +483,8 @@ class FileWidgetWrapper(WidgetWrapper):
482483

483484
def createWidget(self):
484485
if self.dialogType in (DIALOG_STANDARD, DIALOG_BATCH):
485-
return FileSelectionPanel(self.param.behavior() == QgsProcessingParameterFile.Folder, self.param.extension())
486+
return FileSelectionPanel(self.param.behavior() == QgsProcessingParameterFile.Folder,
487+
self.param.extension())
486488
else:
487489
self.combo = QComboBox()
488490
self.combo.setEditable(True)
@@ -515,7 +517,8 @@ def selectFile(self):
515517
path = ''
516518

517519
if self.param.extension():
518-
filter = self.tr('{} files').format(self.param.extension().upper()) + ' (*.' + self.param.extension() + self.tr(
520+
filter = self.tr('{} files').format(
521+
self.param.extension().upper()) + ' (*.' + self.param.extension() + self.tr(
519522
');;All files (*.*)')
520523
else:
521524
filter = self.tr('All files (*.*)')
@@ -561,20 +564,39 @@ class MultipleLayerWidgetWrapper(WidgetWrapper):
561564

562565
def _getOptions(self):
563566
if self.param.layerType() == QgsProcessing.TypeVectorAnyGeometry:
564-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer)
567+
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource,
568+
QgsProcessingParameterVectorLayer,
569+
QgsProcessingParameterMultipleLayers),
570+
QgsProcessingOutputVectorLayer)
565571
elif self.param.layerType() == QgsProcessing.TypeVectorPoint:
566-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
567-
[QgsProcessing.TypeVectorPoint, QgsProcessing.TypeVectorAnyGeometry])
572+
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource,
573+
QgsProcessingParameterVectorLayer,
574+
QgsProcessingParameterMultipleLayers),
575+
QgsProcessingOutputVectorLayer,
576+
[QgsProcessing.TypeVectorPoint,
577+
QgsProcessing.TypeVectorAnyGeometry])
568578
elif self.param.layerType() == QgsProcessing.TypeVectorLine:
569-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
570-
[QgsProcessing.TypeVectorLine, QgsProcessing.TypeVectorAnyGeometry])
579+
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource,
580+
QgsProcessingParameterVectorLayer,
581+
QgsProcessingParameterMultipleLayers),
582+
QgsProcessingOutputVectorLayer,
583+
[QgsProcessing.TypeVectorLine,
584+
QgsProcessing.TypeVectorAnyGeometry])
571585
elif self.param.layerType() == QgsProcessing.TypeVectorPolygon:
572-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputVectorLayer,
573-
[QgsProcessing.TypeVectorPolygon, QgsProcessing.TypeVectorAnyGeometry])
586+
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource,
587+
QgsProcessingParameterVectorLayer,
588+
QgsProcessingParameterMultipleLayers),
589+
QgsProcessingOutputVectorLayer,
590+
[QgsProcessing.TypeVectorPolygon,
591+
QgsProcessing.TypeVectorAnyGeometry])
574592
elif self.param.layerType() == QgsProcessing.TypeRaster:
575-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterRasterLayer, QgsProcessingParameterMultipleLayers), QgsProcessingOutputRasterLayer)
593+
options = self.dialog.getAvailableValuesOfType(
594+
(QgsProcessingParameterRasterLayer, QgsProcessingParameterMultipleLayers),
595+
QgsProcessingOutputRasterLayer)
576596
elif self.param.layerType() == QgsProcessing.TypeVector:
577-
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer, QgsProcessingParameterMultipleLayers), OutputTable)
597+
options = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource,
598+
QgsProcessingParameterVectorLayer,
599+
QgsProcessingParameterMultipleLayers), OutputTable)
578600
else:
579601
options = self.dialog.getAvailableValuesOfType(QgsProcessingParameterFile, OutputFile)
580602
options = sorted(options, key=lambda opt: self.dialog.resolveValueDescription(opt))
@@ -590,7 +612,8 @@ def createWidget(self):
590612
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
591613
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
592614
else:
593-
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
615+
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()],
616+
False)
594617
opts = [getExtendedLayerName(opt) for opt in options]
595618
return MultipleInputPanel(opts, datatype=self.param.layerType())
596619
elif self.dialogType == DIALOG_BATCH:
@@ -608,7 +631,8 @@ def refresh(self):
608631
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
609632
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
610633
else:
611-
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
634+
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()],
635+
False)
612636
opts = [getExtendedLayerName(opt) for opt in options]
613637
self.widget.updateForOptions(opts)
614638

@@ -644,13 +668,15 @@ def value(self):
644668
elif self.param.layerType() in (QgsProcessing.TypeVectorAnyGeometry, QgsProcessing.TypeVector):
645669
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [], False)
646670
else:
647-
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()], False)
671+
options = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance(), [self.param.layerType()],
672+
False)
648673
return [options[i] if isinstance(i, int) else i for i in self.widget.selectedoptions]
649674
elif self.dialogType == DIALOG_BATCH:
650675
return self.widget.getText()
651676
else:
652677
options = self._getOptions()
653-
values = [options[i] if isinstance(i, int) else QgsProcessingModelChildParameterSource.fromStaticValue(i) for i in self.widget.selectedoptions]
678+
values = [options[i] if isinstance(i, int) else QgsProcessingModelChildParameterSource.fromStaticValue(i)
679+
for i in self.widget.selectedoptions]
654680
if len(values) == 0 and not self.param.flags() & QgsProcessing.FlagOptional:
655681
raise InvalidParameterValue()
656682
return values
@@ -674,7 +700,6 @@ def value(self):
674700

675701

676702
class MapLayerWidgetWrapper(WidgetWrapper):
677-
678703
NOT_SELECTED = '[Not selected]'
679704

680705
def createWidget(self):
@@ -737,8 +762,9 @@ def setComboBoxFilters(self, combo):
737762
pass
738763

739764
def getAvailableLayers(self):
740-
return self.dialog.getAvailableValuesOfType([QgsProcessingParameterRasterLayer, QgsProcessingParameterVectorLayer, QgsProcessingParameterMapLayer],
741-
[QgsProcessingOutputRasterLayer, QgsProcessingOutputVectorLayer])
765+
return self.dialog.getAvailableValuesOfType(
766+
[QgsProcessingParameterRasterLayer, QgsProcessingParameterVectorLayer, QgsProcessingParameterMapLayer],
767+
[QgsProcessingOutputRasterLayer, QgsProcessingOutputVectorLayer])
742768

743769
def selectFile(self):
744770
filename, selected_filter = self.getFileName(self.combo.currentText())
@@ -777,6 +803,7 @@ def validator(v):
777803
return self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
778804
else:
779805
return os.path.exists(v)
806+
780807
return self.comboValue(validator, combobox=self.combo)
781808

782809

@@ -839,7 +866,6 @@ def value(self):
839866

840867

841868
class FeatureSourceWidgetWrapper(WidgetWrapper):
842-
843869
NOT_SELECTED = '[Not selected]'
844870

845871
def createWidget(self):
@@ -908,7 +934,9 @@ def createWidget(self):
908934
return widget
909935
else:
910936
self.combo = QComboBox()
911-
layers = self.dialog.getAvailableValuesOfType((QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer), QgsProcessingOutputVectorLayer, self.param.dataTypes())
937+
layers = self.dialog.getAvailableValuesOfType(
938+
(QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer),
939+
QgsProcessingOutputVectorLayer, self.param.dataTypes())
912940
self.combo.setEditable(True)
913941
for layer in layers:
914942
self.combo.addItem(self.dialog.resolveValueDescription(layer), layer)
@@ -979,6 +1007,7 @@ def validator(v):
9791007
return self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
9801008
else:
9811009
return os.path.exists(v)
1010+
9821011
return self.comboValue(validator, combobox=self.combo)
9831012

9841013

@@ -997,8 +1026,9 @@ def createWidget(self):
9971026

9981027
else:
9991028
# strings, numbers, files and table fields are all allowed input types
1000-
strings = self.dialog.getAvailableValuesOfType([QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile,
1001-
QgsProcessingParameterField, QgsProcessingParameterExpression], [QgsProcessingOutputString])
1029+
strings = self.dialog.getAvailableValuesOfType(
1030+
[QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile,
1031+
QgsProcessingParameterField, QgsProcessingParameterExpression], [QgsProcessingOutputString])
10021032
options = [(self.dialog.resolveValueDescription(s), s) for s in strings]
10031033
if self.param.multiLine():
10041034
widget = MultilineTextPanel(options)
@@ -1068,6 +1098,7 @@ def value(self):
10681098
else:
10691099
def validator(v):
10701100
return bool(v) or self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
1101+
10711102
return self.comboValue(validator)
10721103

10731104

@@ -1082,7 +1113,9 @@ def createWidget(self):
10821113
if self.param.defaultValue():
10831114
widget.setExpression(self.param.defaultValue())
10841115
else:
1085-
strings = self.dialog.getAvailableValuesOfType([QgsProcessingParameterExpression, QgsProcessingParameterString, QgsProcessingParameterNumber], QgsProcessingOutputString)
1116+
strings = self.dialog.getAvailableValuesOfType(
1117+
[QgsProcessingParameterExpression, QgsProcessingParameterString, QgsProcessingParameterNumber],
1118+
QgsProcessingOutputString)
10861119
options = [(self.dialog.resolveValueDescription(s), s) for s in strings]
10871120
widget = QComboBox()
10881121
widget.setEditable(True)
@@ -1125,11 +1158,11 @@ def value(self):
11251158
else:
11261159
def validator(v):
11271160
return bool(v) or self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
1161+
11281162
return self.comboValue(validator)
11291163

11301164

11311165
class VectorLayerWidgetWrapper(WidgetWrapper):
1132-
11331166
NOT_SELECTED = '[Not selected]'
11341167

11351168
def createWidget(self):
@@ -1182,7 +1215,8 @@ def createWidget(self):
11821215
else:
11831216
self.combo = QComboBox()
11841217
self.combo.setEditable(True)
1185-
tables = self.dialog.getAvailableValuesOfType(QgsProcessingParameterVectorLayer, QgsProcessingOutputVectorLayer)
1218+
tables = self.dialog.getAvailableValuesOfType(QgsProcessingParameterVectorLayer,
1219+
QgsProcessingOutputVectorLayer)
11861220
if self.param.flags() & QgsProcessingParameterDefinition.FlagOptional:
11871221
self.combo.addItem(self.NOT_SELECTED, None)
11881222
for table in tables:
@@ -1237,11 +1271,11 @@ def value(self):
12371271
else:
12381272
def validator(v):
12391273
return bool(v) or self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
1274+
12401275
return self.comboValue(validator, combobox=self.combo)
12411276

12421277

12431278
class TableFieldWidgetWrapper(WidgetWrapper):
1244-
12451279
NOT_SET = '[Not set]'
12461280

12471281
def createWidget(self):
@@ -1264,13 +1298,15 @@ def createWidget(self):
12641298
else:
12651299
widget = QComboBox()
12661300
widget.setEditable(True)
1267-
fields = self.dialog.getAvailableValuesOfType([QgsProcessingParameterField, QgsProcessingParameterString], [QgsProcessingOutputString])
1301+
fields = self.dialog.getAvailableValuesOfType([QgsProcessingParameterField, QgsProcessingParameterString],
1302+
[QgsProcessingOutputString])
12681303
if self.param.flags() & QgsProcessingParameterDefinition.FlagOptional:
12691304
widget.addItem(self.NOT_SET, None)
12701305
for f in fields:
12711306
widget.addItem(self.dialog.resolveValueDescription(f), f)
12721307
widget.setToolTip(
1273-
self.tr('Input parameter, or name of field (separate field names with ; for multiple field parameters)'))
1308+
self.tr(
1309+
'Input parameter, or name of field (separate field names with ; for multiple field parameters)'))
12741310
return widget
12751311

12761312
def postInitialize(self, wrappers):
@@ -1326,7 +1362,7 @@ def setValue(self, value):
13261362
options = self.widget.options
13271363
selected = []
13281364
for i, opt in enumerate(options):
1329-
if opt in value or opt==value:
1365+
if opt in value or opt == value:
13301366
selected.append(i)
13311367
self.widget.setSelectedItems(selected)
13321368
else:
@@ -1346,11 +1382,11 @@ def value(self):
13461382
else:
13471383
def validator(v):
13481384
return bool(v) or self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
1385+
13491386
return self.comboValue(validator)
13501387

13511388

13521389
class BandWidgetWrapper(WidgetWrapper):
1353-
13541390
NOT_SET = '[Not set]'
13551391

13561392
def createWidget(self):
@@ -1364,7 +1400,8 @@ def createWidget(self):
13641400
else:
13651401
widget = QComboBox()
13661402
widget.setEditable(True)
1367-
fields = self.dialog.getAvailableValuesOfType([QgsProcessingParameterBand, QgsProcessingParameterNumber], [QgsProcessingOutputNumber])
1403+
fields = self.dialog.getAvailableValuesOfType([QgsProcessingParameterBand, QgsProcessingParameterNumber],
1404+
[QgsProcessingOutputNumber])
13681405
if self.param.flags() & QgsProcessingParameterDefinition.FlagOptional:
13691406
widget.addItem(self.NOT_SET, None)
13701407
for f in fields:
@@ -1410,11 +1447,11 @@ def value(self):
14101447
else:
14111448
def validator(v):
14121449
return bool(v) or self.param.flags() & QgsProcessingParameterDefinition.FlagOptional
1450+
14131451
return self.comboValue(validator)
14141452

14151453

14161454
class WidgetWrapperFactory:
1417-
14181455
"""
14191456
Factory for parameter widget wrappers
14201457
"""

‎python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464

6565

6666
class ModelerParameterDefinitionDialog(QDialog):
67-
6867
PARAMETER_NUMBER = 'Number'
6968
PARAMETER_RASTER = 'Raster Layer'
7069
PARAMETER_TABLE = 'Vector Layer'
@@ -176,7 +175,8 @@ def setupUi(self):
176175

177176
self.verticalLayout.addWidget(QLabel(self.tr('Default value')))
178177
self.defaultTextBox = QLineEdit()
179-
self.defaultTextBox.setToolTip(self.tr('Default field name, or ; separated list of field names for multiple field parameters'))
178+
self.defaultTextBox.setToolTip(
179+
self.tr('Default field name, or ; separated list of field names for multiple field parameters'))
180180
if self.param is not None:
181181
default = self.param.defaultValue()
182182
if default is not None:
@@ -197,7 +197,8 @@ def setupUi(self):
197197
self.parentCombo.setCurrentIndex(idx)
198198
idx += 1
199199
self.verticalLayout.addWidget(self.parentCombo)
200-
elif (self.paramType in (ModelerParameterDefinitionDialog.PARAMETER_VECTOR, ModelerParameterDefinitionDialog.PARAMETER_TABLE) or
200+
elif (self.paramType in (
201+
ModelerParameterDefinitionDialog.PARAMETER_VECTOR, ModelerParameterDefinitionDialog.PARAMETER_TABLE) or
201202
isinstance(self.param, (QgsProcessingParameterFeatureSource, QgsProcessingParameterVectorLayer))):
202203
self.verticalLayout.addWidget(QLabel(self.tr('Geometry type')))
203204
self.shapetypeCombo = QComboBox()
@@ -210,7 +211,7 @@ def setupUi(self):
210211
self.shapetypeCombo.setCurrentIndex(self.shapetypeCombo.findData(self.param.dataTypes()[0]))
211212
self.verticalLayout.addWidget(self.shapetypeCombo)
212213
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_MULTIPLE or
213-
isinstance(self.param, QgsProcessingParameterMultipleLayers)):
214+
isinstance(self.param, QgsProcessingParameterMultipleLayers)):
214215
self.verticalLayout.addWidget(QLabel(self.tr('Data type')))
215216
self.datatypeCombo = QComboBox()
216217
self.datatypeCombo.addItem(self.tr('Any Map Layer'), QgsProcessing.TypeMapLayer)
@@ -225,7 +226,7 @@ def setupUi(self):
225226
self.datatypeCombo.setCurrentIndex(self.datatypeCombo.findData(self.param.layerType()))
226227
self.verticalLayout.addWidget(self.datatypeCombo)
227228
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_NUMBER or
228-
isinstance(self.param, QgsProcessingParameterNumber)):
229+
isinstance(self.param, QgsProcessingParameterNumber)):
229230
self.verticalLayout.addWidget(QLabel(self.tr('Min value')))
230231
self.minTextBox = QLineEdit()
231232
self.verticalLayout.addWidget(self.minTextBox)
@@ -267,14 +268,14 @@ def setupUi(self):
267268
idx += 1
268269
self.verticalLayout.addWidget(self.parentCombo)
269270
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_STRING or
270-
isinstance(self.param, QgsProcessingParameterString)):
271+
isinstance(self.param, QgsProcessingParameterString)):
271272
self.verticalLayout.addWidget(QLabel(self.tr('Default value')))
272273
self.defaultTextBox = QLineEdit()
273274
if self.param is not None:
274275
self.defaultTextBox.setText(self.param.defaultValue())
275276
self.verticalLayout.addWidget(self.defaultTextBox)
276277
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_FILE or
277-
isinstance(self.param, QgsProcessingParameterFile)):
278+
isinstance(self.param, QgsProcessingParameterFile)):
278279
self.verticalLayout.addWidget(QLabel(self.tr('Type')))
279280
self.fileFolderCombo = QComboBox()
280281
self.fileFolderCombo.addItem(self.tr('File'))
@@ -284,14 +285,14 @@ def setupUi(self):
284285
1 if self.param.behavior() == QgsProcessingParameterFile.Folder else 0)
285286
self.verticalLayout.addWidget(self.fileFolderCombo)
286287
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_POINT or
287-
isinstance(self.param, QgsProcessingParameterPoint)):
288+
isinstance(self.param, QgsProcessingParameterPoint)):
288289
self.verticalLayout.addWidget(QLabel(self.tr('Default value')))
289290
self.defaultTextBox = QLineEdit()
290291
if self.param is not None:
291292
self.defaultTextBox.setText(self.param.defaultValue())
292293
self.verticalLayout.addWidget(self.defaultTextBox)
293294
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_CRS or
294-
isinstance(self.param, QgsProcessingParameterCrs)):
295+
isinstance(self.param, QgsProcessingParameterCrs)):
295296
self.verticalLayout.addWidget(QLabel(self.tr('Default value')))
296297
self.selector = QgsProjectionSelectionWidget()
297298
if self.param is not None:
@@ -352,7 +353,9 @@ def accept(self):
352353
default = self.defaultTextBox.text()
353354
if not default:
354355
default = None
355-
self.param = QgsProcessingParameterField(name, description, defaultValue=default, parentLayerParameterName=parent, type=datatype, allowMultiple=self.multipleCheck.isChecked())
356+
self.param = QgsProcessingParameterField(name, description, defaultValue=default,
357+
parentLayerParameterName=parent, type=datatype,
358+
allowMultiple=self.multipleCheck.isChecked())
356359
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_BAND or
357360
isinstance(self.param, QgsProcessingParameterBand)):
358361
if self.parentCombo.currentIndex() < 0:
@@ -362,30 +365,30 @@ def accept(self):
362365
parent = self.parentCombo.currentData()
363366
self.param = QgsProcessingParameterBand(name, description, None, parent)
364367
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_MAP_LAYER or
365-
isinstance(self.param, QgsProcessingParameterMapLayer)):
368+
isinstance(self.param, QgsProcessingParameterMapLayer)):
366369
self.param = QgsProcessingParameterMapLayer(
367370
name, description)
368371
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_RASTER or
369-
isinstance(self.param, QgsProcessingParameterRasterLayer)):
372+
isinstance(self.param, QgsProcessingParameterRasterLayer)):
370373
self.param = QgsProcessingParameterRasterLayer(
371374
name, description)
372375
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_TABLE or
373-
isinstance(self.param, QgsProcessingParameterVectorLayer)):
376+
isinstance(self.param, QgsProcessingParameterVectorLayer)):
374377
self.param = QgsProcessingParameterVectorLayer(
375378
name, description,
376379
[self.shapetypeCombo.currentData()])
377380
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_VECTOR or
378-
isinstance(self.param, QgsProcessingParameterFeatureSource)):
381+
isinstance(self.param, QgsProcessingParameterFeatureSource)):
379382
self.param = QgsProcessingParameterFeatureSource(
380383
name, description,
381384
[self.shapetypeCombo.currentData()])
382385
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_MULTIPLE or
383-
isinstance(self.param, QgsProcessingParameterMultipleLayers)):
386+
isinstance(self.param, QgsProcessingParameterMultipleLayers)):
384387
self.param = QgsProcessingParameterMultipleLayers(
385388
name, description,
386389
self.datatypeCombo.currentData())
387390
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_NUMBER or
388-
isinstance(self.param, QgsProcessingParameterNumber)):
391+
isinstance(self.param, QgsProcessingParameterNumber)):
389392
try:
390393
self.param = QgsProcessingParameterNumber(name, description, QgsProcessingParameterNumber.Double,
391394
self.defaultTextBox.text())
@@ -400,28 +403,29 @@ def accept(self):
400403
self.tr('Wrong or missing parameter values'))
401404
return
402405
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_EXPRESSION or
403-
isinstance(self.param, QgsProcessingParameterExpression)):
406+
isinstance(self.param, QgsProcessingParameterExpression)):
404407
parent = self.parentCombo.currentData()
405408
self.param = QgsProcessingParameterExpression(name, description,
406409
str(self.defaultEdit.expression()),
407410
parent)
408411
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_STRING or
409-
isinstance(self.param, QgsProcessingParameterString)):
412+
isinstance(self.param, QgsProcessingParameterString)):
410413
self.param = QgsProcessingParameterString(name, description,
411414
str(self.defaultTextBox.text()))
412415
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_EXTENT or
413-
isinstance(self.param, QgsProcessingParameterExtent)):
416+
isinstance(self.param, QgsProcessingParameterExtent)):
414417
self.param = QgsProcessingParameterExtent(name, description)
415418
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_FILE or
416-
isinstance(self.param, QgsProcessingParameterFile)):
419+
isinstance(self.param, QgsProcessingParameterFile)):
417420
isFolder = self.fileFolderCombo.currentIndex() == 1
418-
self.param = QgsProcessingParameterFile(name, description, QgsProcessingParameterFile.Folder if isFolder else QgsProcessingParameterFile.File)
421+
self.param = QgsProcessingParameterFile(name, description,
422+
QgsProcessingParameterFile.Folder if isFolder else QgsProcessingParameterFile.File)
419423
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_POINT or
420-
isinstance(self.param, QgsProcessingParameterPoint)):
424+
isinstance(self.param, QgsProcessingParameterPoint)):
421425
self.param = QgsProcessingParameterPoint(name, description,
422426
str(self.defaultTextBox.text()))
423427
elif (self.paramType == ModelerParameterDefinitionDialog.PARAMETER_CRS or
424-
isinstance(self.param, QgsProcessingParameterCrs)):
428+
isinstance(self.param, QgsProcessingParameterCrs)):
425429
self.param = QgsProcessingParameterCrs(name, description, self.selector.crs().authid())
426430
if not self.requiredCheck.isChecked():
427431
self.param.setFlags(self.param.flags() | QgsProcessingParameterDefinition.FlagOptional)

0 commit comments

Comments
 (0)
Please sign in to comment.