Skip to content
Permalink
Browse files

[processing]fixes for grass7

processAlgorithm method was actually not being called when running a grass7 algorithm

(cherry picked from commit 2a14ffd)
  • Loading branch information
volaya authored and jef-n committed Aug 11, 2015
1 parent 35028c0 commit 5bcff737a3d394ce18719232fce653d4d479e9b4
Showing with 3 additions and 8 deletions.
  1. +3 −8 python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -422,6 +422,8 @@ def processAlgorithm(self, progress):
if ProcessingConfig.getSetting(Grass7Utils.GRASS_LOG_COMMANDS):
ProcessingLog.addToLog(ProcessingLog.LOG_INFO, loglines)

Grass7Utils.executeGrass7(commands, progress, outputCommands)

for out in self.outputs:
if isinstance(out, OutputHTML):
with open(self.getOutputFromName("rawoutput").value) as f:
@@ -510,14 +512,7 @@ def commandLineName(self):
def checkBeforeOpeningParametersDialog(self):
msg = Grass7Utils.checkGrass7IsInstalled()
if msg is not None:
html = self.tr(
'<p>This algorithm requires GRASS GIS 7 to be run. '
'Unfortunately, it seems that GRASS GIS 7 is not installed in '
'your system, or it is not correctly configured to be used '
'from QGIS</p>'
'<p><a href="http://docs.qgis.org/testing/en/docs/user_manual/processing/3rdParty.html">Click here</a> '
'to know more about how to install and configure GRASS GIS 7 to be used with QGIS</p>') # FIXME update URL or page
return html
return msg

def checkParameterValuesBeforeExecuting(self):
name = self.commandLineName().replace('.', '_')[len('grass7:'):]

0 comments on commit 5bcff73

Please sign in to comment.
You can’t perform that action at this time.