[GRASS-SVN] r68246 - grass/trunk/gui/wxpython/mapdisp

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-04-10 20:53:46 -0700 (Sun, 10 Apr 2016)
New Revision: 68246

Modified:
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/mapdisp/main.py
Log:
wxGUI: fix vector querying in d.mon, see #2928

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2016-04-10 19:07:39 UTC (rev 68245)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2016-04-11 03:53:46 UTC (rev 68246)
@@ -830,6 +830,8 @@
             rast = []
             vect = []
             for layer in layers:
+                if layer.type == 'command':
+                    continue
                 name, found = GetLayerNameFromCmd(layer.cmd)
                 if not found:
                     continue

Modified: grass/trunk/gui/wxpython/mapdisp/main.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/main.py	2016-04-10 19:07:39 UTC (rev 68245)
+++ grass/trunk/gui/wxpython/mapdisp/main.py	2016-04-11 03:53:46 UTC (rev 68246)
@@ -257,19 +257,19 @@
         For input params and returned data see overridden method in Map class.
         """
         driver = UserSettings.Get(group = 'display', key = 'driver', subkey = 'type')
-    
+
         if driver == 'png':
             os.environ["GRASS_RENDER_IMMEDIATE"] = "png"
         else:
             os.environ["GRASS_RENDER_IMMEDIATE"] = "cairo"
 
-        layer = Map.AddLayer(self, render = False, *args, **kwargs)
-        llayer.SetMapFile(self.mapfile)
-        
+        layer = Map.AddLayer(self, *args, **kwargs)
+
         del os.environ["GRASS_RENDER_IMMEDIATE"]
 
-        #return layer
+        return layer
 
+
 class Layer(object):
     """@implements core::giface::Layer"""
     def __init__(self, maplayer):
@@ -368,6 +368,9 @@
     def GetMapWindow(self):
         return self._mapframe.GetMapWindow()
 
+    def GetMapDisplay(self):
+        return self._mapframe
+
     def GetProgress(self):
         return self._mapframe.GetProgressBar()