Skip to content

Commit 79447b9

Browse files
committed
Filter params and output before use. Use Enurmerate to count rows
1 parent 797bd32 commit 79447b9

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

python/plugins/processing/gui/ParametersPanel.py

+8-13
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ def getExtendedLayerName(self, layer):
185185
return layer.name()
186186

187187
def getWidgetFromParameter(self, param):
188+
# TODO Create Parameter widget class that holds the logic
189+
# for creating a widget that belongs to the parameter.
188190
if isinstance(param, ParameterRaster):
189191
layers = dataobjects.getRasterLayers()
190192
items = []
@@ -334,28 +336,22 @@ def somethingDependsOnThisParameter(self, parent):
334336
return False
335337

336338
def setTableContent(self):
337-
params = self.alg.parameters
338-
outputs = self.alg.outputs
339-
numParams = count(p for p in params if not p.hidden)
340-
numParams = count(o for o in outputs if not o.hidden)
339+
params = [parm for parm in self.alg.parameters if not parm.hidden]
340+
outputs = [output for output in self.alg.outputs if not output.hidden]
341+
numParams = len(parms)
342+
numOutputs = len(outputs)
341343
self.tableWidget.setRowCount(numParams + numOutputs)
342344

343-
i = 0
344-
for param in params:
345-
if param.hidden:
346-
continue
345+
for i, param in enurmerate(params):
347346
item = QtGui.QTableWidgetItem(param.description)
348347
item.setFlags(QtCore.Qt.ItemIsEnabled)
349348
self.tableWidget.setItem(i, 0, item)
350349
item = self.getWidgetFromParameter(param)
351350
self.valueItems[param.name] = item
352351
self.tableWidget.setCellWidget(i, 1, item)
353352
self.tableWidget.setRowHeight(i, 22)
354-
i += 1
355353

356-
for output in outputs:
357-
if output.hidden:
358-
continue
354+
for i, output in enurmerate(outputs):
359355
item = QtGui.QTableWidgetItem(output.description + '<'
360356
+ output.__module__.split('.')[-1] + '>')
361357
item.setFlags(QtCore.Qt.ItemIsEnabled)
@@ -364,4 +360,3 @@ def setTableContent(self):
364360
self.valueItems[output.name] = item
365361
self.tableWidget.setCellWidget(i, 1, item)
366362
self.tableWidget.setRowHeight(i, 22)
367-
i += 1

0 commit comments

Comments
 (0)