[GRASS-SVN] r70039 - grass/branches/releasebranch_7_0/scripts/r.out.xyz

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-12-08 22:45:03 -0800 (Thu, 08 Dec 2016)
New Revision: 70039

Modified:
   grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.html
   grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py
Log:
r.out.xyz: new -i flag to include no data values (trunk, r70017)

Modified: grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.html	2016-12-08 15:19:43 UTC (rev 70038)
+++ grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.html	2016-12-09 06:45:03 UTC (rev 70039)
@@ -5,8 +5,10 @@
 
 <h2>NOTES</h2>
 
-This module will not export x,y coordinates for raster cells containing
-a NULL value. This includes cells masked by a raster MASK.
+This module will by default not export x,y coordinates for raster cells
+containing a NULL value. This includes cells masked by a raster MASK.
+Using the flag <b>-i</b> also these raster cells will be included in the
+exported data.
 <p>
 This module, as all GRASS raster modules, will export cells based on the
 current region settings. See the <em>g.region</em> module for details.
@@ -17,7 +19,7 @@
 <em>r.out.xyz</em> can combine several input raster maps, which can be 
 convenient when it comes to e.g. produce ASCII point cloud files.
 <p>
-<em>r.out.xyz</em> is simply a front-end to "<tt>r.stats -1gn</tt>".
+<em>r.out.xyz</em> is simply a front-end to "<tt>r.stats -1g[n]</tt>".
 
 <h2>EXAMPLES</h2>
 

Modified: grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py	2016-12-08 15:19:43 UTC (rev 70038)
+++ grass/branches/releasebranch_7_0/scripts/r.out.xyz/r.out.xyz.py	2016-12-09 06:45:03 UTC (rev 70039)
@@ -2,7 +2,7 @@
 ############################################################################
 #
 # MODULE:       r.out.xyz
-# AUTHOR:       M. Hamish Bowman, Dept. Marine Science, Otago Univeristy,
+# AUTHOR:       M. Hamish Bowman, Dept. Marine Science, Otago University,
 #                 New Zealand
 #               Converted to Python by Glynn Clements
 # PURPOSE:      Export a raster map as x,y,z values based on cell centers
@@ -32,16 +32,26 @@
 #%end
 #%option G_OPT_F_SEP
 #%end
+#%flag
+#% key: i
+#% description: Include no data values
+#%end
 
 import sys
 from grass.script import core as grass
 from grass.exceptions import CalledModuleError
 
+
 def main():
     # if no output filename, output to stdout
     output = options['output']
+    donodata = flags['i']
 
-    parameters = dict(flags="1gn",
+    if donodata:
+	statsflags="1g"
+    else:
+	statsflags="1gn"
+    parameters = dict(flags=statsflags,
                       input=options['input'],
                       separator=options['separator'])
     if output: