Преглед на файлове

wxGUI: fix vector querying in d.mon, see https://trac.osgeo.org/grass/ticket/2928

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68246 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová преди 9 години
родител
ревизия
75a9b2c83a
променени са 2 файла, в които са добавени 10 реда и са изтрити 5 реда
  1. 2 0
      gui/wxpython/mapdisp/frame.py
  2. 8 5
      gui/wxpython/mapdisp/main.py

+ 2 - 0
gui/wxpython/mapdisp/frame.py

@@ -830,6 +830,8 @@ class MapFrame(SingleMapFrame):
             rast = []
             vect = []
             for layer in layers:
+                if layer.type == 'command':
+                    continue
                 name, found = GetLayerNameFromCmd(layer.cmd)
                 if not found:
                     continue

+ 8 - 5
gui/wxpython/mapdisp/main.py

@@ -257,18 +257,18 @@ class DMonMap(Map):
         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"""
@@ -368,6 +368,9 @@ class DMonGrassInterface(StandaloneGrassInterface):
     def GetMapWindow(self):
         return self._mapframe.GetMapWindow()
 
+    def GetMapDisplay(self):
+        return self._mapframe
+
     def GetProgress(self):
         return self._mapframe.GetProgressBar()