[processing] fixed handling of parent algorihtms in modeler

Fixes #11750
This commit is contained in:
volaya 2014-11-28 14:20:16 +01:00
parent 8b65ebdeca
commit c52b5ae891
2 changed files with 3 additions and 6 deletions

View File

@ -413,7 +413,6 @@ class ModelerDialog(QDialog, Ui_DlgModeler):
* ModelerGraphicItem.BOX_HEIGHT)
self.alg.addAlgorithm(dlg.alg)
self.repaintModel()
#self.view.ensureVisible(self.scene.getLastAlgorithmItem())
self.hasChanged = True
def getPositionForAlgorithmItem(self):

View File

@ -198,11 +198,11 @@ class ModelerParametersDialog(QDialog):
opts = []
for alg in self.model.algs.values():
if alg.name not in dependent:
opts.append(alg.algorithm.name)
opts.append(alg)
return opts
def getDependenciesPanel(self):
return MultipleInputPanel(self.getAvailableDependencies())
return MultipleInputPanel([alg.algorithm.name for alg in self.getAvailableDependencies()])
def showAdvancedParametersClicked(self):
self.showAdvanced = not self.showAdvanced
@ -468,10 +468,8 @@ class ModelerParametersDialog(QDialog):
selectedOptions = self.dependenciesPanel.selectedoptions
availableDependencies = self.getAvailableDependencies()
self.dependencies = []
for selected in selectedOptions:
s = availableDependencies[selected]
alg.dependencies.append(s)
alg.dependencies.append(availableDependencies[selected].name)
return alg