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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-16 02:53:20 -0700 (Sun, 16 Oct 2011)
New Revision: 48827

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmapdisp.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: rename GetRender() to GetMap()


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmapdisp.py	2011-10-16 09:45:38 UTC (rev 48826)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gcpmapdisp.py	2011-10-16 09:53:20 UTC (rev 48827)
@@ -952,7 +952,7 @@
         self.PopupMenu(printmenu)
         printmenu.Destroy()
 
-    def GetRender(self):
+    def GetMap(self):
         """!Returns current instance of render.Map()
         """
         return self.Map

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2011-10-16 09:45:38 UTC (rev 48826)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/goutput.py	2011-10-16 09:53:20 UTC (rev 48827)
@@ -773,8 +773,8 @@
             if not display or not display.IsAutoRendered():
                 return
             mapLayers = map(lambda x: x.GetName(),
-                            display.GetRender().GetListOfLayers(l_type = 'raster') +
-                            display.GetRender().GetListOfLayers(l_type = 'vector'))
+                            display.GetMap().GetListOfLayers(l_type = 'raster') +
+                            display.GetMap().GetListOfLayers(l_type = 'vector'))
             
             try:
                 task = menuform.GUI(show = None).ParseCommand(event.cmd)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2011-10-16 09:45:38 UTC (rev 48826)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2011-10-16 09:53:20 UTC (rev 48827)
@@ -1223,7 +1223,7 @@
             if pgnum > -1:
                 self.layerbook.DeletePage(pgnum)
         
-    def GetRender(self):
+    def GetMap(self):
         """!Returns current instance of render.Map()
         """
         return self.Map

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2011-10-16 09:45:38 UTC (rev 48826)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2011-10-16 09:53:20 UTC (rev 48827)
@@ -599,8 +599,8 @@
             return
         
         mapLayers = map(lambda x: x.GetName(),
-                        display.GetRender().GetListOfLayers(l_type = 'raster') +
-                        display.GetRender().GetListOfLayers(l_type = 'vector'))
+                        display.GetMap().GetListOfLayers(l_type = 'raster') +
+                        display.GetMap().GetListOfLayers(l_type = 'vector'))
         
         task = GUI(show = None).ParseCommand(cmd)
         for p in task.get_options()['params']: