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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-07-04 16:33:05 -0400 (Sat, 04 Jul 2009)
New Revision: 38215

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
Log:
wxGUI: determine map layer name
       (merge from trunk, r38214)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-07-04 20:28:38 UTC (rev 38214)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2009-07-04 20:33:05 UTC (rev 38215)
@@ -355,7 +355,17 @@
                     return None
 
                 # add layer into layer tree
+                if cmdlist[0] == 'd.rast':
+                    lname = utils.GetLayerNameFromCmd(cmdlist, fullyQualified = True,
+                                                      layerType = 'raster')
+                elif cmdlist[0] == 'd.vect':
+                    lname = utils.GetLayerNameFromCmd(cmdlist, fullyQualified = True,
+                                                      layerType = 'vector')
+                else:
+                    lname = None
+                
                 self.parent.curr_page.maptree.AddLayer(ltype=layertype,
+                                                       lname=lname,
                                                        lcmd=cmdlist)
 
             else: