sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fix broken stdout handling in GRASS algs (fix #21142)

Browse Source
This commit is contained in:
Alexander Bruy 2019-01-31 15:52:43 +02:00
parent a911ef3367
commit b9f559ee04
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -631,15 +631,13 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
if outName in parameters and parameters[outName] is not None: if outName in parameters and parameters[outName] is not None:
# for HTML reports, we need to redirect stdout # for HTML reports, we need to redirect stdout
if out.defaultFileExtension().lower() == 'html': if out.defaultFileExtension().lower() == 'html':
command += ' > "{}"'.format( command += ' {}=- > "{}"'.format(
self.parameterAsFileOutput( outName,
parameters, outName, context) self.parameterAsFileOutput(parameters, outName, context))
)
else: else:
command += ' {}="{}"'.format( command += ' {}="{}"'.format(
outName, outName,
self.parameterAsFileOutput( self.parameterAsFileOutput(parameters, outName, context))
parameters, outName, context))
# For folders destination # For folders destination
elif isinstance(out, QgsProcessingParameterFolderDestination): elif isinstance(out, QgsProcessingParameterFolderDestination):
# We need to add a unique temporary basename # We need to add a unique temporary basename

2
python/plugins/processing/algs/grass7/description/v.net.salesman.txt
View File

@ -10,5 +10,5 @@ QgsProcessingParameterNumber|threshold|Threshold for connecting centers to the n
*QgsProcessingParameterField|arc_backward_column|Arc backward direction cost column (number)|None|input|0|False|True *QgsProcessingParameterField|arc_backward_column|Arc backward direction cost column (number)|None|input|0|False|True
*QgsProcessingParameterBoolean|-g|Use geodesic calculation for longitude-latitude locations|False|True *QgsProcessingParameterBoolean|-g|Use geodesic calculation for longitude-latitude locations|False|True
QgsProcessingParameterVectorDestination|output|Network_Salesman QgsProcessingParameterVectorDestination|output|Network_Salesman
QgsProcessingParameterFileDestination|sequence|Output file holding node sequence|Html files (*.html)|report.html|True QgsProcessingParameterFileDestination|sequence|Output file holding node sequence|CSV files (*.csv)|None|True

4
python/plugins/processing/tests/testdata/expected/grass7/v_net_salesman_seq.csv vendored Normal file
View File

@ -0,0 +1,4 @@
sequence;category;cost_to_next
1;1;0.000
2;2;0.000
3;3;0.000
1 sequence category cost_to_next
2 1 1 0.000
3 2 2 0.000
4 3 3 0.000

3
python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml vendored
View File

@ -280,6 +280,9 @@ tests:
output: output:
name: expected/grass7/v_net_salesman.shp name: expected/grass7/v_net_salesman.shp
type: vector type: vector
sequence:
name: expected/grass7/v_net_salesman_seq.csv
type: file
- algorithm: grass7:v.net.steiner - algorithm: grass7:v.net.steiner
name: v.net.steiner name: v.net.steiner