Navigation Menu

Skip to content

Commit

Permalink
[processing] fix handling of the HTML output from the GRASS7
Browse files Browse the repository at this point in the history
algorithms (fix #12710)
  • Loading branch information
alexbruy committed May 20, 2015
1 parent dbf026d commit 028467e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
Expand Up @@ -81,7 +81,7 @@ def getIcon(self):
return QIcon(os.path.join(pluginPath, 'images', 'grass.png'))

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

def getParameterDescriptions(self):
Expand All @@ -107,7 +107,7 @@ def getParameterDescriptions(self):
def defineCharacteristicsFromFile(self):
lines = open(self.descriptionFile)
line = lines.readline().strip('\n').strip()
self.grassName = line
self.grass7Name = line
line = lines.readline().strip('\n').strip()
self.name = line
line = lines.readline().strip('\n').strip()
Expand Down Expand Up @@ -291,7 +291,7 @@ def processAlgorithm(self, progress):

# 2: Set parameters and outputs

command = self.grassName
command = self.grass7Name
for param in self.parameters:
if param.value is None or param.value == '':
continue
Expand Down Expand Up @@ -361,7 +361,7 @@ def processAlgorithm(self, progress):
commands.append('g.region raster=' + out.name + uniqueSufix)
outputCommands.append('g.region raster=' + out.name
+ uniqueSufix)
if self.grassName == 'r.composite':
if self.grass7Name == 'r.composite':
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='
command += out.name + uniqueSufix
Expand All @@ -370,9 +370,9 @@ def processAlgorithm(self, progress):
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='

if self.grassName == 'r.horizon':
if self.grass7Name == 'r.horizon':
command += out.name + uniqueSufix + '_0'
elif self.grassName == 'r.composite':
elif self.grass7Name == 'r.composite':
commands.append(command)
outputCommands.append(command)
else:
Expand Down

0 comments on commit 028467e

Please sign in to comment.