Skip to content

Commit 5c0921c

Browse files
author
Andrew McAninch
committed
GRASS terrain analysis modules updated
tested with Grass 7 and grass 6.4
1 parent 4e06bc1 commit 5c0921c

16 files changed

+607
-569
lines changed

‎src/plugins/grass/modules/default.qgc

Lines changed: 481 additions & 479 deletions
Large diffs are not rendered by default.

‎src/plugins/grass/modules/r.cost.coord.qgm

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates" module="r.cost">
5-
<option key="input"/>
6-
<option key="coordinate"/>
7-
<option key="output"/>
8-
<option key="max_cost" hidden="no"/>
9-
<option key="stop_coordinate" hidden="no" advanced="yes"/>
10-
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
11-
<option key="null_cost" hidden="no" advanced="yes"/>
12-
<flag key="k" hidden="no" />
13-
<flag key="n" hidden="no" advanced="yes"/>
14-
<flag key="r" hidden="no" advanced="yes"/>
5+
<option key="input"/>
6+
<option key="coordinate"version_max="6.4"/>
7+
<option key="start_coordinates" version_min="7.0"/>
8+
<option key="output"/>
9+
<option key="max_cost" hidden="no"/>
10+
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
11+
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
12+
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
13+
<option key="null_cost" hidden="no" advanced="yes"/>
14+
<flag key="k" hidden="no" />
15+
<flag key="n" hidden="no" advanced="yes"/>
16+
<flag key="r" hidden="no" advanced="yes"/>
1517
</qgisgrassmodule>

‎src/plugins/grass/modules/r.cost.rast.qgm

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster" module="r.cost">
5-
<option key="input"/>
6-
<option key="start_rast"/>
7-
<option key="output"/>
8-
<option key="max_cost" hidden="no"/>
9-
<option key="stop_coordinate" hidden="no" advanced="yes"/>
5+
<option key="input"/>
6+
<option key="start_rast" version_max="6.4"/>
7+
<option key="start_raster" version_min="7.0"/>
8+
<option key="output"/>
9+
<option key="max_cost" hidden="no"/>
10+
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
11+
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
1012
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
11-
<option key="null_cost" hidden="no" advanced="yes"/>
12-
<flag key="k" hidden="no" />
13-
<flag key="n" hidden="no" advanced="yes"/>
14-
<flag key="r" hidden="no" advanced="yes"/>
13+
<option key="null_cost" hidden="no" advanced="yes"/>
14+
<flag key="k" hidden="no" />
15+
<flag key="n" hidden="no" advanced="yes"/>
16+
<flag key="r" hidden="no" advanced="yes"/>
1517
</qgisgrassmodule>

‎src/plugins/grass/modules/r.cost.vect.qgm

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector" module="r.cost">
5-
<option key="input"/>
6-
<option key="start_points"/>
7-
<option key="output"/>
8-
<option key="max_cost" hidden="no"/>
9-
<option key="stop_coordinate" hidden="no" advanced="yes"/>
5+
<option key="input"/>
6+
<option key="start_points"/>
7+
<option key="output"/>
8+
<option key="max_cost" hidden="no"/>
9+
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
10+
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
1011
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
11-
<option key="null_cost" hidden="no" advanced="yes"/>
12-
<flag key="k" hidden="no" />
13-
<flag key="n" hidden="no" advanced="yes"/>
14-
<flag key="r" hidden="no" advanced="yes"/>
12+
<option key="null_cost" hidden="no" advanced="yes"/>
13+
<flag key="k" hidden="no" />
14+
<flag key="n" hidden="no" advanced="yes"/>
15+
<flag key="r" hidden="no" advanced="yes"/>
1516
</qgisgrassmodule>

‎src/plugins/grass/modules/r.drain.qgm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Trace a flow through an elevation model" module="r.drain">
5-
<option key="input"/>
6-
<option key="output"/>
7-
<option key="coordinate"/>
5+
<option key="input"/>
6+
<option key="output"/>
7+
<option key="coordinate" version_max="6.4"/>
8+
<option key="start_coordinates" version_min="7.0"/>
89
</qgisgrassmodule>

‎src/plugins/grass/modules/r.mapcalculator.qgm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Simple map algebra" module="r.mapcalculator">
5-
<flag key="o" />
6-
<option key="amap" />
7-
<option key="bmap" />
8-
<option key="cmap" />
9-
<option key="dmap" />
10-
<option key="emap" />
11-
<option key="fmap" />
12-
<option key="formula" />
13-
<option key="outfile" />
5+
<flag key="o" />
6+
<option key="amap" />
7+
<option key="bmap" />
8+
<option key="cmap" />
9+
<option key="dmap" />
10+
<option key="emap" />
11+
<option key="fmap" />
12+
<option key="formula" />
13+
<option key="outfile" />
1414
</qgisgrassmodule>

‎src/plugins/grass/modules/r.param.scale.qgm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Extracts terrain parameters from DEM" module="r.param.scale">
5-
<option key="input"/>
6-
<option key="param"/>
7-
<option key="size" answer="3" hidden="no"/>
8-
<option key="output"/>
5+
<option key="input"/>
6+
<option key="param" version_max="6.4"/>
7+
<option key="method" version_min="7.0"/>
8+
<option key="size" answer="3" hidden="no"/>
9+
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/r.relief.1.png

2.78 KB
Loading

‎src/plugins/grass/modules/r.relief.2.png

2.68 KB
Loading

‎src/plugins/grass/modules/r.relief.3.png

1.46 KB
Loading

‎src/plugins/grass/modules/r.relief.qgm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Create shaded map" module="r.relief">
5+
<option key="input"/>
6+
<option key="output" />
7+
<option key="altitude" />
8+
<option key="azimuth" />
9+
<option key="zscale" answer="1" />
10+
<option key="scale" answer="1" hidden="yes" />
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/r.texture.bis.qgm

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Create raster with textural features from raster (second serie of indices)" module="r.texture">
5-
<option key="input" />
6-
<option key="size" answer="3" />
7-
<option key="distance" answer="1" />
8-
<flag key="x" />
9-
<flag key="e" />
10-
<flag key="d" />
11-
<flag key="p" />
12-
<flag key="m" />
13-
<flag key="n" />
14-
<flag key="o" />
15-
<option key="prefix" />
5+
<option key="input" />
6+
<option key="size" answer="3" />
7+
<option key="distance" answer="1" />
8+
<flag key="x" version_max="6.4"/>
9+
<flag key="e" version_max="6.4"/>
10+
<flag key="d" version_max="6.4"/>
11+
<flag key="p" version_max="6.4"/>
12+
<flag key="m" version_max="6.4"/>
13+
<flag key="n" version_max="6.4"/>
14+
<flag key="o" version_max="6.4"/>
15+
<option key="method" version_min="7.0"/>
16+
<option key="prefix" version_max="6.4"/>
17+
<option key="output" version_min="7.0"/>
1618
</qgisgrassmodule>

‎src/plugins/grass/modules/r.texture.qgm

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Create raster images with textural features from raster (first serie of indices)" module="r.texture">
5-
<option key="input" />
6-
<option key="size" />
7-
<option key="distance" />
8-
<flag key="a" />
9-
<flag key="c" />
10-
<flag key="k" />
11-
<flag key="v" />
12-
<flag key="i" />
13-
<flag key="s" />
14-
<flag key="w" />
15-
<option key="prefix" />
5+
<option key="input" />
6+
<option key="size" />
7+
<option key="distance" />
8+
<flag key="a" version_max="6.4"/>
9+
<flag key="c" version_max="6.4"/>
10+
<flag key="k" version_max="6.4"/>
11+
<flag key="v" version_max="6.4"/>
12+
<flag key="i" version_max="6.4"/>
13+
<flag key="s" version_max="6.4"/>
14+
<flag key="w" version_max="6.4"/>
15+
<option key="method" version_min="7.0"/>
16+
<option key="prefix" version_max="6.4"/>
17+
<option key="output" version_min="7.0"/>
1618
</qgisgrassmodule>

‎src/plugins/grass/modules/r.viewshed.qgm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Line-of-sight raster analysis" module="r.viewshed">
5+
<option key="input"/>
6+
<option key="coordinates" />
7+
<option key="observer_elevation" answer="1.75" hidden="no" />
8+
<option key="target_elevation" answer="0.0" hidden="no" />
9+
<option key="max_distance" answer="-1" hidden="no" />
10+
<option key="output" />
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/r.walk.coord.qgm

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) coordinates" module="r.walk">
5-
<option key="elevation"/>
6-
<option key="friction"/>
7-
<option key="coordinate"/>
8-
<option key="output"/>
9-
<flag key="k" hidden="no"/>
10-
<option key="stop_coordinate" advanced="yes"/>
5+
<option key="elevation"/>
6+
<option key="friction"/>
7+
<option key="coordinate"version_max="6.4"/>
8+
<option key="start_coordinates" version_min="7.0"/>
9+
<option key="output"/>
10+
<flag key="k" hidden="no"/>
11+
<option key="stop_coordinate" advanced="yes" version_max="6.4"/>
12+
<option key="stop_coordinates" advanced="yes" version_min="7.0"/>
1113
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
12-
<option key="max_cost" advanced="yes"/>
13-
<option key="lambda" advanced="yes"/>
14-
<option key="slope_factor" advanced="yes"/>
15-
<option key="null_cost" advanced="yes"/>
16-
<flag key="n" hidden="no" advanced="yes"/>
17-
<flag key="r" hidden="no" advanced="yes"/>
14+
<option key="max_cost" advanced="yes"/>
15+
<option key="lambda" advanced="yes"/>
16+
<option key="slope_factor" advanced="yes"/>
17+
<option key="null_cost" advanced="yes"/>
18+
<flag key="n" hidden="no" advanced="yes"/>
19+
<flag key="r" hidden="no" advanced="yes"/>
1820
</qgisgrassmodule>

‎src/plugins/grass/modules/r.walk.vect.qgm

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) vector" module="r.walk">
5-
<option key="elevation"/>
6-
<option key="friction"/>
7-
<option key="start_points"/>
8-
<option key="output"/>
9-
<option key="stop_coordinate" advanced="yes"/>
5+
<option key="elevation"/>
6+
<option key="friction"/>
7+
<option key="start_points"/>
8+
<option key="output"/>
9+
<option key="stop_coordinate" advanced="yes" version_max="6.4"/>
10+
<option key="stop_coordinates" advanced="yes" version_min="7.0"/>
1011
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
11-
<option key="max_cost" advanced="yes"/>
12-
<option key="lambda" advanced="yes"/>
13-
<option key="slope_factor" advanced="yes"/>
14-
<option key="null_cost" advanced="yes"/>
15-
<flag key="k" hidden="no"/>
16-
<flag key="n" hidden="no" advanced="yes"/>
17-
<flag key="r" hidden="no" advanced="yes"/>
12+
<option key="max_cost" advanced="yes"/>
13+
<option key="lambda" advanced="yes"/>
14+
<option key="slope_factor" advanced="yes"/>
15+
<option key="null_cost" advanced="yes"/>
16+
<flag key="k" hidden="no"/>
17+
<flag key="n" hidden="no" advanced="yes"/>
18+
<flag key="r" hidden="no" advanced="yes"/>
1819
</qgisgrassmodule>

0 commit comments

Comments
 (0)