[processing] fixed how models read help info

qgis · Sep 24, 2014 · 1cd0c43 · 1cd0c43
1 parent 5b82d41
commit 1cd0c43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/python/plugins/processing/gui/Help2Html.py b/python/plugins/processing/gui/Help2Html.py
@@ -60,8 +60,12 @@ def getHtmlFromHelpFile(alg, helpFile):
     try:
         with open(helpFile) as f:
             descriptions = json.load(f)
+            return getHtmlFromDescriptionsDict(descriptions)
     except:
         return None
+
+def getHtmlFromDescriptionsDict(alg, descriptions):
+
     s = '<html><body><h2>Algorithm description</h2>\n'
     s += '<p>' + getDescription(ALG_DESC, descriptions) + '</p>\n'
     s += '<h2>Input parameters</h2>\n'

diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -17,8 +17,6 @@
 ***************************************************************************
 """
 
-
-
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
 __copyright__ = '(C) 2012, Victor Olaya'
@@ -45,8 +43,7 @@
 from processing.core.parameters import *
 from processing.tools import dataobjects
 from processing.core.parameters import getParameterFromString
-
-
+from processing.gui.Help2Html import getHtmlFromDescriptionsDict
 
 class ModelerParameter():
 
@@ -468,8 +465,7 @@ def updateModelerView(self):
 
     def help(self):
         try:
-            helpfile = self.descriptionFile + '.help'
-            return True, getHtmlFromHelpFile(self, helpfile)
+            return True, getHtmlFromDescriptionsDict(self, self.help())
         except:
             return False, None