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

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-10-15 06:51:36 -0700 (Thu, 15 Oct 2015)
New Revision: 66501

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: fix after renaming 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 12:08:20 UTC (rev 66500)
+++ grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.html	2015-10-15 13:51:36 UTC (rev 66501)
@@ -3,16 +3,16 @@
 <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.shaded.relief</a></em>).
+(created by <em><a href="r.shaded.relief.html">r.relief</a></em>).
 
 <h3>Input parameters explanation</h3>
 
 Input parameters are the same as for
-<em><a href="r.shaded.relief.html">r.shaded.relief</a></em> module except for
+<em><a href="r.relief.html">r.relief</a></em> module except for
 an <i>azimuth</i> parameter which is replaced by <i>nazimuths</i> parameter
 (we need to specify number of different azimuths rather than one)
 and for an <i>nprocs</i> parameter which adds the possibility to run the
-shades creation (<em><a href="r.shaded.relief.html">r.shaded.relief</a></em>)
+shades creation (<em><a href="r.relief.html">r.relief</a></em>)
 in parallel. However, the speed of <em><a href="i.pca.html">i.pca</a></em>
 limits the overall speed of this module.
 
@@ -34,7 +34,7 @@
 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
 output also the hill shade maps as created during
-the process by <em><a href="r.shaded.relief.html">r.shaded.relief</a></em>.
+the process by <em><a href="r.relief.html">r.relief</a></em>.
 One of the shades can be used to subtract the intensity channel in HIS
 composition or just as an overlay in your visualization tool.
 
@@ -66,7 +66,7 @@
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="r.shaded.relief.html">r.shaded.relief</a>,
+<a href="r.relief.html">r.relief</a>,
 <a href="i.pca.html">i.pca</a>
 </em>
 

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 12:08:20 UTC (rev 66500)
+++ grass-addons/grass7/raster/r.shaded.pca/r.shaded.pca.py	2015-10-15 13:51:36 UTC (rev 66501)
@@ -128,9 +128,9 @@
     params = {}
     if units:
         params.update({'units': units})
-    grass.run_command('r.shaded.relief', input=elevation_input,
+    grass.run_command('r.relief', input=elevation_input,
                       output=shades_basename + suffix,
-                      azimuth=azimuth, zmult=z_exaggeration,
+                      azimuth=azimuth, zscale=z_exaggeration,
                       scale=scale, altitude=altitude,
                       overwrite=core.overwrite(), quiet=True,
                       **params)
@@ -196,7 +196,7 @@
         check_map_names(pca_basename, grass.gisenv()['MAPSET'],
                         suffixes=range(1, number_of_azimuths))
 
-    grass.info(_("Running r.shade.relief in a loop..."))
+    grass.info(_("Running r.relief in a loop..."))
     count = 0
     # Parallel processing
     proc_list = []
@@ -229,7 +229,7 @@
                 exitcodes += proc.exitcode
 
             if exitcodes != 0:
-                core.fatal(_("Error during r.shade.relief computation"))
+                core.fatal(_("Error during r.relief computation"))
 
             # Empty process list
             proc_list = []