Merge pull request #2072 from NaturalGIS/fix_grass7_r_relief2

[processing] fix grass7 r.relief2
qgis · May 25, 2015 · 12883f5 · 12883f5
2 parents 6596adc + 4f87af0
commit 12883f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/python/plugins/processing/algs/grass7/description/r.relief.scaling.txt b/python/plugins/processing/algs/grass7/description/r.relief.scaling.txt
@@ -0,0 +1,10 @@
+r.relief
+r.relief.scaling - Creates shaded relief from an elevation layer (DEM).
+Raster (r.*)
+ParameterRaster|input|Input elevation layer
+ParameterNumber|altitude|Altitude of the sun in degrees above the horizon|0|90|30.0
+ParameterNumber|azimuth|Azimuth of the sun in degrees to the east of north|0|360|270.0
+ParameterNumber|zscale|Factor for exaggerating relief|None|None|1.0
+ParameterNumber|scale|Scale factor for converting horizontal units to elevation units|None|None|1.0
+ParameterSelection|units|Elevation units (overrides scale factor)|intl;survey
+OutputRaster|output|Output shaded relief layer
diff --git a/python/plugins/processing/algs/grass7/description/r.relief.txt b/python/plugins/processing/algs/grass7/description/r.relief.txt
@@ -6,5 +6,4 @@ ParameterNumber|altitude|Altitude of the sun in degrees above the horizon|0|90|3
 ParameterNumber|azimuth|Azimuth of the sun in degrees to the east of north|0|360|270.0
 ParameterNumber|zscale|Factor for exaggerating relief|None|None|1.0
 ParameterNumber|scale|Scale factor for converting horizontal units to elevation units|None|None|1.0
-ParameterSelection|units|Elevation units (overrides scale factor)|intl;survey
 OutputRaster|output|Output shaded relief layer