Merge pull request #2746 from NaturalGIS/fix_grass_r_slope_aspect

[processing] add parameter to GRASS 64/70 r.slope.aspect to allow use region resolution (ref #9979)
qgis · Feb 4, 2016 · c35567b · c35567b
2 parents 3b2a76f + 191c011
commit c35567b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/python/plugins/processing/algs/grass/description/r.aspect.txt b/python/plugins/processing/algs/grass/description/r.aspect.txt
@@ -3,6 +3,7 @@ r.aspect - Generates raster maps of aspect from a elevation raster map.
 Raster (r.*)
 ParameterRaster|elevation|Elevation|False
 ParameterSelection|prec|Data type|float;double;int
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zfactor|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slp_allowed|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 OutputRaster|aspect|Aspect
diff --git a/python/plugins/processing/algs/grass/description/r.slope.aspect.txt b/python/plugins/processing/algs/grass/description/r.slope.aspect.txt
@@ -4,6 +4,7 @@ Raster (r.*)
 ParameterRaster|elevation|Elevation|False
 ParameterSelection|format|Format for reporting the slope|degrees;percent
 ParameterSelection|prec|Type of output aspect and slope layer|float;double;int
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zfactor|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slp_allowed|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 OutputRaster|slope|Slope

diff --git a/python/plugins/processing/algs/grass/description/r.slope.txt b/python/plugins/processing/algs/grass/description/r.slope.txt
@@ -4,6 +4,7 @@ Raster (r.*)
 ParameterRaster|elevation|Name of elevation raster map|False
 ParameterSelection|format|Format for reporting the slope|degrees;percent
 ParameterSelection|prec|Type of output aspect and slope maps|float;double;int
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zfactor|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slp_allowed|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 ParameterBoolean|-a|Do not align the current region to the elevation layer|True

diff --git a/python/plugins/processing/algs/grass7/description/r.aspect.txt b/python/plugins/processing/algs/grass7/description/r.aspect.txt
@@ -2,7 +2,8 @@ r.slope.aspect
 r.aspect - Generates raster maps of aspect from a elevation raster map.
 Raster (r.*)
 ParameterRaster|elevation|Elevation|False
-ParameterSelection|precision|Data type|CELL;FCELL;DCELL
+ParameterSelection|precision|Data type|FCELL;CELL;DCELL
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zfactor|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slope|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 OutputRaster|aspect|Aspect
diff --git a/python/plugins/processing/algs/grass7/description/r.slope.aspect.txt b/python/plugins/processing/algs/grass7/description/r.slope.aspect.txt
@@ -3,7 +3,8 @@ Generates raster layers of slope, aspect, curvatures and partial derivatives fro
 Raster (r.*)
 ParameterRaster|elevation|Elevation|False
 ParameterSelection|format|Format for reporting the slope|degrees;percent
-ParameterSelection|precision|Type of output aspect and slope layer|CELL;FCELL;DCELL
+ParameterSelection|precision|Type of output aspect and slope layer|FCELL;CELL;DCELL
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zscale|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slope|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 OutputRaster|slope|Slope

diff --git a/python/plugins/processing/algs/grass7/description/r.slope.txt b/python/plugins/processing/algs/grass7/description/r.slope.txt
@@ -2,7 +2,8 @@ r.slope.aspect
 r.slope - Generates raster maps of slope from a elevation raster map.
 Raster (r.*)
 ParameterRaster|elevation|Elevation|False
-ParameterSelection|precision|Data type|CELL;FCELL;DCELL
+ParameterSelection|precision|Data type|FCELL;CELL;DCELL
+ParameterBoolean|-a|Do not align the current region to the elevation layer|True
 ParameterNumber|zfactor|Multiplicative factor to convert elevation units to meters|None|None|1.0
 ParameterNumber|min_slope|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
 OutputRaster|slope|Slope