[GRASS-SVN] r48702 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-09 15:35:07 -0700 (Sun, 09 Oct 2011)
New Revision: 48702

Modified:
   grass/trunk/gui/wxpython/gui_modules/gmodeler.py
Log:
wxGUI/modeler: support also mapsets
	       (merge r48701 from devbr6)


Modified: grass/trunk/gui/wxpython/gui_modules/gmodeler.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gmodeler.py	2011-10-09 22:33:58 UTC (rev 48701)
+++ grass/trunk/gui/wxpython/gui_modules/gmodeler.py	2011-10-09 22:35:07 UTC (rev 48702)
@@ -597,13 +597,13 @@
                                        'idx' : idx }
             for name, values in self.variables.iteritems():
                 gtype = values.get('type', 'string')
-                if gtype in ('raster', 'vector'):
+                if gtype in ('raster', 'vector', 'mapset'):
                     gisprompt = True
                     prompt = gtype
                     if gtype == 'raster':
                         element = 'cell'
                     else:
-                        element = 'vector'
+                        element = gtype
                     ptype = 'string'
                 else:
                     gisprompt = False
@@ -611,12 +611,12 @@
                     element = None
                     ptype = gtype
                 params.append({ 'gisprompt' : gisprompt,
-                                'multiple'  : 'no',
+                                'multiple'  : False,
                                 'description' : values.get('description', ''),
                                 'guidependency' : '',
                                 'default' : '',
                                 'age' : None,
-                                'required' : 'yes',
+                                'required' : True,
                                 'value' : values.get('value', ''),
                                 'label' : '',
                                 'guisection' : '',
@@ -3695,6 +3695,7 @@
         for name in nameOrdered:
             params = self.params[name]
             panel = self._createPage(name, params)
+            
             self.notebook.AddPage(panel, text = name)
         
         return panel
@@ -3796,7 +3797,8 @@
                                          _("float"),
                                          _("string"),
                                          _("raster"),
-                                         _("vector")])
+                                         _("vector"),
+                                         _("mapset")])
         self.value = wx.TextCtrl(parent = self, id = wx.ID_ANY)
         self.desc = wx.TextCtrl(parent = self, id = wx.ID_ANY)