Browse Source

r.out.xyz: new -i flag to include no data values (trunk, https://trac.osgeo.org/grass/changeset/70017)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@70039 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 8 years ago
parent
commit
2aabcb9df0
2 changed files with 17 additions and 5 deletions
  1. 5 3
      scripts/r.out.xyz/r.out.xyz.html
  2. 12 2
      scripts/r.out.xyz/r.out.xyz.py

+ 5 - 3
scripts/r.out.xyz/r.out.xyz.html

@@ -5,8 +5,10 @@ values into an ASCII text file.
 
 
 <h2>NOTES</h2>
 <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>
 <p>
 This module, as all GRASS raster modules, will export cells based on the
 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.
 current region settings. See the <em>g.region</em> module for details.
@@ -17,7 +19,7 @@ size row x column) containing z values.
 <em>r.out.xyz</em> can combine several input raster maps, which can be 
 <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.
 convenient when it comes to e.g. produce ASCII point cloud files.
 <p>
 <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>
 <h2>EXAMPLES</h2>
 
 

+ 12 - 2
scripts/r.out.xyz/r.out.xyz.py

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