sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] Make batch processing HTML report more useful

Browse Source 
Include the input parameter values in the report, otherwise the
results are just a meaningless list of values which can't be
associated with any particular set of inputs

Also correctly handle boolean and other output types
This commit is contained in:
Nyall Dawson 2019-06-10 11:25:50 +10:00
parent d10db05b5a
commit e0eedc5fa1
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/plugins/processing/gui/BatchAlgorithmDialog.py
View File

@ -137,7 +137,7 @@ class BatchAlgorithmDialog(QgsProcessingAlgorithmDialogBase):
feedback.pushInfo(self.tr('Results:')) feedback.pushInfo(self.tr('Results:'))
feedback.pushCommandInfo(pformat(results)) feedback.pushCommandInfo(pformat(results))
feedback.pushInfo('') feedback.pushInfo('')
algorithm_results.append(results) algorithm_results.append({'parameters': parameters, 'results': results})
else: else:
break break
@ -151,7 +151,7 @@ class BatchAlgorithmDialog(QgsProcessingAlgorithmDialogBase):
def finish(self, algorithm_results): def finish(self, algorithm_results):
for count, results in enumerate(algorithm_results): for count, results in enumerate(algorithm_results):
self.loadHTMLResults(results, count) self.loadHTMLResults(results['results'], count)
self.createSummaryTable(algorithm_results) self.createSummaryTable(algorithm_results)
self.mainWidget().setEnabled(True) self.mainWidget().setEnabled(True)
@ -176,12 +176,24 @@ class BatchAlgorithmDialog(QgsProcessingAlgorithmDialogBase):
outputFile = getTempFilename('html') outputFile = getTempFilename('html')
with codecs.open(outputFile, 'w', encoding='utf-8') as f: with codecs.open(outputFile, 'w', encoding='utf-8') as f:
for res in algorithm_results: for i, res in enumerate(algorithm_results):
f.write('<hr>\n') results = res['results']
params = res['parameters']
if i > 0:
f.write('<hr>\n')
f.write(self.tr('<h3>Parameters</h3>\n'))
f.write('<table>\n')
for param in self.algorithm().parameterDefinitions():
if not param.isDestination():
if param.name() in params:
f.write('<tr><th>{}</th><td>{}</td></tr>\n'.format(param.description(), params[param.name()]))
f.write('</table>\n')
f.write(self.tr('<h3>Results</h3>\n'))
f.write('<table>\n')
for out in self.algorithm().outputDefinitions(): for out in self.algorithm().outputDefinitions():
if isinstance(out, (QgsProcessingOutputNumber, QgsProcessingOutputString)) and out.name() in res: if out.name() in results:
f.write('<p>{}: {}</p>\n'.format(out.description(), res[out.name()])) f.write('<tr><th>{}</th><td>{}</td></tr>\n'.format(out.description(), results[out.name()]))
f.write('<hr>\n') f.write('</table>\n')
resultsList.addResult(icon=self.algorithm().icon(), resultsList.addResult(icon=self.algorithm().icon(),
name='{} [summary]'.format(self.algorithm().name()), timestamp=time.localtime(), name='{} [summary]'.format(self.algorithm().name()), timestamp=time.localtime(),