[GRASS-SVN] r51424 - grass/branches/releasebranch_6_4/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-04-13 11:22:45 -0700 (Fri, 13 Apr 2012)
New Revision: 51424

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/dialogs.py
Log:
wxGUI: import/link data (avoid multiple map layers in tree)
      d.rast: -n -> -o
      (merge r51422 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/dialogs.py	2012-04-13 18:21:13 UTC (rev 51423)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/dialogs.py	2012-04-13 18:22:45 UTC (rev 51424)
@@ -1626,17 +1626,18 @@
         if self.importType == 'gdal':
             cmd = ['d.rast',
                    'map=%s' % name]
-            if UserSettings.Get(group = 'cmd', key = 'rasterOpaque', subkey = 'enabled'):
-                cmd.append('-n')
-                
+            if UserSettings.Get(group = 'cmd', key = 'rasterOverlay', subkey = 'enabled'):
+                cmd.append('-o')
+            
             item = maptree.AddLayer(ltype = 'raster',
                                     lname = name, lchecked = False,
-                                    lcmd = cmd)
+                                    lcmd = cmd, multiple = False)
         else:
             item = maptree.AddLayer(ltype = 'vector',
                                     lname = name, lchecked = False,
                                     lcmd = ['d.vect',
-                                            'map=%s' % name])
+                                            'map=%s' % name],
+                                    multiple = False)
         
         maptree.mapdisplay.MapWindow.ZoomToMap()