[GRASS-SVN] r42187 - in grass/trunk/gui/wxpython: . xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-09 12:27:42 -0400 (Sun, 09 May 2010)
New Revision: 42187

Modified:
   grass/trunk/gui/wxpython/wxgui.py
   grass/trunk/gui/wxpython/xml/menudata.xml
Log:
wxGUI: add r3.mapcalc to the menu


Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2010-05-09 16:23:08 UTC (rev 42186)
+++ grass/trunk/gui/wxpython/wxgui.py	2010-05-09 16:27:42 UTC (rev 42187)
@@ -959,17 +959,15 @@
     def OnMapCalculator(self, event):
         """!Init map calculator for interactive creation of mapcalc statements
         """
-        win = mapcalculator.MapCalcFrame(parent = self, title = _('2D raster calculator'))
+        win = mapcalculator.MapCalcFrame(parent = self, title = _('GRASS GIS Map Calculator'))
         win.CentreOnScreen()
         win.Show()
         
-    def Disp3DMapCalculator(self, event):
+    def OnMapCalculator3D(self, event):
+        """!Init map calculator for interactive creation of mapcalc statements
         """
-        Init map calculator for interactive creation of mapcalc statements
-        """
-        
-        mapcalculator.MapCalcFrame(parent = self, title = _('3D raster calculator'),
-                                   rast3d = True)
+        win = mapcalculator.MapCalcFrame(parent = self, title = _('GRASS GIS Map Calculator (3D raster)'),
+                                         rast3d = True)
         win.CentreOnScreen()
         win.Show()
         

Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml	2010-05-09 16:23:08 UTC (rev 42186)
+++ grass/trunk/gui/wxpython/xml/menudata.xml	2010-05-09 16:27:42 UTC (rev 42187)
@@ -2791,12 +2791,24 @@
 	  <handler>OnMenuCmd</handler>
 	  <command>r3.mask</command>
 	</menuitem>
+	<menu>
+	  <label>Map algebra</label>
+	  <items>
+	    <menuitem>
+	      <label>Interactive map calculator</label>
+	      <help>Map calculator for raster map algebra.</help>
+	      <handler>OnMapCalculator3D</handler>
+	    </menuitem>
+	    <menuitem>
+	      <label>Map calculator</label>
+	      <help>Raster map calculator.</help>
+	      <keywords>raster,algebra</keywords>
+	      <handler>OnMenuCmd</handler>
+	      <command>r3.mapcalc</command>
+	    </menuitem>
+	  </items>
+	</menu>
 	<menuitem>
-	  <label>3D raster map calculator</label>
-	  <help>Map calculator for volumetric map algebra</help>
-	  <handler>Disp3DMapCalculator</handler>
-	</menuitem>
-	<menuitem>
 	  <label>Cross section</label>
 	  <help>Creates cross section 2D raster map from 3d raster map based on 2D elevation map</help>
 	  <keywords>raster3d,voxel</keywords>