[GRASS-SVN] r66946 - grass/trunk/gui/wxpython/gmodeler

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-11-27 15:16:40 -0800 (Fri, 27 Nov 2015)
New Revision: 66946

Modified:
   grass/trunk/gui/wxpython/gmodeler/model.py
Log:
wxGUI/gmodeler: fix GetParams()


Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py	2015-11-27 23:03:47 UTC (rev 66945)
+++ grass/trunk/gui/wxpython/gmodeler/model.py	2015-11-27 23:16:40 UTC (rev 66946)
@@ -1187,19 +1187,18 @@
         """
         self.isValid = True
 
-        options = self.GetParameterizedParams()
-        if options['flags'] or options['params']:
-            self.isParameterized = True
-        else:
-            self.isParameterized = False
+        for f in options['flags']:
+            if f.get('parameterized', False):
+                self.isParameterized = True
+                break
 
-        options = self.GetParams()
         for p in options['params']:
             if self.isValid and p.get('required', False) and \
                p.get('value', '') == '' and \
                p.get('default', '') == '':
                 self.isValid = False
-                break
+            if not self.isParameterized and p.get('parameterized', False):
+                self.isParameterized = True
         
         if self.parent.GetCanvas():
             self._setBrush()