Skip to content

Commit

Permalink
Updates for current GRASS GIS 7 release branch [merged PRs]:
Browse files Browse the repository at this point in the history 
* Delete r.bitpattern.txt: r.bitpattern is now only an Addon since r.mapcalc and i.modis.qc provide the functionality
* r.describe.txt: flag description cosmetics
* r.random.raster.txt: fix typo
* Update and rename r.shaded.relief.txt to r.relief.txt (http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Renamedmodules)
* Update r.sunmask.txt: -s added but "Outputraster" needs to be optional for that [TODO]
* Update r.surf.area.txt: "units" added
* Delete r.surf.idw2.txt: r.surf.idw2 is now a GRASS GIS Addon (http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Replacedandremovedmodules)
* Delete v.transform.pointsfile.txt: The pointsfile parameter no longer exists. Use v.transform.txt instead
* Update TODO
  • Loading branch information
@neteler @jef-n
neteler authored and jef-n committed Jan 12, 2015
1 parent ed825e6 commit b7dcd67
Show file tree
Hide file tree
Showing 64 changed files with 168 additions and 208 deletions.
10 changes: 2 additions & 8 deletions python/plugins/processing/algs/grass7/TODO
View file
@@ -1,15 +1,9 @@
* http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Replacedandremovedmodules
* TODO: Merged modules
r.average: merged into G7:r.statistics, G7:r.statistics2, G7:r.statistics3
r.bilinear merged into G7:r.resamp.interp
r.median: merged into G7:r.statistics, G7:r.statistics2, G7:r.statistics3
r.sum: merged into G7:r.statistics, G7:r.statistics2, G7:r.statistics3

* http://trac.osgeo.org/grass/wiki/Grass7/NewFeatures#Renamedmodules
* TODO: decide what to do with nviz:
nviz_cmd -> G7:m.nviz.image


* TODO: CHECK next how really implemented:

Global module changes
interpolation methods 'bilinear', 'bicubic' renamed to 'linear', 'cubic' <<---????

7 changes: 3 additions & 4 deletions python/plugins/processing/algs/grass7/description/i.fft.txt
View file
@@ -1,7 +1,6 @@
i.fft
i.fft - Fast Fourier Transform (FFT) for image processing.
Imagery (i.*)
ParameterRaster|input_image|Name of input raster map|False
OutputRaster|real_image|Name for output real part arrays stored as raster map
OutputRaster|imaginary_image|Name for output imaginary part arrays stored as raster map

ParameterRaster|input|Name of input raster map|False
OutputRaster|real|Name for output real part arrays stored as raster map
OutputRaster|imaginary|Name for output imaginary part arrays stored as raster map
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/grass7/description/i.his.rgb.txt
View file
@@ -1,10 +1,10 @@
i.his.rgb
i.his.rgb - Transforms raster maps from HIS (Hue-Intensity-Saturation) color space to RGB (Red-Green-Blue) color space.
Imagery (i.*)
ParameterRaster|hue_input|Name of input raster map (hue)|False
ParameterRaster|intensity_input|Name of input raster map (intensity)|False
ParameterRaster|saturation_input|Name of input raster map (saturation)|False
OutputRaster|red_output|Name for output raster map (red)
OutputRaster|green_output|Name for output raster map (green)
OutputRaster|blue_output|Name for output raster map (blue)
ParameterRaster|hue|Name of input raster map (hue)|False
ParameterRaster|intensity|Name of input raster map (intensity)|False
ParameterRaster|saturation|Name of input raster map (saturation)|False
OutputRaster|red|Name for output raster map (red)
OutputRaster|green|Name for output raster map (green)
OutputRaster|blue|Name for output raster map (blue)

6 changes: 3 additions & 3 deletions python/plugins/processing/algs/grass7/description/i.ifft.txt
View file
@@ -1,7 +1,7 @@
i.ifft
i.ifft - Inverse Fast Fourier Transform (IFFT) for image processing.
Imagery (i.*)
ParameterRaster|real_image|Name of input raster map (image fft, real part)|False
ParameterRaster|imaginary_image|Name of input raster map (image fft, imaginary part)|False
OutputRaster|output_image|Name for output raster map
ParameterRaster|real|Name of input raster map (image fft, real part)|False
ParameterRaster|imaginary|Name of input raster map (image fft, imaginary part)|False
OutputRaster|output|Name for output raster map

12 changes: 6 additions & 6 deletions python/plugins/processing/algs/grass7/description/i.rgb.his.txt
View file
@@ -1,9 +1,9 @@
i.rgb.his
i.rgb.his - Transforms raster maps from RGB (Red-Green-Blue) color space to HIS (Hue-Intensity-Saturation) color space.
Imagery (i.*)
ParameterRaster|red_output|Name for input raster map (red)|True
ParameterRaster|green_output|Name for input raster map (green)|True
ParameterRaster|blue_output|Name for input raster map (blue)|True
OutputRaster|hue_input|Name of output raster map (hue)|False
OutputRaster|intensity_input|Name of output raster map (intensity)|False
OutputRaster|saturation_input|Name of output raster map (saturation)|False
ParameterRaster|red|Name for input raster map (red)|True
ParameterRaster|green|Name for input raster map (green)|True
ParameterRaster|blue|Name for input raster map (blue)|True
OutputRaster|hue|Name of output raster map (hue)|False
OutputRaster|intensity|Name of output raster map (intensity)|False
OutputRaster|saturation|Name of output raster map (saturation)|False
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/m.cogo.txt
View file
Expand Up @@ -3,8 +3,8 @@ m.cogo - A simple utility for converting bearing and distance measurements to co
Miscellaneous (m.*)
ParameterFile|input|Name of input file|False
OutputFile|output|Output text file
ParameterString|coord|Starting coordinate pair (default 0.0, 0.0)|0.0,0.0
ParameterString|coordinates|Starting coordinate pair (default 0.0, 0.0)|0.0,0.0
*ParameterBoolean|-l|Lines are labelled|False
*ParameterBoolean|-q|Suppress warnings|False
*ParameterBoolean|-r|Convert from coordinates to bearing and distance|False
*ParameterBoolean|-c|Repeat the starting coordinate at the end to close a loop|False
*ParameterBoolean|-c|Repeat the starting coordinate at the end to close a loop|False
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.aspect.txt
View file
Expand Up @@ -2,7 +2,7 @@ r.slope.aspect
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
ParameterSelection|precision|Data type|float;double;int
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
ParameterNumber|min_slope|Minimum slope val. (in percent) for which aspect is computed|None|None|0.0
OutputRaster|aspect|Output aspect layer
7 changes: 0 additions & 7 deletions python/plugins/processing/algs/grass7/description/r.bitpattern.txt
View file

This file was deleted.

4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.carve.txt
View file
@@ -1,8 +1,8 @@
r.carve
r.carve - Takes vector stream data, transforms it to raster and subtracts depth from the output DEM.
Raster (r.*)
ParameterRaster|rast|Elevation|False
ParameterVector|vect|Vector layer containing stream(s)|1|False
ParameterRaster|raster|Elevation|False
ParameterVector|vector|Vector layer containing stream(s)|1|False
ParameterNumber|width|Stream width (in meters). Default is raster cell width|None|None|1
ParameterNumber|depth|Additional stream depth (in meters)|None|None|1
ParameterBoolean|-n|No flat areas allowed in flow direction|False
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.circle.txt
View file
@@ -1,9 +1,9 @@
r.circle
r.circle - Creates a raster map containing concentric rings around a given point.
Raster (r.*)
ParameterString|coordinate|The coordinate of the center (east,north)|0,0
ParameterString|coordinates|The coordinate of the center (east,north)|0,0
ParameterNumber|min|Minimum radius for ring/circle map (in meters)|None|None|10
ParameterNumber|max|Maximum radius for ring/circle map (in meters)|None|None|20
ParameterString|mult|Data value multiplier|1
ParameterString|multiplier|Data value multiplier|1
ParameterBoolean|-b|Generate binary raster map|False
OutputRaster|output|Name for output raster map
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.coin.txt
View file
@@ -1,8 +1,8 @@
r.coin
r.coin - Tabulates the mutual occurrence (coincidence) of categories for two raster map layers.
Raster (r.*)
ParameterRaster|map1|Name of first raster map|False
ParameterRaster|map2|Name of second raster map|False
ParameterRaster|first|Name of first raster map|False
ParameterRaster|second|Name of second raster map|False
ParameterSelection|units|Unit of measure|c;p;x;y;a;h;k;m
ParameterBoolean|-w|Wide report, 132 columns (default: 80)|False
OutputHTML|html|Output report
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/grass7/description/r.composite.txt
View file
Expand Up @@ -4,9 +4,9 @@ Raster (r.*)
ParameterRaster|red|Red|False
ParameterRaster|green|Green|False
ParameterRaster|blue|Blue|False
ParameterNumber|lev_red|Number of levels to be used for <red>|1|256|32
ParameterNumber|lev_green|Number of levels to be used for <green>|1|256|32
ParameterNumber|lev_blue|Number of levels to be used for <blue>|1|256|32
ParameterNumber|level_red|Number of levels to be used for <red>|1|256|32
ParameterNumber|level_green|Number of levels to be used for <green>|1|256|32
ParameterNumber|level_blue|Number of levels to be used for <blue>|1|256|32
ParameterBoolean|-d|Dither|False
ParameterBoolean|-c|Use closest color|False
OutputRaster|output|Output RGB image
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/description/r.describe.txt
View file
Expand Up @@ -7,5 +7,5 @@ ParameterNumber|nsteps|Number of quantization steps|1.0|None|255
ParameterBoolean|-r|Only print the range of the data|False
ParameterBoolean|-n|Suppress reporting of any NULLs|False
ParameterBoolean|-d|Use the current region|False
ParameterBoolean|-i|Read fp map as integer|False
ParameterBoolean|-i|Read floating-point map as integer|False
OutputHTML|html|Output report
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.fill.dir.txt
View file
Expand Up @@ -2,7 +2,7 @@ r.fill.dir
r.fill.dir - Filters and generates a depressionless elevation layer and a flow direction layer from a given elevation raster layer.
Raster (r.*)
ParameterRaster|input|Elevation|False
ParameterSelection|type|Output aspect direction format|grass;agnps;answers
OutputRaster|elevation|Depressionless DEM
ParameterSelection|format|Output aspect direction format|grass;agnps;answers
OutputRaster|output|Depressionless DEM
OutputRaster|direction|Flow direction
OutputRaster|areas|Problem areas
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/grass7/description/r.flow.txt
View file
@@ -1,5 +1,5 @@
r.flow
r.flow - Construction of slope curves (flowlines), flowpath lengths, and flowline densities (upslope areas) from a raster digital elevation model (DEM).
r.flow - Construction of flowlines, flowpath lengths, and flowaccumulation (contributing areas) from a raster digital elevation model (DEM).
Raster (r.*)
ParameterRaster|elevation|Elevation|False
ParameterRaster|aspect|Aspect|False
Expand All @@ -9,6 +9,6 @@ ParameterNumber|bound|Maximum number of segments per flowline|None|None|5.0
ParameterBoolean|-u|Compute upslope flowlines instead of default downhill flowlines|False
ParameterBoolean|-3|3-D lengths instead of 2-D|False
*ParameterBoolean|-m|Use less memory, at a performance penalty|False
OutputRaster|flowline|Output flowline vector layer
OutputRaster|flowpath|Output flowpath length raster layer
OutputRaster|density|Output flowline density raster layer
OutputRaster|flowline|Output flow line vector layer
OutputRaster|flowlength|Output flow path length raster layer
OutputRaster|flowaccumulation|Output flow accumulation raster layer
12 changes: 6 additions & 6 deletions python/plugins/processing/algs/grass7/description/r.his.txt
View file
@@ -1,10 +1,10 @@
r.his
r.his - Generates red, green and blue raster layers combining hue, intensity and saturation (HIS) values from user-specified input raster layers.
Raster (r.*)
ParameterRaster|h_map|Hue|False
ParameterRaster|i_map|Intensity|False
ParameterRaster|s_map|Saturation|False
ParameterRaster|hue|Hue|False
ParameterRaster|intensity|Intensity|False
ParameterRaster|saturation|Saturation|False
ParameterBoolean|-n|Respect NULL values while drawing|False
OutputRaster|r_map|Red
OutputRaster|g_map|Green
OutputRaster|b_map|Blue
OutputRaster|red|Red
OutputRaster|green|Green
OutputRaster|blue|Blue
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/grass7/description/r.horizon.height.txt
View file
@@ -1,9 +1,9 @@
r.horizon
r.horizon.height - Horizon angle computation from a digital elevation model.
Raster (r.*)
ParameterRaster|elev_in|Elevation layer [meters]|False
ParameterString|coordinate|Coordinate for which you want to calculate the horizon|0,0
ParameterNumber|horizon_step|Angle step size for multidirectional horizon [degrees]|0|360|0.0
ParameterRaster|elevation|Elevation layer [meters]|False
ParameterString|coordinates|Coordinate for which you want to calculate the horizon|0,0
ParameterNumber|step|Angle step size for multidirectional horizon [degrees]|0|360|0.0
ParameterNumber|maxdistance|The maximum distance to consider when finding the horizon height|0|None|10000
ParameterString|dist|Sampling distance step coefficient (0.5-1.5)|1.0
ParameterBoolean|-d|Write output in degrees (default is radians)|False
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/description/r.horizon.txt
View file
@@ -1,7 +1,7 @@
r.horizon
r.horizon - Horizon angle computation from a digital elevation model.
Raster (r.*)
ParameterRaster|elev_in|Elevation layer [meters]|False
ParameterRaster|elevation|Elevation layer [meters]|False
ParameterNumber|direction|Direction in which you want to calculate the horizon height|0|360|0.0
ParameterNumber|maxdistance|The maximum distance to consider when finding the horizon height|0|None|10000
ParameterString|dist|Sampling distance step coefficient (0.5-1.5)|1.0
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.out.vrml.txt
View file
@@ -1,7 +1,7 @@
r.out.vrml
r.out.vrml - Export a raster layer to the Virtual Reality Modeling Language (VRML)
Raster (r.*)
ParameterRaster|elev|Elevation layer|False
ParameterRaster|elevation|Elevation layer|False
ParameterRaster|color|Color layer|False
ParameterNumber|exag|Vertical exaggeration|None|None|1.0
ParameterNumber|exaggeration|Vertical exaggeration|None|None|1.0
OutputFile|output|Output VRML file
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.param.scale.txt
View file
Expand Up @@ -2,8 +2,8 @@ r.param.scale
r.param.scale - Extracts terrain parameters from a DEM.
Raster (r.*)
ParameterRaster|input|Name of input raster map|False
ParameterNumber|s_tol|Slope tolerance that defines a 'flat' surface (degrees)|None|None|1.0
ParameterNumber|c_tol|Curvature tolerance that defines 'planar' surface|None|None|0.0001
ParameterNumber|slope_tolerance|Slope tolerance that defines a 'flat' surface (degrees)|None|None|1.0
ParameterNumber|curvature_tolerance|Curvature tolerance that defines 'planar' surface|None|None|0.0001
ParameterNumber|size|Size of processing window (odd number only, max: 69)|None|None|15
ParameterSelection|param|Morphometric parameter in 'size' window to calculate|elev;slope;aspect;profc;planc;longc;crosc;minic;maxic;feature
ParameterNumber|exp|Exponent for distance weighting (0.0-4.0)|None|None|0.0
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/description/r.profile.txt
View file
Expand Up @@ -4,7 +4,7 @@ Raster (r.*)
ParameterRaster|input|Input raster layer|False
ParameterString|profile|Profile coordinate pairs|0,0,1,1
ParameterNumber|res|Resolution along profile|0|None|1.0
ParameterString|null|Character to represent no data cell|*
ParameterString|null_value|Character to represent no data cell|*
ParameterBoolean|-g|Output easting and northing in first two columns of four column output|False
ParameterBoolean|-c|Output RRR:GGG:BBB color values for each profile point|False
OutputFile|output|Output filename
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/description/r.random.raster.txt
View file
@@ -1,6 +1,6 @@
r.randon.raster
r.random.raster
r.random.raster - Create random raster
Raster (r.*)
ParameterRaster|raster|Name of input raster map|False
ParameterNumber|value|The number of points to allocate |None|None|1
OutputRaster|output|Output layer
OutputRaster|output|Output layer
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/grass7/description/r.random.txt
View file
Expand Up @@ -3,6 +3,6 @@ r.random - Creates a raster layer and vector point map containing randomly locat
Raster (r.*)
ParameterRaster|input|Input raster layer|False
ParameterRaster|cover|Input cover raster layer|False
ParameterNumber|n|The number of points to allocate|0|None|10
OutputRaster|raster_output|Output raster layer
OutputVector|vector_output|Output vector layer
ParameterNumber|npoints|The number of points to allocate|0|None|10
OutputRaster|raster|Output raster layer
OutputVector|vector|Output vector layer
7 changes: 3 additions & 4 deletions python/plugins/processing/algs/grass7/description/r.regression.line.txt
View file
@@ -1,7 +1,6 @@
r.regression.line
r.regression.line - Calculates linear regression from two raster layers : y = a + b*x.
Raster (r.*)
ParameterRaster|map1|Layer for x coefficient|False
ParameterRaster|map2|Layer for y coefficient|False
ParameterBoolean|-s|Slower but accurate|False
OutputHTML|html|Regression data
ParameterRaster|mapx|Layer for x coefficient|False
ParameterRaster|mapy|Layer for y coefficient|False
OutputHTML|html|Regression coefficients
10 changes: 5 additions & 5 deletions ...gs/grass7/description/r.shaded.relief.txt → ...sing/algs/grass7/description/r.relief.txt
View file
@@ -1,10 +1,10 @@
r.shaded.relief
r.shaded.relief - Creates shaded relief from an elevation layer (DEM).
r.relief
r.relief - Creates shaded relief from an elevation layer (DEM).
Raster (r.*)
ParameterRaster|map|Input elevation layer|False
ParameterRaster|input|Input elevation layer
ParameterNumber|altitude|Altitude of the sun in degrees above the horizon|None|None|30.0
ParameterNumber|azimuth|Azimuth of the sun in degrees to the east of north|None|None|270.0
ParameterNumber|zmult|Factor for exaggerating relief|None|None|1.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|et scaling factor (applies to lat./long. locations only, none: scale=1)|none;meters;feet
OutputRaster|shadedmap|Output shaded relief layer
OutputRaster|output|Output shaded relief layer
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/grass7/description/r.report.txt
View file
Expand Up @@ -3,11 +3,10 @@ r.report - Reports statistics for raster layers.
Raster (r.*)
ParameterMultipleInput|map|Raster layer(s) to report on|3.0|False
ParameterSelection|units|Units|mi;me;k;a;h;c;p
ParameterString|null|Character representing no data cell value|*
ParameterString|null_value|Character representing no data cell value|*
ParameterNumber|nsteps|Number of fp subranges to collect stats from|1|None|255
ParameterBoolean|-h|Suppress page headers|True
ParameterBoolean|-f|Use formfeeds between pages|True
ParameterBoolean|-e|Scientific format|True
ParameterBoolean|-n|Filter out all no data cells|True
ParameterBoolean|-N|Filter out cells where all layers have no data|True
ParameterBoolean|-n|Do not report no data cells|True
OutputHTML|html|Output report file
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass7/description/r.resamp.rst.txt
View file
Expand Up @@ -6,4 +6,4 @@ ParameterNumber|ew_res|Desired east-west resolution|0.0|None|1
ParameterNumber|ns_res|Desired north-south resolution|0.0|None|1
ParameterBoolean|-t|Use dnorm independent tension|False
ParameterBoolean|-a_r.region|Align region to resolution (default = align to bounds) in r.region|False
OutputRaster|elev|Output layer
OutputRaster|elevation|Output layer
26 changes: 13 additions & 13 deletions python/plugins/processing/algs/grass7/description/r.sim.sediment.txt
View file
Expand Up @@ -2,20 +2,20 @@ r.sim.sediment
r.sim.sediment - Sediment transport and erosion/deposition simulation using path sampling method (SIMWE).
Raster (r.*)
ParameterRaster|elevation|Name of the elevation raster map [m]|False
ParameterRaster|wdepth|Name of the water depth raster map [m]|False
ParameterRaster|water_depth|Name of the water depth raster map [m]|False
ParameterRaster|dx|Name of the x-derivatives raster map [m/m]|False
ParameterRaster|dy|Name of the y-derivatives raster map [m/m]|False
ParameterRaster|det|Name of the detachment capacity coefficient raster map [s/m]|False
ParameterRaster|tran|Name of the transport capacity coefficient raster map [s]|False
ParameterRaster|tau|Name of the critical shear stress raster map [Pa]|False
ParameterRaster|detachment_coeff|Name of the detachment capacity coefficient raster map [s/m]|False
ParameterRaster|transport_coeff|Name of the transport capacity coefficient raster map [s]|False
ParameterRaster|shear_stress|Name of the critical shear stress raster map [Pa]|False
ParameterRaster|man|Name of the Mannings n raster map|False
ParameterNumber|man_value|Name of the Mannings n value|None|None|0.1
ParameterNumber|nwalk|Number of walkers|None|None|1
ParameterNumber|niter|Time used for iterations [minutes]|None|None|10
ParameterNumber|outiter|Time interval for creating output maps [minutes]|None|None|2
ParameterNumber|diffc|Water diffusion constant|None|None|0.8
OutputRaster|tc|Output transport capacity raster map [kg/ms]
OutputRaster|et|Output transp.limited erosion-deposition raster map [kg/m2s]
OutputRaster|conc|Output sediment concentration raster map [particle/m3]
OutputRaster|flux|Output sediment flux raster map [kg/ms]
OutputRaster|erdep|Output erosion-deposition raster map [kg/m2s]
ParameterNumber|nwalkers|Number of walkers|None|None|1
ParameterNumber|niterations|Time used for iterations [minutes]|None|None|10
ParameterNumber|output_step|Time interval for creating output maps [minutes]|None|None|2
ParameterNumber|diffusion_coeff|Water diffusion constant|None|None|0.8
OutputRaster|transport_capacity|Output transport capacity raster map [kg/ms]
OutputRaster|tlimit_erosion_deposition|Output transp.limited erosion-deposition raster map [kg/m2s]
OutputRaster|sediment_concentration|Output sediment concentration raster map [particle/m3]
OutputRaster|sediment_flux|Output sediment flux raster map [kg/ms]
OutputRaster|erosion_deposition|Output erosion-deposition raster map [kg/m2s]

0 comments on commit b7dcd67

Please sign in to comment.