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

Merge pull request #3109 from rldhont/bugfix_processing_getParameterDescriptions

Browse Source 
[BUGFIX][Processing] Add getParameterDescriptions to R, Model and Scr…
This commit is contained in:
volaya 2016-05-26 17:11:46 +02:00
commit d4802e5e9e
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/plugins/processing/algs/r/RAlgorithm.py
View File

@ -434,6 +434,17 @@ class RAlgorithm(GeoAlgorithm):
else:
return False, None
def getParameterDescriptions(self):
descs = {}
helpfile = unicode(self.descriptionFile) + '.help'
if os.path.exists(helpfile):
with open(helpFile) as f:
descriptions = json.load(f)
for param in self.parameters:
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
return descs
def checkBeforeOpeningParametersDialog(self):
msg = RUtils.checkRIsInstalled()
if msg is not None:

8
python/plugins/processing/modeler/ModelerAlgorithm.py
View File

@ -544,6 +544,14 @@ class ModelerAlgorithm(GeoAlgorithm):
except:
return False, None
def getParameterDescriptions(self):
descs = {}
descriptions = self.helpContent
for param in self.parameters:
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
return descs
def todict(self):
keys = ["inputs", "group", "name", "algs", "helpContent"]
return {k: v for k, v in self.__dict__.iteritems() if k in keys}

14
python/plugins/processing/script/ScriptAlgorithm.py
View File

@ -105,7 +105,7 @@ class ScriptAlgorithm(GeoAlgorithm):
self.processParameterLine(line.strip('\n'))
except:
self.error = self.tr('This script has a syntax errors.\n'
'Problem with line: %s', 'ScriptAlgorithm') % line
'Problem with line: %s', 'ScriptAlgorithm') % line
self.script += line
line = lines.readline()
lines.close()
@ -124,7 +124,6 @@ class ScriptAlgorithm(GeoAlgorithm):
except:
pass
def checkBeforeOpeningParametersDialog(self):
return self.error
@ -349,3 +348,14 @@ class ScriptAlgorithm(GeoAlgorithm):
return True, getHtmlFromHelpFile(self, helpfile)
else:
return False, None
def getParameterDescriptions(self):
descs = {}
helpfile = unicode(self.descriptionFile) + '.help'
if os.path.exists(helpfile):
with open(helpFile) as f:
descriptions = json.load(f)
for param in self.parameters:
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
return descs