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

[Processing] Fix getParameterDescriptions

Browse Source 
Add import json for script and r
return descs and not None
This commit is contained in:
rldhont 2016-05-31 17:23:28 +02:00
parent b79e5bb3a2
commit bb41cceb34
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
__revision__ = '$Format:%H$'
import os
import json
from qgis.PyQt.QtGui import QIcon
@ -461,7 +462,7 @@ class RAlgorithm(GeoAlgorithm):
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
except:
return None
return descs
return descs
def checkBeforeOpeningParametersDialog(self):

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

@ -27,6 +27,7 @@ __revision__ = '$Format:%H$'
import os
import re
import json
from qgis.core import QgsExpressionContextUtils, QgsExpressionContext
from qgis.PyQt.QtGui import QIcon
from processing.core.GeoAlgorithm import GeoAlgorithm
@ -378,5 +379,5 @@ class ScriptAlgorithm(GeoAlgorithm):
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
except:
return None
return descs
return descs