Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update and adaptation of GRASS plugin modules to GRASS 7 (r.coin.qgm,…
… r.distance.qgm, r.regression.line.qgm, r.surf.area.qgm, r.volume.qgm, v.extract.list.qgm, v.hull.qgm, v.kcv.qgm, v.net.alloc.qgm, v.net.iso.qgm, v.net.nodes.qgm, v.net.path.qgm, v.net.qgm, v.net.salesman.qgm, v.net.steiner.qgm, v.net.visibility.qgm, v.outlier.qgm, v.random.qgm, v.rast.stats.qgm, v.sample.qgm)
  • Loading branch information
PedroVenancio committed Aug 29, 2015
1 parent d5b5a5a commit 6e4c4f3
Show file tree
Hide file tree
Showing 20 changed files with 103 additions and 52 deletions.
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.coin.qgm
Expand Up @@ -2,7 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Tabulate mutual occurrence (coincidence) of categories for two rasters" module="r.coin">
<option key="map1" />
<option key="map2" />
<option key="map1" version_max="6"/>
<option key="first" version_min="7"/>
<option key="map2" version_max="6"/>
<option key="second" version_min="7"/>
<option key="units" />
</qgisgrassmodule>
10 changes: 7 additions & 3 deletions src/plugins/grass/modules/r.distance.qgm
Expand Up @@ -2,8 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Locate the closest points between objects in two raster maps" module="r.distance">
<option key="maps" option="map1"/>
<option key="maps" option="map2"/>
<option key="fs" advanced="yes"/>
<option key="maps" option="map1" version_max="6"/>
<option key="map" option="map1" version_min="7"/>
<option key="maps" option="map2" version_max="6"/>
<option key="map" option="map2" version_min="7"/>
<option key="fs" advanced="yes" version_max="6"/>
<option key="separator" advanced="yes" version_min="7"/>
<option key="sort" advanced="yes" version_min="7"/>
</qgisgrassmodule>

6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.regression.line.qgm
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Calculate linear regression from two rasters: y = a + b*x" module="r.regression.line">
<option key="map1" />
<option key="map2"/>
<option key="map1" version_max="6"/>
<option key="mapx" version_min="7"/>
<option key="map2" version_max="6"/>
<option key="mapy" version_min="7"/>
</qgisgrassmodule>
4 changes: 3 additions & 1 deletion src/plugins/grass/modules/r.surf.area.qgm
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Calculate raster surface area" module="r.surf.area">
<option key="input" />
<option key="input" version_max="6"/>
<option key="map" version_min="7"/>
<option key="vscale" />
<option key="units" version_min="7"/>
</qgisgrassmodule>
3 changes: 2 additions & 1 deletion src/plugins/grass/modules/r.volume.qgm
Expand Up @@ -3,7 +3,8 @@

<qgisgrassmodule label="Calculate volume of data clumps, and create vector with centroids of clumps" module="r.volume">
<flag key="f" />
<option key="data" />
<option key="data" version_max="6"/>
<option key="input" version_min="7"/>
<option key="clump" />
<option key="centroids" />
</qgisgrassmodule>
3 changes: 2 additions & 1 deletion src/plugins/grass/modules/v.extract.list.qgm
Expand Up @@ -3,6 +3,7 @@

<qgisgrassmodule label="Extract selected features" module="v.extract">
<option key="input" typeoption="type" layeroption="layer" id="input"/>
<selection key="list" layerid="input" label="Cats" />
<selection key="list" layerid="input" label="Cats" version_max="6"/>
<selection key="cats" layerid="input" label="Cats" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/v.hull.qgm
Expand Up @@ -3,6 +3,8 @@

<qgisgrassmodule label="Convex hull" module="v.hull">
<option key="input"/>
<option key="output" />
<flag key="a" answer="on" hidden="yes" />
<option key="output"/>
<flag key="a" answer="on" version_max="6"/>
<flag key="r" answer="off" version_min="7"/>
<flag key="f" answer="on"/>
</qgisgrassmodule>
10 changes: 6 additions & 4 deletions src/plugins/grass/modules/v.kcv.qgm
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Randomly partition points into test/train sets" module="v.kcv">
<option key="input" />
<option key="k" />
<option key="input" version_max="6"/>
<option key="map" version_min="7"/>
<option key="k" version_max="6"/>
<option key="npartitions" version_min="7"/>
<option key="column" ansewr="part" />
<option key="output" />
</qgisgrassmodule>
<option key="output" version_max="6"/>
</qgisgrassmodule>
9 changes: 6 additions & 3 deletions src/plugins/grass/modules/v.net.alloc.qgm
Expand Up @@ -2,8 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Allocate network" module="v.net.alloc">
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" />
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" />
<selection key="ccats" layerid="nodes" label="Cats" />
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
<selection key="ccats" layerid="nodes" label="Cats" version_max="6"/>
<selection key="center_cats" layerid="nodes" label="Cats" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
9 changes: 6 additions & 3 deletions src/plugins/grass/modules/v.net.iso.qgm
Expand Up @@ -2,9 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Cut network by cost isolines" module="v.net.iso">
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" />
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" />
<selection key="ccats" layerid="nodes" label="Cats (select from the map or using their id)" />
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
<selection key="ccats" layerid="nodes" label="Cats (select from the map or using their id)" version_max="6"/>
<selection key="center_cats" layerid="nodes" label="Cats (select from the map or using their id)" version_min="7"/>
<option key="costs" />
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/v.net.nodes.qgm
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create nodes on network" module="v.net">
<option key="input" layeroption="alayer" typemask="line,boundary" />
<option key="nlayer"/>
<option key="input" layeroption="alayer" typemask="line,boundary" version_max="6"/>
<option key="input" layeroption="arc_layer" typemask="line,boundary" version_min="7"/>
<option key="nlayer" version_max="6"/>
<option key="node_layer" version_min="7"/>
<option key="operation" answer="nodes" hidden="yes" />
<option key="output" />
</qgisgrassmodule>
15 changes: 10 additions & 5 deletions src/plugins/grass/modules/v.net.path.qgm
Expand Up @@ -3,12 +3,17 @@

<qgisgrassmodule label="Find shortest path on vector network" module="v.net.path">
<option key="input" />
<option key="alayer" answer="1" />
<option key="nlayer" answer="2" />
<option key="alayer" answer="1" version_max="6"/>
<option key="arc_layer" answer="1" version_min="7"/>
<option key="nlayer" answer="2" version_max="6"/>
<option key="node_layer" answer="2" version_min="7"/>
<file key="file" type="old" />
<option key="afcolumn" />
<option key="abcolumn" />
<option key="ncolumn" />
<option key="afcolumn" version_max="6"/>
<option key="arc_column" version_min="7"/>
<option key="abcolumn" version_max="6"/>
<option key="arc_backward_column" version_min="7"/>
<option key="ncolumn" version_max="6"/>
<option key="node_column" version_min="7"/>
<option key="dmax" />
<flag key="g" />
<flag key="s" />
Expand Down
10 changes: 7 additions & 3 deletions src/plugins/grass/modules/v.net.qgm
Expand Up @@ -5,9 +5,13 @@
<option key="input" />
<option key="points" />
<option key="operation" />
<option key="alayer" answer="1" />
<option key="nlayer" answer="2" />
<option key="thresh" />
<option key="alayer" answer="1" version_max="6"/>
<option key="arc_layer" answer="1" version_min="7"/>
<option key="nlayer" answer="2" version_max="6"/>
<option key="node_layer" answer="2" version_min="7"/>
<option key="thresh" version_max="6"/>
<option key="threshold" version_min="7"/>
<flag key="c" />
<flag key="s" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
9 changes: 6 additions & 3 deletions src/plugins/grass/modules/v.net.salesman.qgm
Expand Up @@ -2,8 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Connect nodes by shortest route (traveling salesman)" module="v.net.salesman">
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" />
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" />
<selection key="ccats" layerid="nodes" label="Cats" />
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
<selection key="ccats" layerid="nodes" label="Cats" version_max="6"/>
<selection key="center_cats" layerid="nodes" label="Cats" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
9 changes: 6 additions & 3 deletions src/plugins/grass/modules/v.net.steiner.qgm
Expand Up @@ -2,8 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Connect selected nodes by shortest tree (Steiner tree)" module="v.net.steiner">
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" />
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" />
<selection key="tcats" layerid="nodes" label="Cats" />
<option key="input" layeroption="alayer" typemask="line,boundary" label="Input arcs" id="arcs" version_max="6"/>
<option key="input" layeroption="arc_layer" typemask="line,boundary" label="Input arcs" id="arcs" version_min="7"/>
<option key="input" mapid="arcs" layeroption="nlayer" typemask="point" label="Input nodes" id="nodes" version_max="6"/>
<option key="input" mapid="arcs" layeroption="node_layer" typemask="point" label="Input nodes" id="nodes" version_min="7"/>
<selection key="tcats" layerid="nodes" label="Cats" version_max="6"/>
<selection key="terminal_cats" layerid="nodes" label="Cats" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/v.net.visibility.qgm
Expand Up @@ -3,7 +3,9 @@

<qgisgrassmodule label="Visibility graph construction" module="v.net.visibility">
<option key="input" />
<option key="coordinate" />
<option key="vis" />
<option key="coordinate" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="vis" version_max="6"/>
<option key="visibility" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
15 changes: 10 additions & 5 deletions src/plugins/grass/modules/v.outlier.qgm
Expand Up @@ -3,10 +3,15 @@

<qgisgrassmodule label="Remove outliers from vector point data" module="v.outlier">
<option key="input" />
<option key="soe" ansewr="10" />
<option key="son" ansewr="10" />
<option key="lambda_i" ansewr="0.1" />
<option key="thres_o" ansewr="50" />
<option key="soe" ansewr="10" version_max="6"/>
<option key="ew_step" ansewr="10" version_min="7"/>
<option key="son" ansewr="10" version_max="6"/>
<option key="ns_step" ansewr="10" version_min="7"/>
<option key="lambda_i" ansewr="0.1" version_max="6"/>
<option key="lambda" ansewr="0.1" version_min="7"/>
<option key="thres_o" ansewr="50" version_max="6"/>
<option key="threshold" ansewr="50" version_min="7"/>
<option key="output" />
<option key="outlier" />
</qgisgrassmodule>
<option key="filter" ansewr="both" advanced="yes" version_min="7"/>
</qgisgrassmodule>
8 changes: 5 additions & 3 deletions src/plugins/grass/modules/v.random.qgm
Expand Up @@ -2,9 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create random 2D/3D vector points" module="v.random">
<option key="n" />
<option key="n" version_max="6"/>
<option key="npoints" version_min="7"/>
<option key="column" advanced="yes"/>
<option key="zmin" advanced="yes"/>
<option key="zmax" advanced="yes"/>
<option key="column_type" advanced="yes" version_min="7"/>
<option key="zmin" advanced="yes"/>
<option key="zmax" advanced="yes"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/v.rast.stats.qgm
Expand Up @@ -3,7 +3,9 @@

<qgisgrassmodule label="Calculate univariate statistics from raster based on vector objects" module="v.rast.stats">
<option key="raster"/>
<option key="vector" typemask="area"/>
<option key="colprefix"/>
<option key="vector" typemask="area" version_max="6"/>
<option key="map" typemask="area" version_min="7"/>
<option key="colprefix" version_max="6"/>
<option key="column_prefix" version_min="7"/>
<flag key="c" answer="off" hidden="yes" />
</qgisgrassmodule>
5 changes: 3 additions & 2 deletions src/plugins/grass/modules/v.sample.qgm
Expand Up @@ -6,6 +6,7 @@
<field key="column" layer="input" type="integer,double"/>
<option key="raster"/>
<option key="output"/>
<flag key="b" answer="off" hidden="no" />
<flag key="c" answer="off" hidden="no" />
<flag key="b" answer="off" hidden="no" version_max="6"/>
<flag key="c" answer="off" hidden="no" version_max="6"/>
<option key="method" answer="nearest" advanced="yes" version_min="7"/>
</qgisgrassmodule>

0 comments on commit 6e4c4f3

Please sign in to comment.