Browse Source

wxGUI: partly re-enable layerChanged events (rendering in threads, work in progress)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@65213 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 years ago
parent
commit
f8b579d597
2 changed files with 6 additions and 10 deletions
  1. 3 2
      gui/wxpython/core/render.py
  2. 3 8
      gui/wxpython/mapwin/buffered.py

+ 3 - 2
gui/wxpython/core/render.py

@@ -1215,8 +1215,9 @@ class Map(object):
         if render and not layer.Render():
             raise GException(_("Unable to render map layer <%s>.") %
                              layer.GetName())
-        
-        self.layerChanged(layer=layer)
+
+        # not needed since there is self.forceRender
+        ### self.layerChanged(layer=layer)
         
         return layer
 

+ 3 - 8
gui/wxpython/mapwin/buffered.py

@@ -180,8 +180,7 @@ class BufferedMapWindow(MapWindowBase, wx.Window):
         self.Bind(wx.EVT_ERASE_BACKGROUND, lambda x:None)
 
         # rerender when Map reports change
-        ### Not needed when using RenderMapMgr
-        # self.Map.layerChanged.connect(self.OnUpdateMap)
+        self.Map.layerChanged.connect(self.OnUpdateMap)
         self.Map.GetRenderMgr().renderDone.connect(self._updateMFinished)
         
         # vars for handling mouse clicks
@@ -198,15 +197,11 @@ class BufferedMapWindow(MapWindowBase, wx.Window):
 
     def DisactivateWin(self):
         """Use when the class instance is hidden in MapFrame."""
-        ### Not needed when using RenderMapMgr
-        # self.Map.layerChanged.disconnect(self.OnUpdateMap)\
-        pass
+        self.Map.layerChanged.disconnect(self.OnUpdateMap)
     
     def ActivateWin(self):
         """Used when the class instance is activated in MapFrame."""
-        ### Not needed when using RenderMapMgr
-        # self.Map.layerChanged.connect(self.OnUpdateMap)
-        pass
+        self.Map.layerChanged.connect(self.OnUpdateMap)
         
     def _definePseudoDC(self):
         """Define PseudoDC objects to use