[GRASS-SVN] r44170 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-02 07:51:27 -0700 (Tue, 02 Nov 2010)
New Revision: 44170

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/goutput.py
Log:
wxGUI: don't parse r.mapcalc
(merge r44165 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/goutput.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/goutput.py	2010-11-02 14:48:13 UTC (rev 44169)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/goutput.py	2010-11-02 14:51:27 UTC (rev 44170)
@@ -698,32 +698,31 @@
         self.console_progressbar.SetValue(0) # reset progress bar on '0%'
 
         self.cmd_output_timer.Stop()
-
-        # set focus on prompt
-        if self.parent.GetName() == "LayerManager" and \
-                event.cmd[0] in globalvar.grassCmd['all']:
+        
+        if self.parent.GetName() == "LayerManager":
             self.btn_abort.Enable(False)
+            if event.cmd[0] not in globalvar.grassCmd['all'] or \
+                    event.cmd[0] == 'r.mapcalc':
+                return
             display = self.parent.GetLayerTree().GetMapDisplay()
-            if display and display.IsAutoRendered():
-                mapLayers = map(lambda x: x.GetName(),
-                                display.GetRender().GetListOfLayers(l_type = 'raster') +
-                                display.GetRender().GetListOfLayers(l_type = 'vector'))
-                
-                task = menuform.GUI().ParseCommand(event.cmd, show = None)
-                for p in task.get_options()['params']:
-                    if p.get('prompt', '') not in ('raster', 'vector'):
-                        continue
-                    mapName = p.get('value', '')
-                    if '@' not in mapName:
-                        mapName = mapName + '@' + grass.gisenv()['MAPSET']
-                    if mapName in mapLayers:
-                        display.GetWindow().UpdateMap(render = True)
-                        return
+            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'))
             
-        else:
-            # updated command dialog
+            task = menuform.GUI().ParseCommand(event.cmd, show = None)
+            for p in task.get_options()['params']:
+                if p.get('prompt', '') not in ('raster', 'vector'):
+                    continue
+                mapName = p.get('value', '')
+                if '@' not in mapName:
+                    mapName = mapName + '@' + grass.gisenv()['MAPSET']
+                if mapName in mapLayers:
+                    display.GetWindow().UpdateMap(render = True)
+                    return
+        else: # standalone dialogs
             dialog = self.parent.parent
-
             if hasattr(self.parent.parent, "btn_abort"):
                 dialog.btn_abort.Enable(False)
             
@@ -783,8 +782,6 @@
                 time.sleep(1)
                 dialog.Close()
         
-        event.Skip()
-        
     def OnProcessPendingOutputWindowEvents(self, event):
         self.ProcessPendingEvents()