[GRASS-SVN] r67762 - grass/branches/releasebranch_7_0/gui/wxpython/gmodeler

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-07 12:08:29 -0800 (Sun, 07 Feb 2016)
New Revision: 67762

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
Log:
wxGUI/gmodeler: fix parametrized dialog on more items with the same label (merge r67761 from trunk)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2016-02-07 19:53:04 UTC (rev 67761)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2016-02-07 20:08:29 UTC (rev 67762)
@@ -813,9 +813,11 @@
                 continue
             name   = action.GetLabel()
             params = action.GetParams()
+            increment = False
             for f in params['flags']:
                 if f.get('parameterized', False):
                     if name not in result:
+                        increment = True
                         result[name] = { 'flags' : list(),
                                          'params': list(),
                                          'idx'   : idx }
@@ -823,11 +825,12 @@
             for p in params['params']:
                 if p.get('parameterized', False):
                     if name not in result:
+                        increment = True
                         result[name] = { 'flags' : list(),
                                          'params': list(),
                                          'idx'   : idx }
                     result[name]['params'].append(p)
-            if name in result:
+            if increment:
                 idx += 1
         
         self.variablesParams = result # record parameters