[processing] fixed help in models

qgis · Nov 23, 2014 · 484e162 · 484e162
1 parent 8039895
commit 484e162
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -165,6 +165,7 @@ def getCopy(self):
         newone.name = self.name
         newone.group = self.group
         newone.descriptionFile = self.descriptionFile
+        newone.helpContent = copy.deepcopy(self.helpContent)
         return newone
 
     def __init__(self):
@@ -473,13 +474,14 @@ def updateModelerView(self):
             self.modelerdialog.repaintModel()
 
     def help(self):
+        print self.helpContent
         try:
-            return True, getHtmlFromDescriptionsDict(self, self.help())
+            return True, getHtmlFromDescriptionsDict(self, self.helpContent)
         except:
             return False, None
 
     def todict(self):
-        keys = ["inputs", "group", "name", "algs"]
+        keys = ["inputs", "group", "name", "algs", "helpContent"]
         return {k:v for k,v in self.__dict__.iteritems() if k in keys}
 
     def toJson(self):
@@ -493,6 +495,7 @@ def todict(o):
                 pass
         return json.dumps(self, default=todict, indent=4)
 
+
     @staticmethod
     def fromJson(s):
         def fromdict(d):

diff --git a/python/plugins/processing/modeler/ModelerAlgorithmProvider.py b/python/plugins/processing/modeler/ModelerAlgorithmProvider.py
@@ -84,6 +84,7 @@ def loadFromFolder(self, folder):
                         alg = ModelerAlgorithm.fromFile(fullpath)
                         if alg.name:
                             alg.provider = self
+                            alg.descriptionFile = fullpath
                             self.algs.append(alg)
                         else:
                             ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,

diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py
@@ -215,8 +215,10 @@ def closeEvent(self, evt):
             evt.accept()
 
     def editHelp(self):
-        dlg = HelpEditionDialog(self.alg.getCopy())
+        dlg = HelpEditionDialog(self.alg)
         dlg.exec_()
+        if dlg.descriptions:
+            self.hasChanged = True
 
     def runModel(self):
         if len(self.alg.algs) == 0: