[GRASS-SVN] r47171 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-18 12:48:46 -0700 (Mon, 18 Jul 2011)
New Revision: 47171

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm_base.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
Log:
wxGUI: don't encode if value is unicode


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm_base.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm_base.py	2011-07-18 19:36:38 UTC (rev 47170)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm_base.py	2011-07-18 19:48:46 UTC (rev 47171)
@@ -6,7 +6,7 @@
 List of classes:
  - VectorDBInfo
 
-(C) 2007-2010 by the GRASS Development Team
+(C) 2007-2011 by the GRASS Development Team
 
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
@@ -28,6 +28,9 @@
 
 def unicodeValue(value):
     """!Encode value"""
+    if type(value) == types.UnicodeType:
+        return value
+    
     enc = UserSettings.Get(group = 'atm', key = 'encoding', subkey = 'value')
     if enc:
         value = unicode(value, enc)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2011-07-18 19:36:38 UTC (rev 47170)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2011-07-18 19:48:46 UTC (rev 47171)
@@ -1310,7 +1310,6 @@
             
             vcmd.append('-a')
             vcmd.append('map=%s' % ','.join(vect))
-            vcmd.append('layer=%s' % ','.join(['-1'] * len(vect)))
             vcmd.append('east_north=%f,%f' % (float(east), float(north)))
             vcmd.append('distance=%f' % float(qdist))