[GRASS-SVN] r42183 - in grass/trunk: gui/wxpython/xml
raster/r.mapcalc
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun May 9 09:41:19 EDT 2010
Author: martinl
Date: 2010-05-09 09:41:18 -0400 (Sun, 09 May 2010)
New Revision: 42183
Modified:
grass/trunk/gui/wxpython/xml/menudata.xml
grass/trunk/raster/r.mapcalc/main.c
Log:
fix #1059 (wxGUI: No menu option for r.mapcalc)
Modified: grass/trunk/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.xml 2010-05-09 11:58:24 UTC (rev 42182)
+++ grass/trunk/gui/wxpython/xml/menudata.xml 2010-05-09 13:41:18 UTC (rev 42183)
@@ -1007,12 +1007,24 @@
<handler>OnMenuCmd</handler>
<command>r.mask</command>
</menuitem>
- <menuitem>
- <label>Map calculator</label>
- <help>Map calculator for raster map algebra</help>
- <handler>DispMapCalculator</handler>
- </menuitem>
<menu>
+ <label>Map algebra</label>
+ <items>
+ <menuitem>
+ <label>Interactive map calculator</label>
+ <help>Map calculator for raster map algebra.</help>
+ <handler>MapCalculator</handler>
+ </menuitem>
+ <menuitem>
+ <label>Map calculator</label>
+ <help>Raster map calculator.</help>
+ <keywords>raster,algebra</keywords>
+ <handler>OnMenuCmd</handler>
+ <command>r.mapcalc</command>
+ </menuitem>
+ </items>
+ </menu>
+ <menu>
<label>Neighborhood analysis</label>
<items>
<menuitem>
Modified: grass/trunk/raster/r.mapcalc/main.c
===================================================================
--- grass/trunk/raster/r.mapcalc/main.c 2010-05-09 11:58:24 UTC (rev 42182)
+++ grass/trunk/raster/r.mapcalc/main.c 2010-05-09 13:41:18 UTC (rev 42183)
@@ -109,6 +109,7 @@
module = G_define_module();
G_add_keyword(_("raster"));
+ G_add_keyword(_("algebra"));
module->description = _("Raster map calculator.");
module->overwrite = 1;
@@ -117,10 +118,13 @@
expr->type = TYPE_STRING;
expr->required = NO;
expr->description = _("Expression to evaluate");
-
+ expr->guisection = _("Expression");
+
file = G_define_standard_option(G_OPT_F_INPUT);
+ file->key = "file";
file->required = NO;
- file->description = _("File containing expression to evaluate");
+ file->description = _("File containing expression(s) to evaluate");
+ file->guisection = _("Expression");
if (argc == 1)
{
More information about the grass-commit
mailing list