[GRASS-SVN] r63755 - in grass/branches/releasebranch_7_0: . gui/wxpython/core lib/gis raster/r.relief raster/r.surf.fractal raster/r.texture raster/r.watershed/front scripts/d.shade scripts/r.shade
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 25 06:50:03 PST 2014
Author: wenzeslaus
Date: 2014-12-25 06:50:03 -0800 (Thu, 25 Dec 2014)
New Revision: 63755
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
grass/branches/releasebranch_7_0/lib/gis/renamed_options
grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html
grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.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/d.shade/d.shade.html
grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html
grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.py
Log:
d.shade option rename and related changes (backport of r63740 and r63741)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63362,63367,63379,63389,63391,63393,63402,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,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63742,63747-63749,63751-63752
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63362,63367,63379,63389,63391,63393,63402,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,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63747-63749,63751-63752
Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py 2014-12-25 14:50:03 UTC (rev 63755)
@@ -123,11 +123,12 @@
if p == param:
params = [(idx, p, v)]
break
-
+
+ # this does not use types, just some (incomplete subset of?) names
if p in ('map', 'input', 'layer',
'red', 'blue', 'green',
- 'h_map', 's_map', 'i_map',
- 'reliefmap', 'labels'):
+ 'hue', 'saturation', 'intensity',
+ 'shade', 'labels'):
params.append((idx, p, v))
if len(params) < 1:
Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-12-25 14:50:03 UTC (rev 63755)
@@ -17,6 +17,10 @@
d.erase|background:bgcolor
# d.legend
d.legend|map:rast
+# d.his
+d.his|h_map:hue
+d.his|i_map:intensity
+d.his|s_map:saturation
# d.rast
d.rast|catlist:values
d.rast|vallist:values
@@ -197,6 +201,13 @@
r.flow|flout:flowline
r.flow|lgout:flowpath
r.flow|dsout:density
+# r.his
+r.his|h_map:hue
+r.his|i_map:intensity
+r.his|s_map:saturation
+r.his|r_map:red
+r.his|g_map:green
+r.his|b_map:blue
# r.horizon
r.horizon|elevin:elevation
r.horizon|horizonstep:step
Modified: grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/raster/r.relief/r.relief.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -65,7 +65,7 @@
Color can be added later using <em><a href="r.shade.html">r.shade</a></em>:
<div class="code"><pre>
-r.shade reliefmap=elevation_shade drapemap=elevation output=elevation_shaded
+r.shade shade=elevation_shade color=elevation output=elevation_shaded
</pre></div>
<p>In Latitude-Longitude locations (or other non-metric locations), the
Modified: grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -27,7 +27,7 @@
r.relief input=fractals output=fractals_shade
d.mon wx0
-d.shade relief=fractals_shade drape=fractals b=50
+d.shade shade=fractals_shade color=fractals b=50
</pre></div>
<center>
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-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/raster/r.texture/r.texture.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -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.shade drape=ortho_texture_ASM_0 rel=ortho_2001_t792_1m
+d.shade color=ortho_texture_ASM_0 shade=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-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/raster/r.watershed/front/r.watershed.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -450,7 +450,7 @@
Display output in a nice way
<div class="code"><pre>
r.relief map=elevation.dem
- d.shade rel=elevation.dem.shade drape=rwater.basin bright=40
+ d.shade shade=elevation.dem.shade color=rwater.basin bright=40
d.vect rwater_course color=orange
</pre></div>
Modified: grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -32,7 +32,7 @@
<div class="code"><pre>
g.region raster=aspect -p
d.mon wx0
-d.shade reliefmap=aspect drapemap=elevation
+d.shade shade=aspect color=elevation
</pre></div>
<!--
@@ -62,7 +62,7 @@
r.relief input=elevation output=elevation_shaded_relief
d.mon wx1
-d.shade reliefmap=elevation_shaded_relief drapemap=elevation
+d.shade shade=elevation_shaded_relief color=elevation
</pre></div>
Interesting visualizations can be created using different color tables for
Modified: grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/scripts/d.shade/d.shade.py 2014-12-25 14:50:03 UTC (rev 63755)
@@ -23,11 +23,11 @@
#% keywords: visualization
#%end
#%option G_OPT_R_INPUT
-#% key: reliefmap
+#% key: shade
#% description: Name of shaded relief or aspect raster map
#%end
#%option G_OPT_R_INPUT
-#% key: drapemap
+#% key: color
#% label: Name of raster to drape over relief raster map
#% description: Typically, this raster is elevation or other colorful raster
#%end
@@ -47,8 +47,8 @@
def main():
options, unused = gcore.parser()
- drape_map = options['drapemap']
- relief_map = options['reliefmap']
+ drape_map = options['color']
+ relief_map = options['shade']
brighten = options['brighten']
try:
Modified: grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.html 2014-12-25 14:50:03 UTC (rev 63755)
@@ -19,8 +19,8 @@
<p>
NULL values are propagated by default, so if any of the two input rasters
contains NULL cell NULL will be also in the output. If <b>-c</b> flag is
-used and cell in <b>drapemap</b> raster is NULL, just <b>reliefmap</b>
-color is used. If cell in <b>reliefmap</b> raster is NULL, shading effect
+used and cell in <b>color</b> raster is NULL, just <b>shade</b>
+color is used. If cell in <b>shade</b> raster is NULL, shading effect
is not applied and original colors are used. If <b>bgcolor</b> option is
used, NULL value in any input raster will be in the output replaced
by the given color.
@@ -46,7 +46,7 @@
<div class="code"><pre>
g.region raster=aspect -p
-r.shade reliefmap=aspect drapemap=elevation output=elevation_aspect_shaded
+r.shade shade=aspect color=elevation output=elevation_aspect_shaded
d.mon wx0
d.rast elevation_aspect_shaded
@@ -60,7 +60,7 @@
g.region raster=elevation
r.relief input=elevation output=elevation_shaded_relief
-r.shade reliefmap=elevation_shaded_relief drapemap=elevation \
+r.shade shade=elevation_shaded_relief color=elevation \
output=elevation_relief_shaded
d.mon wx1
Modified: grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.py 2014-12-25 14:12:10 UTC (rev 63754)
+++ grass/branches/releasebranch_7_0/scripts/r.shade/r.shade.py 2014-12-25 14:50:03 UTC (rev 63755)
@@ -24,11 +24,11 @@
#% keywords: visualization
#%end
#%option G_OPT_R_INPUT
-#% key: reliefmap
+#% key: shade
#% description: Name of shaded relief or aspect raster map
#%end
#%option G_OPT_R_INPUT
-#% key: drapemap
+#% key: color
#% label: Name of raster to drape over relief raster map
#% description: Typically, this raster is elevation or other colorful raster
#%end
@@ -77,8 +77,8 @@
def main():
options, flags = gcore.parser()
- drape_map = options['drapemap']
- relief_map = options['reliefmap']
+ drape_map = options['color']
+ relief_map = options['shade']
brighten = int(options['brighten'])
output_map = options['output']
bgcolor = options['bgcolor']
More information about the grass-commit
mailing list