[GRASS-SVN] r63379 - in grass/trunk: gui/wxpython/core imagery/i.topo.corr raster/r.texture raster/r.watershed/front scripts/r.blend

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2014-12-05 09:50:24 -0800 (Fri, 05 Dec 2014)
New Revision: 63379

Modified:
   grass/trunk/gui/wxpython/core/utils.py
   grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
   grass/trunk/raster/r.texture/r.texture.html
   grass/trunk/raster/r.watershed/front/r.watershed.html
   grass/trunk/scripts/r.blend/r.blend.html
Log:
r.relief, r.shade, d.shade: finish rename from d.shadedmap and r.shaded.relief (fixes r63305)

Modified: grass/trunk/gui/wxpython/core/utils.py
===================================================================
--- grass/trunk/gui/wxpython/core/utils.py	2014-12-05 16:26:14 UTC (rev 63378)
+++ grass/trunk/gui/wxpython/core/utils.py	2014-12-05 17:50:24 UTC (rev 63379)
@@ -999,7 +999,7 @@
                  'd.rast3d'       : '3d-raster',
                  'd.rgb'          : 'rgb',
                  'd.his'          : 'his',
-                 'd.shadedmap'    : 'shaded',
+                 'd.shade'        : 'shaded',
                  'd.legend'       : 'rastleg',
                  'd.rast.arrow'   : 'rastarrow',
                  'd.rast.num'     : 'rastnum',

Modified: grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
===================================================================
--- grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh	2014-12-05 16:26:14 UTC (rev 63378)
+++ grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh	2014-12-05 17:50:24 UTC (rev 63379)
@@ -45,7 +45,7 @@
 echo "Sun position ($DATETIME): solarzenith: $solarzenith, sunazimuth: $sunazimuth"
 
 # shade relief
-r.shaded.relief input=myplane_pyr output=myplane_pyr_shaded altitude=$sunangleabovehorizon azimuth=$sunazimuth
+r.relief input=myplane_pyr output=myplane_pyr_shaded altitude=$sunangleabovehorizon azimuth=$sunazimuth
 # show raw map as shaded map
 #d.mon wx0
 #sleep 5 # this is rather annoying

Modified: grass/trunk/raster/r.texture/r.texture.html
===================================================================
--- grass/trunk/raster/r.texture/r.texture.html	2014-12-05 16:26:14 UTC (rev 63378)
+++ grass/trunk/raster/r.texture/r.texture.html	2014-12-05 17:50:24 UTC (rev 63379)
@@ -112,7 +112,7 @@
 r.texture ortho_2001_t792_1m.greylevel prefix=ortho_texture method=asm -s 
 # display
 g.region n=221461 s=221094 w=638279 e=638694
-d.shadedmap drape=ortho_texture_ASM_0 rel=ortho_2001_t792_1m
+d.shade drape=ortho_texture_ASM_0 rel=ortho_2001_t792_1m
 </pre></div>
 
 This calculates four maps (requested texture at four orientations):

Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html	2014-12-05 16:26:14 UTC (rev 63378)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html	2014-12-05 17:50:24 UTC (rev 63379)
@@ -449,8 +449,8 @@
 <p>
 Display output in a nice way
 <div class="code"><pre>
-  r.shaded.relief map=elevation.dem
-  d.shadedmap rel=elevation.dem.shade drape=rwater.basin bright=40
+  r.relief map=elevation.dem
+  d.shade rel=elevation.dem.shade drape=rwater.basin bright=40
   d.vect rwater_course color=orange
 </pre></div>
 

Modified: grass/trunk/scripts/r.blend/r.blend.html
===================================================================
--- grass/trunk/scripts/r.blend/r.blend.html	2014-12-05 16:26:14 UTC (rev 63378)
+++ grass/trunk/scripts/r.blend/r.blend.html	2014-12-05 17:50:24 UTC (rev 63379)
@@ -20,11 +20,13 @@
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="d.shadedmap.html">d.shadedmap</a>,
-<a href="g.region.html">g.region</a>,
+<a href="r.shade.html">r.shade</a>,
+<a href="r.his.html">r.his</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>,
 <a href="r.colors.html">r.colors</a>,
-<a href="r.support.html">r.support</a>
+<a href="r.support.html">r.support</a>,
+<a href="d.shade.html">d.shade</a>,
+<a href="g.region.html">g.region</a>
 </em>