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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-22 14:53:29 -0800 (Mon, 22 Nov 2010)
New Revision: 44375

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/prompt.py
Log:
wxGUI: start raster map calculator from prompt
(merge r44374 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/prompt.py	2010-11-22 22:51:57 UTC (rev 44374)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/prompt.py	2010-11-22 22:53:29 UTC (rev 44375)
@@ -737,10 +737,14 @@
         
         cmd = text.split()[0]
         if not self.cmdDesc or cmd != self.cmdDesc.get_name():
-            try:
-                self.cmdDesc = menuform.GUI().ParseInterface(cmd = [cmd])
-            except IOError:
-                self.cmdDesc = None
+            if cmd in ('r.mapcalc', 'r3.mapcalc'):
+                self.parent.parent.OnMapCalculator(event = None, cmd = [cmd])
+                self.OnCmdErase(None)
+            else:
+                try:
+                    self.cmdDesc = menuform.GUI().ParseInterface(cmd = [cmd])
+                except IOError:
+                    self.cmdDesc = None
         
     def OnKeyPressed(self, event):
         """!Key press capture for autocompletion, calltips, and command history