浏览代码

wxGUI: define list of commands for auto-rendering
(merge https://trac.osgeo.org/grass/changeset/43889 from devbr6)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43890 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 14 年之前
父节点
当前提交
27220d7ad3

+ 3 - 0
gui/wxpython/gui_modules/globalvar.py

@@ -179,3 +179,6 @@ else:
 
 
 """@Check version of wxPython, use agwStyle for 2.8.11+"""
 """@Check version of wxPython, use agwStyle for 2.8.11+"""
 hasAgw = CheckWxVersion()
 hasAgw = CheckWxVersion()
+
+"""@List of commands for auto-rendering"""
+cmdAutoRender = [ 'r.colors', 'i.landsat.rgb' ]

+ 2 - 2
gui/wxpython/gui_modules/goutput.py

@@ -712,9 +712,9 @@ class GMConsole(wx.SplitterWindow):
         # set focus on prompt
         # set focus on prompt
         if self.parent.GetName() == "LayerManager":
         if self.parent.GetName() == "LayerManager":
             self.btn_abort.Enable(False)
             self.btn_abort.Enable(False)
-            if event.cmd[0] in ('r.colors'):
+            if event.cmd[0] in globalvar.cmdAutoRender:
                 display = self.parent.GetLayerTree().GetMapDisplay()
                 display = self.parent.GetLayerTree().GetMapDisplay()
-                if display:
+                if display and display.IsAutoRendered():
                     display.GetWindow().UpdateMap(render = True)
                     display.GetWindow().UpdateMap(render = True)
         
         
         else:
         else:

+ 6 - 4
gui/wxpython/gui_modules/mapdisp.py

@@ -666,15 +666,17 @@ class MapFrame(wx.Frame):
         # event.Skip()
         # event.Skip()
 
 
     def OnToggleRender(self, event):
     def OnToggleRender(self, event):
-        """
-        Enable/disable auto-rendering
+        """!Enable/disable auto-rendering
         """
         """
         if self.statusbarWin['render'].GetValue():
         if self.statusbarWin['render'].GetValue():
             self.OnRender(None)
             self.OnRender(None)
 
 
+    def IsAutoRendered(self):
+        """!Check if auto-rendering is enabled"""
+        return self.statusbarWin['render'].IsChecked()
+    
     def OnToggleShowRegion(self, event):
     def OnToggleShowRegion(self, event):
-        """
-        Show/Hide extent in map canvas
+        """!Show/Hide extent in map canvas
         """
         """
         if self.statusbarWin['region'].GetValue():
         if self.statusbarWin['region'].GetValue():
             # show extent
             # show extent

+ 2 - 2
gui/wxpython/gui_modules/menuform.py

@@ -894,13 +894,13 @@ class mainFrame(wx.Frame):
                 returncode != 0:
                 returncode != 0:
             return
             return
         
         
-        if cmd[0] in ('r.colors'):
+        if cmd[0] in globalvar.cmdAutoRender:
             if self.parent.GetName() == 'LayerTree':
             if self.parent.GetName() == 'LayerTree':
                 display = self.parent.GetMapDisplay()
                 display = self.parent.GetMapDisplay()
             else: # Layer Manager
             else: # Layer Manager
                 display = self.parent.GetLayerTree().GetMapDisplay()
                 display = self.parent.GetLayerTree().GetMapDisplay()
             
             
-            if display:
+            if display and display.IsAutoRendered():
                 display.GetWindow().UpdateMap(render = True)
                 display.GetWindow().UpdateMap(render = True)
         
         
     def OnOK(self, event):
     def OnOK(self, event):