Skip to content

Commit

Permalink
Merge pull request #2276 from spaceof7/grass
Browse files Browse the repository at this point in the history 
Grass plugin modules updates - terrain analysis modules
  • Loading branch information
@blazek
blazek committed Aug 29, 2015
2 parents b789fab + eadb83b commit 812b012
Show file tree
Hide file tree
Showing 16 changed files with 607 additions and 569 deletions.
960 changes: 481 additions & 479 deletions src/plugins/grass/modules/default.qgc
View file

Large diffs are not rendered by default.

22 changes: 12 additions & 10 deletions src/plugins/grass/modules/r.cost.coord.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates" module="r.cost">
<option key="input"/>
<option key="coordinate"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<option key="input"/>
<option key="coordinate"version_max="6.4"/>
<option key="start_coordinates" version_min="7.0"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
</qgisgrassmodule>
20 changes: 11 additions & 9 deletions src/plugins/grass/modules/r.cost.rast.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster" module="r.cost">
<option key="input"/>
<option key="start_rast"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes"/>
<option key="input"/>
<option key="start_rast" version_max="6.4"/>
<option key="start_raster" version_min="7.0"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
</qgisgrassmodule>
19 changes: 10 additions & 9 deletions src/plugins/grass/modules/r.cost.vect.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector" module="r.cost">
<option key="input"/>
<option key="start_points"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes"/>
<option key="input"/>
<option key="start_points"/>
<option key="output"/>
<option key="max_cost" hidden="no"/>
<option key="stop_coordinate" hidden="no" advanced="yes" version_max="6.4"/>
<option key="stop_coordinates" hidden="no" advanced="yes" version_min="7.0"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<option key="null_cost" hidden="no" advanced="yes"/>
<flag key="k" hidden="no" />
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
</qgisgrassmodule>
7 changes: 4 additions & 3 deletions src/plugins/grass/modules/r.drain.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Trace a flow through an elevation model" module="r.drain">
<option key="input"/>
<option key="output"/>
<option key="coordinate"/>
<option key="input"/>
<option key="output"/>
<option key="coordinate" version_max="6.4"/>
<option key="start_coordinates" version_min="7.0"/>
</qgisgrassmodule>
18 changes: 9 additions & 9 deletions src/plugins/grass/modules/r.mapcalculator.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Simple map algebra" module="r.mapcalculator">
<flag key="o" />
<option key="amap" />
<option key="bmap" />
<option key="cmap" />
<option key="dmap" />
<option key="emap" />
<option key="fmap" />
<option key="formula" />
<option key="outfile" />
<flag key="o" />
<option key="amap" />
<option key="bmap" />
<option key="cmap" />
<option key="dmap" />
<option key="emap" />
<option key="fmap" />
<option key="formula" />
<option key="outfile" />
</qgisgrassmodule>
9 changes: 5 additions & 4 deletions src/plugins/grass/modules/r.param.scale.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Extracts terrain parameters from DEM" module="r.param.scale">
<option key="input"/>
<option key="param"/>
<option key="size" answer="3" hidden="no"/>
<option key="output"/>
<option key="input"/>
<option key="param" version_max="6.4"/>
<option key="method" version_min="7.0"/>
<option key="size" answer="3" hidden="no"/>
<option key="output"/>
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/r.relief.1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/r.relief.2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/r.relief.3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/r.relief.qgm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create shaded map" module="r.relief">
<option key="input"/>
<option key="output" />
<option key="altitude" />
<option key="azimuth" />
<option key="zscale" answer="1" />
<option key="scale" answer="1" hidden="yes" />
</qgisgrassmodule>
24 changes: 13 additions & 11 deletions src/plugins/grass/modules/r.texture.bis.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create raster with textural features from raster (second serie of indices)" module="r.texture">
<option key="input" />
<option key="size" answer="3" />
<option key="distance" answer="1" />
<flag key="x" />
<flag key="e" />
<flag key="d" />
<flag key="p" />
<flag key="m" />
<flag key="n" />
<flag key="o" />
<option key="prefix" />
<option key="input" />
<option key="size" answer="3" />
<option key="distance" answer="1" />
<flag key="x" version_max="6.4"/>
<flag key="e" version_max="6.4"/>
<flag key="d" version_max="6.4"/>
<flag key="p" version_max="6.4"/>
<flag key="m" version_max="6.4"/>
<flag key="n" version_max="6.4"/>
<flag key="o" version_max="6.4"/>
<option key="method" version_min="7.0"/>
<option key="prefix" version_max="6.4"/>
<option key="output" version_min="7.0"/>
</qgisgrassmodule>
24 changes: 13 additions & 11 deletions src/plugins/grass/modules/r.texture.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create raster images with textural features from raster (first serie of indices)" module="r.texture">
<option key="input" />
<option key="size" />
<option key="distance" />
<flag key="a" />
<flag key="c" />
<flag key="k" />
<flag key="v" />
<flag key="i" />
<flag key="s" />
<flag key="w" />
<option key="prefix" />
<option key="input" />
<option key="size" />
<option key="distance" />
<flag key="a" version_max="6.4"/>
<flag key="c" version_max="6.4"/>
<flag key="k" version_max="6.4"/>
<flag key="v" version_max="6.4"/>
<flag key="i" version_max="6.4"/>
<flag key="s" version_max="6.4"/>
<flag key="w" version_max="6.4"/>
<option key="method" version_min="7.0"/>
<option key="prefix" version_max="6.4"/>
<option key="output" version_min="7.0"/>
</qgisgrassmodule>
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/r.viewshed.qgm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Line-of-sight raster analysis" module="r.viewshed">
<option key="input"/>
<option key="coordinates" />
<option key="observer_elevation" answer="1.75" hidden="no" />
<option key="target_elevation" answer="0.0" hidden="no" />
<option key="max_distance" answer="-1" hidden="no" />
<option key="output" />
</qgisgrassmodule>
26 changes: 14 additions & 12 deletions src/plugins/grass/modules/r.walk.coord.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<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">
<option key="elevation"/>
<option key="friction"/>
<option key="coordinate"/>
<option key="output"/>
<flag key="k" hidden="no"/>
<option key="stop_coordinate" advanced="yes"/>
<option key="elevation"/>
<option key="friction"/>
<option key="coordinate"version_max="6.4"/>
<option key="start_coordinates" version_min="7.0"/>
<option key="output"/>
<flag key="k" hidden="no"/>
<option key="stop_coordinate" advanced="yes" version_max="6.4"/>
<option key="stop_coordinates" advanced="yes" version_min="7.0"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="max_cost" advanced="yes"/>
<option key="lambda" advanced="yes"/>
<option key="slope_factor" advanced="yes"/>
<option key="null_cost" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<option key="max_cost" advanced="yes"/>
<option key="lambda" advanced="yes"/>
<option key="slope_factor" advanced="yes"/>
<option key="null_cost" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
</qgisgrassmodule>
25 changes: 13 additions & 12 deletions src/plugins/grass/modules/r.walk.vect.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<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">
<option key="elevation"/>
<option key="friction"/>
<option key="start_points"/>
<option key="output"/>
<option key="stop_coordinate" advanced="yes"/>
<option key="elevation"/>
<option key="friction"/>
<option key="start_points"/>
<option key="output"/>
<option key="stop_coordinate" advanced="yes" version_max="6.4"/>
<option key="stop_coordinates" advanced="yes" version_min="7.0"/>
<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
<option key="max_cost" advanced="yes"/>
<option key="lambda" advanced="yes"/>
<option key="slope_factor" advanced="yes"/>
<option key="null_cost" advanced="yes"/>
<flag key="k" hidden="no"/>
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<option key="max_cost" advanced="yes"/>
<option key="lambda" advanced="yes"/>
<option key="slope_factor" advanced="yes"/>
<option key="null_cost" advanced="yes"/>
<flag key="k" hidden="no"/>
<flag key="n" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
</qgisgrassmodule>

0 comments on commit 812b012

Please sign in to comment.