[GRASS-SVN] r66502 - grass-addons/grass7/raster/r.shaded.pca

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-10-15 06:59:31 -0700 (Thu, 15 Oct 2015)
New Revision: 66502

Modified:
   grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.html
   grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py
Log:
r.shaded.pca: change parameter zmult to zscale to match r.relief

Modified: grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.html
===================================================================
--- grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.html	2015-10-15 13:51:36 UTC (rev 66501)
+++ grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.html	2015-10-15 13:59:31 UTC (rev 66502)
@@ -3,7 +3,7 @@
 <em>r.shaded.pca</em> is a tool for the generation
 of RGB composite of the three main components
 of PCA created from different hill shades
-(created by <em><a href="r.shaded.relief.html">r.relief</a></em>).
+(created by <em><a href="r.relief.html">r.relief</a></em>).
 
 <h3>Input parameters explanation</h3>
 
@@ -29,7 +29,7 @@
 If you want to create your own RGB composition, HIS composition or do another
 analyses you can specify the <i>pca_shades_basename</i> parameter. If this
 parameter is specified, the module outputs the PCA maps as created during
-the process by <em><a href="i.pca.html">r.i.pca</a></em>.
+the process by <em><a href="i.pca.html">i.pca</a></em>.
 
 Moreover, if you would like to add one of the shades to your composition,
 you can specify the <i>shades_basename</i> parameter then the module will
@@ -42,12 +42,12 @@
 
 <div class="code"><pre>
 # basic example with changed vertical exaggeration
-r.shaded.pca input=elevation output=elevation_pca_shaded zmult=100
+r.shaded.pca input=elevation output=elevation_pca_shaded zscale=100
 
 # example of more complicated settings
 # including output shades and principal component maps
 r.shaded.pca input=elevation output=elevation_pca_shaded \
- zmult=100 altitude=15  nazimuths=16 nprocs=4 \
+ zscale=100 altitude=15  nazimuths=16 nprocs=4 \
  shades_basename=elevation_pca_shaded_shades pca_shades_basename=elevation_pca_shaded_pcs
 </pre></div>
 

Modified: grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py
===================================================================
--- grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py	2015-10-15 13:51:36 UTC (rev 66501)
+++ grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py	2015-10-15 13:59:31 UTC (rev 66502)
@@ -49,7 +49,7 @@
 #% answer: 8
 #%end
 #%option
-#% key: zmult
+#% key: zscale
 #% type: double
 #% description: Factor for exaggerating relief
 #% answer: 1
@@ -166,7 +166,7 @@
     pca_shade_output = options['output']
     altitude = float(options['altitude'])
     number_of_azimuths = int(options['nazimuths'])
-    z_exaggeration = float(options['zmult'])
+    z_exaggeration = float(options['zscale'])
     scale = float(options['scale'])
     units = options['units']
     shades_basename = options['shades_basename']