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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-09-24 09:00:54 -0700 (Sat, 24 Sep 2011)
New Revision: 48451

Modified:
   grass/trunk/gui/wxpython/gui_modules/goutput.py
   grass/trunk/gui/wxpython/gui_modules/utils.py
Log:
wxGUI: improve r48450 (check for element type)


Modified: grass/trunk/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/goutput.py	2011-09-24 15:57:57 UTC (rev 48450)
+++ grass/trunk/gui/wxpython/gui_modules/goutput.py	2011-09-24 16:00:54 UTC (rev 48451)
@@ -531,6 +531,7 @@
                     # check for <input>=-
                     for p in task.get_options()['params']:
                         if p.get('prompt', '') == 'input' and \
+                                p.get('element', '') == 'file' and \
                                 p.get('age', 'new') == 'old' and \
                                 p.get('value', '') == '-':
                             gcmd.GError(parent = self,

Modified: grass/trunk/gui/wxpython/gui_modules/utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/utils.py	2011-09-24 15:57:57 UTC (rev 48450)
+++ grass/trunk/gui/wxpython/gui_modules/utils.py	2011-09-24 16:00:54 UTC (rev 48451)
@@ -99,8 +99,6 @@
         mapname = 'geodesic'
     elif 'd.rhumbline' in dcmd[0]:
         mapname = 'rhumb'
-    elif 'labels=' in dcmd[0]:
-        mapname = dcmd[idx].split('=')[1] + ' labels'
     else:
         params = list()
         for idx in range(len(dcmd)):