Skip to content

Commit 028467e

Browse files
committed
[processing] fix handling of the HTML output from the GRASS7
algorithms (fix #12710)
1 parent dbf026d commit 028467e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

python/plugins/processing/algs/grass7/Grass7Algorithm.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def getIcon(self):
8181
return QIcon(os.path.join(pluginPath, 'images', 'grass.png'))
8282

8383
def help(self):
84-
return False, 'http://grass.osgeo.org/grass70/manuals/' + self.grassName \
84+
return False, 'http://grass.osgeo.org/grass70/manuals/' + self.grass7Name \
8585
+ '.html'
8686

8787
def getParameterDescriptions(self):
@@ -107,7 +107,7 @@ def getParameterDescriptions(self):
107107
def defineCharacteristicsFromFile(self):
108108
lines = open(self.descriptionFile)
109109
line = lines.readline().strip('\n').strip()
110-
self.grassName = line
110+
self.grass7Name = line
111111
line = lines.readline().strip('\n').strip()
112112
self.name = line
113113
line = lines.readline().strip('\n').strip()
@@ -291,7 +291,7 @@ def processAlgorithm(self, progress):
291291

292292
# 2: Set parameters and outputs
293293

294-
command = self.grassName
294+
command = self.grass7Name
295295
for param in self.parameters:
296296
if param.value is None or param.value == '':
297297
continue
@@ -361,7 +361,7 @@ def processAlgorithm(self, progress):
361361
commands.append('g.region raster=' + out.name + uniqueSufix)
362362
outputCommands.append('g.region raster=' + out.name
363363
+ uniqueSufix)
364-
if self.grassName == 'r.composite':
364+
if self.grass7Name == 'r.composite':
365365
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
366366
command += ' input='
367367
command += out.name + uniqueSufix
@@ -370,9 +370,9 @@ def processAlgorithm(self, progress):
370370
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
371371
command += ' input='
372372

373-
if self.grassName == 'r.horizon':
373+
if self.grass7Name == 'r.horizon':
374374
command += out.name + uniqueSufix + '_0'
375-
elif self.grassName == 'r.composite':
375+
elif self.grass7Name == 'r.composite':
376376
commands.append(command)
377377
outputCommands.append(command)
378378
else:

0 commit comments

Comments
 (0)