[GRASS-SVN] r63636 - in grass/branches/releasebranch_7_0: . display/d.his display/d.thematic.area gui/wxpython/core gui/wxpython/docs gui/wxpython/xml imagery/i.topo.corr raster raster/r.his raster/r.lake raster/r.relief raster/r.texture raster/r.watershed/front scripts scripts/d.shade scripts/r.blend scripts/r.shade
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 20:56:06 PST 2014
Author: wenzeslaus
Date: 2014-12-19 20:56:06 -0800 (Fri, 19 Dec 2014)
New Revision: 63636
Added:
grass/branches/releasebranch_7_0/raster/r.relief/
grass/branches/releasebranch_7_0/scripts/d.shade/
grass/branches/releasebranch_7_0/scripts/r.shade/
Removed:
grass/branches/releasebranch_7_0/raster/r.shaded.relief/
grass/branches/releasebranch_7_0/scripts/d.shadedmap/
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.his/d.his.html
grass/branches/releasebranch_7_0/display/d.his/main.c
grass/branches/releasebranch_7_0/display/d.thematic.area/d.thematic.area.html
grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.html
grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
grass/branches/releasebranch_7_0/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
grass/branches/releasebranch_7_0/raster/Makefile
grass/branches/releasebranch_7_0/raster/r.his/main.c
grass/branches/releasebranch_7_0/raster/r.his/r.his.html
grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html
grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html
grass/branches/releasebranch_7_0/raster/r.texture/r.texture.html
grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html
grass/branches/releasebranch_7_0/scripts/Makefile
grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html
grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html
grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html
Log:
rename r.relief and d.shade, add r.shade, propagate NULLs in r.his
* backport of r62828, r62845, r63304, r63305, r63306, and r63379
* removes d.shadedmap and r.shaded.relief directories
* preserves 'rast to raster' and 'pre to div-code-pre' changes
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,
63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634
Modified: grass/branches/releasebranch_7_0/display/d.his/d.his.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.his/d.his.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/display/d.his/d.his.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -23,9 +23,9 @@
This program can be run non-interactively or
interactively. It will run non-interactively if the user
specifies on the command line the name of a map containing
-hue values (<b>h_map</b>), and the name(s) of map(s)
-containing intensity values (<b>i_map</b>) and/or
-saturation values (<b>s_map</b>). The resulting image will
+hue values (<b>hue</b>), and the name(s) of map(s)
+containing intensity values (<b>intensity</b>) and/or
+saturation values (<b>saturation</b>). The resulting image will
be displayed in the active display frame on the graphics
monitor.
@@ -63,9 +63,9 @@
Each map cell is processed individually. First, the working
color is set to the color of the corresponding cell in the
-map layer chosen to represent <em>HUE</em>. Second, this
+map layer chosen to represent <em>hue</em>. Second, this
color is multiplied by the <em>red</em> intensity of that
-cell in the <em>INTENSITY</em> map layer. This map layer
+cell in the <em>intensity</em> map layer. This map layer
should have an appropriate gray-scale color table
associated with it. You can ensure this by using the color
manipulation capabilities of
@@ -73,7 +73,7 @@
Finally, the color is made somewhat gray-based on the
<em>red</em> intensity of that cell in the
-<em>SATURATION</em> map layer. Again, this map layer
+<em>saturation</em> map layer. Again, this map layer
should have a gray-scale color table associated with it.
<h2>NOTES</h2>
@@ -104,13 +104,13 @@
<h2>EXAMPLE</h2>
-<h3>Spearfish dataset</h3>
<div class="code"><pre>
-g.region raster=elevation.dem
-r.shaded.relief map=elevation.dem shad=elev.shad_relf
+g.region raster=elevation
+r.relief input=elevation output=elevation_shaded_relief
+
d.mon wx0
-d.his h=elevation.dem i=elev.shad_relf brighten=50
+d.his hue=elevation intensity=elevation_shaded_relief brighten=50
</pre></div>
<h2>SEE ALSO</h2>
@@ -119,6 +119,7 @@
<a href="d.colortable.html">d.colortable</a>,
<a href="d.frame.html">d.frame</a>,
<a href="d.rgb.html">d.rgb</a>,
+<a href="d.shade.html">d.shade</a>,
<a href="r.colors.html">r.colors</a>,
<a href="r.his.html">r.his</a>,
<a href="i.his.rgb.html">i.his.rgb</a>,
Modified: grass/branches/releasebranch_7_0/display/d.his/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.his/main.c 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/display/d.his/main.c 2014-12-20 04:56:06 UTC (rev 63636)
@@ -67,29 +67,29 @@
G_add_keyword("IHS");
module->description =
_("Displays the result obtained by combining "
- "hue, intensity, and saturation (his) values "
+ "hue, intensity, and saturation (HIS) values "
"from user-specified input raster map layers.");
opt_h = G_define_option();
- opt_h->key = "h_map";
+ opt_h->key = "hue";
opt_h->type = TYPE_STRING;
opt_h->required = YES;
opt_h->gisprompt = "old,cell,raster";
- opt_h->description = _("Name of layer to be used for HUE");
+ opt_h->description = _("Name of layer to be used for hue");
opt_i = G_define_option();
- opt_i->key = "i_map";
+ opt_i->key = "intensity";
opt_i->type = TYPE_STRING;
opt_i->required = NO;
opt_i->gisprompt = "old,cell,raster";
- opt_i->description = _("Name of layer to be used for INTENSITY");
+ opt_i->description = _("Name of layer to be used for intensity");
opt_s = G_define_option();
- opt_s->key = "s_map";
+ opt_s->key = "saturation";
opt_s->type = TYPE_STRING;
opt_s->required = NO;
opt_s->gisprompt = "old,cell,raster";
- opt_s->description = _("Name of layer to be used for SATURATION");
+ opt_s->description = _("Name of layer to be used for saturation");
brighten = G_define_option();
brighten->key = "brighten";
Modified: grass/branches/releasebranch_7_0/display/d.thematic.area/d.thematic.area.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.thematic.area/d.thematic.area.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/display/d.thematic.area/d.thematic.area.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -25,7 +25,7 @@
<h2>EXAMPLE</h2>
<div class="code"><pre>
-d.thematic.area -l map=communes3 data=pop \
+d.thematic.area -l map=communes3 column=pop \
breaks=111393.250000,222785.500000,334177.750000 \
colors=255:0:0,0:255:0,0:0:255,0,0,0
</pre></div>
@@ -35,7 +35,7 @@
breaks for 5 classes:
<div class="code"><pre>
-d.thematic.area -l map=communes2 data=pop/area algorithm=std \
+d.thematic.area -l map=communes2 column=pop/area algorithm=std \
nbclasses=5 colors=0:0:255,50:100:255,255:100:50,255:0:0,156:0:0
</pre></div>
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py 2014-12-20 04:56:06 UTC (rev 63636)
@@ -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/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/gui/wxpython/docs/wxGUI.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -168,8 +168,9 @@
<dt><img src="icons/layer-shaded-relief-add.png" alt="icon">
<em>Add shaded relief raster map layer </em></dt>
<dd>Adds shaded relief raster map layer,
- see <em><a href="d.shadedmap.html">d.shadedmap</a></em>.</dd>
-
+ see <em><a href="r.relief.html">r.relief</a></em> and
+ <em><a href="d.shade.html">d.shade</a></em>.</dd>
+
<dt><img src="icons/layer-aspect-arrow-add.png" alt="icon">
<em>Add raster arrows layer</em></dt>
<dd>Adds map of raster cells with directional arrows drawn. Arrow
Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml 2014-12-20 04:56:06 UTC (rev 63636)
@@ -785,9 +785,12 @@
<label>Least cost route or flow</label>
</module-item>
<separator/>
- <module-item name="r.shaded.relief">
- <label>Shaded relief</label>
+ <module-item name="r.relief">
+ <label>Compute shaded relief</label>
</module-item>
+ <module-item name="r.shade">
+ <label>Apply shade to raster</label>
+ </module-item>
<separator/>
<module-item name="r.slope.aspect">
<label>Slope and aspect</label>
Modified: grass/branches/releasebranch_7_0/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2014-12-20 04:56:06 UTC (rev 63636)
@@ -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/branches/releasebranch_7_0/raster/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/raster/Makefile 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/Makefile 2014-12-20 04:56:06 UTC (rev 63636)
@@ -85,7 +85,7 @@
r.series \
r.series.accumulate \
r.series.interp \
- r.shaded.relief \
+ r.relief \
r.sim \
r.slope.aspect \
r.solute.transport \
Modified: grass/branches/releasebranch_7_0/raster/r.his/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.his/main.c 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/r.his/main.c 2014-12-20 04:56:06 UTC (rev 63636)
@@ -19,6 +19,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
+#include <grass/colors.h>
#include "his.h"
#include <grass/glocale.h>
@@ -45,6 +46,9 @@
int g_used;
int b_file = 0;
int b_used;
+ int bg_r, bg_g, bg_b;
+ int bgcolor_state;
+ int draw_nulls; /* 0 as nulls, 1 draw using bgcolor, 2 draw from table */
struct Cell_head window;
struct Colors hue_colors;
struct Colors int_colors;
@@ -54,6 +58,7 @@
struct GModule *module;
struct Option *opt_h, *opt_i, *opt_s;
struct Option *opt_r, *opt_g, *opt_b;
+ struct Option *bgcolor;
struct Flag *nulldraw;
G_gisinit(argv[0]);
@@ -65,59 +70,80 @@
G_add_keyword("HIS");
G_add_keyword("IHS");
module->description =
- _("Generates red, green and blue raster map layers "
+ _("Generates red, green and blue (RGB) raster map layers "
"combining hue, intensity and saturation (HIS) "
"values from user-specified input raster map layers.");
opt_h = G_define_option();
- opt_h->key = "h_map";
+ opt_h->key = "hue";
opt_h->type = TYPE_STRING;
opt_h->required = YES;
opt_h->gisprompt = "old,cell,raster";
- opt_h->description = _("Name of layer to be used for HUE");
+ opt_h->description = _("Name of layer to be used for hue");
opt_i = G_define_option();
- opt_i->key = "i_map";
+ opt_i->key = "intensity";
opt_i->type = TYPE_STRING;
opt_i->required = NO;
opt_i->gisprompt = "old,cell,raster";
- opt_i->description = _("Name of layer to be used for INTENSITY");
+ opt_i->description = _("Name of layer to be used for intensity");
opt_s = G_define_option();
- opt_s->key = "s_map";
+ opt_s->key = "saturation";
opt_s->type = TYPE_STRING;
opt_s->required = NO;
opt_s->gisprompt = "old,cell,raster";
- opt_s->description = _("Name of layer to be used for SATURATION");
+ opt_s->description = _("Name of layer to be used for saturation");
opt_r = G_define_option();
- opt_r->key = "r_map";
+ opt_r->key = "red";
opt_r->type = TYPE_STRING;
opt_r->required = YES;
opt_r->gisprompt = "new,cell,raster";
- opt_r->description = _("Name of output layer to be used for RED");
+ opt_r->description = _("Name of output layer to be used for red");
opt_g = G_define_option();
- opt_g->key = "g_map";
+ opt_g->key = "green";
opt_g->type = TYPE_STRING;
opt_g->required = YES;
opt_g->gisprompt = "new,cell,raster";
- opt_g->description = _("Name of output layer to be used for GREEN");
+ opt_g->description = _("Name of output layer to be used for green");
opt_b = G_define_option();
- opt_b->key = "b_map";
+ opt_b->key = "blue";
opt_b->type = TYPE_STRING;
opt_b->required = YES;
opt_b->gisprompt = "new,cell,raster";
- opt_b->description = _("Name of output layer to be used for BLUE");
+ opt_b->description = _("Name of output layer to be used for blue");
+ bgcolor = G_define_standard_option(G_OPT_C_BG);
+ bgcolor->label = _("Color to use instead of NULL values");
+ bgcolor->answer = NULL;
+
nulldraw = G_define_flag();
- nulldraw->key = 'n';
- nulldraw->description = _("Respect NULL values while drawing");
+ nulldraw->key = 'c';
+ nulldraw->description = _("Use colors from color tables for NULL values");
+ G_option_exclusive(bgcolor, nulldraw, NULL);
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
+ draw_nulls = 0;
+ if (nulldraw->answer) {
+ draw_nulls = 2;
+ }
+ if (bgcolor->answer) {
+ bgcolor_state = G_str_to_color(bgcolor->answer, &bg_r, &bg_g, &bg_b);
+ if (bgcolor_state == 1) {
+ draw_nulls = 1;
+ } else if (bgcolor_state == 2) {
+ /* none is the same as not providing the color */
+ draw_nulls = 0;
+ } else {
+ G_fatal_error(_("No such color <%s>"), bgcolor->answer);
+ }
+ }
/* read in current window */
G_get_window(&window);
@@ -220,15 +246,24 @@
Rast_get_row_colors(sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n);
for (atcol = 0; atcol < window.cols; atcol++) {
- if (nulldraw->answer) {
- if (hue_n[atcol]
- || (int_used && int_n[atcol])
- || (sat_used && sat_n[atcol])) {
+ if (hue_n[atcol]
+ || (int_used && int_n[atcol])
+ || (sat_used && sat_n[atcol]))
+ {
+ if (draw_nulls == 0) {
+ /* write nulls where nulls are by default */
Rast_set_c_null_value(&r_array[atcol], 1);
Rast_set_c_null_value(&g_array[atcol], 1);
Rast_set_c_null_value(&b_array[atcol], 1);
continue;
+ } else if (draw_nulls == 1) {
+ /* if nulls opaque and bgcolor provided use it */
+ r_array[atcol] = bg_r;
+ g_array[atcol] = bg_g;
+ b_array[atcol] = bg_b;
+ continue;
}
+ /* else use the color table colors, G6 default */
}
if (int_used)
Modified: grass/branches/releasebranch_7_0/raster/r.his/r.his.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.his/r.his.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/r.his/r.his.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -41,16 +41,16 @@
Each map cell is processed individually. First, the working
color is set to the color of the corresponding cell in the
-map layer chosen to represent <i>HUE</i>. Second, this
+map layer chosen to represent <i>hue</i>. Second, this
color is multiplied by the <i>red</i> intensity of that
-cell in the <i>INTENSITY</i> map layer. This map layer
+cell in the <i>intensity</i> map layer. This map layer
should have an appropriate gray-scale color table
associated with it. You can ensure this by using the color
manipulation capabilities of
<em><a href="r.colors.html">r.colors</a></em>.
Finally, the color is made somewhat gray-based on the
<i>red</i> intensity of that cell in the
-<i>SATURATION</i> map layer. Again, this map layer
+<i>saturation</i> map layer. Again, this map layer
should have a gray-scale color table associated with it.
<h2>NOTES</h2>
@@ -88,18 +88,27 @@
<h2>EXAMPLES</h2>
-Recreate the following <em>d.his</em> command using <em>r.his</em>:
+Recreate the following example for <em>d.his</em> using <em>r.his</em>.
+First, create shaded relief and show it.
+
<div class="code"><pre>
-g.region -p raster=elevation
-r.shaded.relief map=elevation shad=elev.shad_relf
-d.his h=elevation i=elev.shad_relf brighten=50
+g.region raster=elevation
+r.relief input=elevation output=elevation_shaded_relief
+
+d.mon wx0
+d.his hue=elevation intensity=elevation_shaded_relief brighten=50
</pre></div>
+Second, compute lighter version of color of shaded relief.
+Then convert from HIS model to RGB and show the result.
+
<div class="code"><pre>
-r.mapcalc "elev.shad_relf_bright50 = #elev.shad_relf * 1.5"
-r.colors elev.shad_relf_bright50 color=grey255
-r.his h_map=elevation i_map=elev.shad_relf_bright50 r_map=esr.r g_map=esr.g bmap=esr.b
-d.rgb red=esr.r green=esr.g blue=esr.b
+r.mapcalc "elevation_shaded_relief_bright_50 = #elevation_shaded_relief * 1.5"
+r.colors elevation_shaded_relief_bright_50 color=grey255
+r.his hue=elevation intensity=elevation_shaded_relief_bright_50 red=shadedmap_r green=shadedmap_g blue=shadedmap_b
+
+d.mon wx1
+d.rgb red=shadedmap_r green=shadedmap_g blue=shadedmap_b
</pre></div>
@@ -113,6 +122,7 @@
<a href="r.colors.html">r.colors</a>,
<a href="r.composite.html">r.composite</a>,
<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.shade.html">r.shade</a>,
<a href="i.his.rgb.html">i.his.rgb</a>,
<a href="i.rgb.his.html">i.rgb.his</a>
</em>
Modified: grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/r.lake/r.lake.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -92,10 +92,10 @@
r.lake elev_lid792_1m coordinates=638759.3,220264.1 water_level=113.4 lake=flooding
# draw resulting lake map over shaded terrain map
-r.shaded.relief elev_lid792_1m
-d.rast elev_lid792_1m.shade
+r.relief input=elev_lid792_1m output=elev_lid792_1m_shade
+d.rast elev_lid792_1m_shade
d.rast -o flooding
-d.vect streets_wake
+d.vect streets_wake
d.vect bldg_cmcl_pol type=area
</pre></div>
Modified: grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html
===================================================================
--- grass/trunk/raster/r.relief/r.relief.html 2014-12-01 00:21:48 UTC (rev 63305)
+++ grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -53,7 +53,7 @@
dataset location is used to hillshade the elevation map:
<div class="code"><pre>
-g.region rast=elevation -p
+g.region raster=elevation -p
r.relief input=elevation output=elevation_shade
</pre></div>
Modified: grass/branches/releasebranch_7_0/raster/r.texture/r.texture.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.texture/r.texture.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/r.texture/r.texture.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -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/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -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/branches/releasebranch_7_0/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/scripts/Makefile 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/scripts/Makefile 2014-12-20 04:56:06 UTC (rev 63636)
@@ -8,7 +8,7 @@
d.rast.edit \
d.rast.leg \
d.redraw \
- d.shadedmap \
+ d.shade \
d.vect.thematic \
d.what.rast \
d.what.vect \
@@ -43,6 +43,7 @@
r.plane \
r.reclass.area \
r.rgb \
+ r.shade \
r.tileset \
r.unpack \
r3.in.xyz \
Modified: grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html
===================================================================
--- grass/trunk/scripts/d.shade/d.shade.html 2014-12-01 00:21:48 UTC (rev 63305)
+++ grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -30,7 +30,7 @@
dataset location is used to hillshade the <tt>elevation</tt> map:
<div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
d.mon wx0
d.shade reliefmap=aspect drapemap=elevation
</pre></div>
@@ -58,7 +58,7 @@
and used to create a colorized hillshade:
<div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
r.relief input=elevation output=elevation_shaded_relief
d.mon wx1
Modified: grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
===================================================================
--- grass/trunk/scripts/d.shade/d.shade.py 2014-12-01 00:21:48 UTC (rev 63305)
+++ grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py 2014-12-20 04:56:06 UTC (rev 63636)
@@ -50,7 +50,11 @@
env = gcore.gisenv()
mon = env.get('MONITOR', None)
if not mon:
- gcore.fatal(_("No graphics device selected. Use d.mon to select graphics device."))
+ # os is needed only here
+ import os
+ if not 'GRASS_RENDER_IMMEDIATE' in os.environ:
+ gcore.fatal(_("No graphics device selected."
+ " Use d.mon to select graphics device."))
drape_map = options['drapemap']
relief_map = options['reliefmap']
Modified: grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html 2014-12-19 23:48:16 UTC (rev 63635)
+++ grass/branches/releasebranch_7_0/scripts/r.blend/r.blend.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -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>
Modified: grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html
===================================================================
--- grass/trunk/scripts/r.shade/r.shade.html 2014-12-01 00:21:48 UTC (rev 63305)
+++ grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html 2014-12-20 04:56:06 UTC (rev 63636)
@@ -45,7 +45,7 @@
dataset location is used to hillshade the <tt>elevation</tt> map:
<div class="code"><pre>
-g.region rast=aspect -p
+g.region raster=aspect -p
r.shade reliefmap=aspect drapemap=elevation output=elevation_aspect_shaded
d.mon wx0
@@ -57,7 +57,7 @@
raster map for later use:
<div class="code"><pre>
-g.region rast=elevation
+g.region raster=elevation
r.relief input=elevation output=elevation_shaded_relief
r.shade reliefmap=elevation_shaded_relief drapemap=elevation \
More information about the grass-commit
mailing list