[GRASS-SVN] r71250 - grass/branches/releasebranch_7_2/gui/wxpython/modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2017-07-08 18:58:04 -0700 (Sat, 08 Jul 2017)
New Revision: 71250

Modified:
   grass/branches/releasebranch_7_2/gui/wxpython/modules/mcalc_builder.py
Log:
wxGUI/Expose all r.mapcalc functions and variables in GUI (merge fron trunk, r70796, excluded area() which is in trunk only)

Modified: grass/branches/releasebranch_7_2/gui/wxpython/modules/mcalc_builder.py
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/modules/mcalc_builder.py	2017-07-09 01:50:53 UTC (rev 71249)
+++ grass/branches/releasebranch_7_2/gui/wxpython/modules/mcalc_builder.py	2017-07-09 01:58:04 UTC (rev 71250)
@@ -97,16 +97,24 @@
             'median(x,y[,z...])': 'median( , )',
             'min(x,y[,z...])': 'min( , )',
             'mode(x,y[,z...])': 'mode( , )',
+            'nmax(x,y[,z...])': 'nmax( , )',
+            'nmedian(x,y[,z...])': 'nmedian( , )',
+            'nmin(x,y[,z...])': 'nmin( , )',
+            'nmode(x,y[,z...])': 'nmode( , )',
             'not(x)': 'not()',
             'pow(x,y)': 'pow( , )',
             'rand(a,b)': 'rand( , )',
             'round(x)': 'round()',
+            'round(x,y)': 'round( , )',
+            'round(x,y,z)': 'round( , , )',
             'sin(x)': 'sin()',
             'sqrt(x)': 'sqrt()',
             'tan(x)': 'tan()',
             'xor(x,y)': 'xor( , )',
             'row()': 'row()',
             'col()': 'col()',
+            'nrows()': 'nrows()',
+            'ncols()': 'ncols()',
             'x()': 'x()',
             'y()': 'y()',
             'ewres()': 'ewres()',