From 36215507ddac8232c135e65a9deccea88875d52c Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Fri, 22 May 2020 11:13:22 +0300 Subject: [PATCH] update algorithms which use "ext" mechanism (cherry picked from commit 938dc618b185e9b61abf137333458616efb98812) --- python/plugins/processing/algs/grass7/Grass7Algorithm.py | 3 +++ python/plugins/processing/algs/grass7/ext/i_cluster.py | 1 + python/plugins/processing/algs/grass7/ext/i_gensig.py | 1 + python/plugins/processing/algs/grass7/ext/i_gensigset.py | 1 + 4 files changed, 6 insertions(+) diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py index 8aff7d41a4a2..4150617213f4 100644 --- a/python/plugins/processing/algs/grass7/Grass7Algorithm.py +++ b/python/plugins/processing/algs/grass7/Grass7Algorithm.py @@ -445,6 +445,9 @@ def processAlgorithm(self, original_parameters, context, feedback): outName = out.name() if outName in parameters: if outName in self.fileOutputs: + print('ADD', outName) + print('VAL', parameters[outName]) + print('VAL 2', self.fileOutputs[outName]) outputs[outName] = self.fileOutputs[outName] else: outputs[outName] = parameters[outName] diff --git a/python/plugins/processing/algs/grass7/ext/i_cluster.py b/python/plugins/processing/algs/grass7/ext/i_cluster.py index b7ed20af6982..ab82fb946867 100644 --- a/python/plugins/processing/algs/grass7/ext/i_cluster.py +++ b/python/plugins/processing/algs/grass7/ext/i_cluster.py @@ -41,6 +41,7 @@ def processCommand(alg, parameters, context, feedback): # Re-add signature files parameters['signaturefile'] = signatureFile + alg.fileOutputs['signaturefile'] = signatureFile # Export signature file exportSigFile(alg, group, subgroup, signatureFile) diff --git a/python/plugins/processing/algs/grass7/ext/i_gensig.py b/python/plugins/processing/algs/grass7/ext/i_gensig.py index dfb9001975ed..6c2c01f6dbaa 100644 --- a/python/plugins/processing/algs/grass7/ext/i_gensig.py +++ b/python/plugins/processing/algs/grass7/ext/i_gensig.py @@ -37,6 +37,7 @@ def processCommand(alg, parameters, context, feedback): # Re-add signature files parameters['signaturefile'] = signatureFile + alg.fileOutputs['signaturefile'] = signatureFile # Export signature file exportSigFile(alg, group, subgroup, signatureFile) diff --git a/python/plugins/processing/algs/grass7/ext/i_gensigset.py b/python/plugins/processing/algs/grass7/ext/i_gensigset.py index c935dbf0e571..19a7de54db4e 100644 --- a/python/plugins/processing/algs/grass7/ext/i_gensigset.py +++ b/python/plugins/processing/algs/grass7/ext/i_gensigset.py @@ -37,6 +37,7 @@ def processCommand(alg, parameters, context, feedback): # Re-add signature files parameters['signaturefile'] = signatureFile + alg.fileOutputs['signaturefile'] = signatureFile # Export signature file exportSigFile(alg, group, subgroup, signatureFile, 'sigset')