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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-19 04:09:12 -0800 (Sat, 19 Dec 2015)
New Revision: 67249

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py
   grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
Log:
wxGUI/modeler: add support for directory data type
               (merge r67248 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py	2015-12-19 12:06:15 UTC (rev 67248)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/frame.py	2015-12-19 12:09:12 UTC (rev 67249)
@@ -1457,7 +1457,8 @@
                                          _("vector"),
                                          _("region"),
                                          _("mapset"),
-                                         _("file")])
+                                         _("file"),
+                                         _("dir")])
         self.type.SetSelection(2) # string
         self.value = wx.TextCtrl(parent = self, id = wx.ID_ANY)
         self.desc = wx.TextCtrl(parent = self, id = wx.ID_ANY)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2015-12-19 12:06:15 UTC (rev 67248)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gmodeler/model.py	2015-12-19 12:09:12 UTC (rev 67249)
@@ -769,7 +769,7 @@
                                     'idx'    : idx }
             for name, values in self.variables.iteritems():
                 gtype = values.get('type', 'string')
-                if gtype in ('raster', 'vector', 'mapset', 'file', 'region'):
+                if gtype in ('raster', 'vector', 'mapset', 'file', 'region', 'dir'):
                     gisprompt = True
                     prompt = gtype
                     if gtype == 'raster':
@@ -2283,6 +2283,8 @@
             return 'G_OPT_M_MAPSET'
         elif string == 'file':
             return 'G_OPT_F_INPUT'
+        elif string == 'dir':
+            return 'G_OPT_M_DIR'
         elif string == 'region':
             return 'G_OPT_M_REGION'