Skip to content

Commit

Permalink
[GRASS] Update and adaptation of GRASS plugin modules to GRASS 7
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Aug 31, 2015
2 parents 9a12012 + 6e4c4f3 commit 539c952
Show file tree
Hide file tree
Showing 44 changed files with 236 additions and 145 deletions.
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/db.out.ogr.qgm
View file
Expand Up @@ -3,9 +3,9 @@

<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
<option key="input" />
<file key="dsn" type="new" version_max="6.4"/>
<file key="output" type="new" version_min="7.0"/>
<file key="dsn" type="new" version_max="6"/>
<file key="output" type="new" version_min="7"/>
<option key="format" />
<option key="db_table" version_max="6.4"/>
<option key="table" version_min="7.0"/>
<option key="db_table" version_max="6"/>
<option key="table" version_min="7"/>
</qgisgrassmodule>
20 changes: 11 additions & 9 deletions src/plugins/grass/modules/default.qgc
View file
Expand Up @@ -25,7 +25,7 @@
<section label="File management">
<section label="Import into GRASS">
<section label="Import raster into GRASS">
<section label="Import raster into GRASS from QGIS view">
<section label="Import raster into GRASS from QGIS view">
<grass name="r.in.gdal.qgis"/>
<grass name="r.in.gdal.qgis.loc"/>
</section>
Expand All @@ -51,7 +51,7 @@
</section>
</section>
<section label="Import vector into GRASS">
<grass name="v.in.ogr.qgis"/>
<grass name="v.in.ogr.qgis"/>
<grass name="v.in.ogr"/>
<grass name="v.in.ogr.loc"/>
<grass name="v.in.ogr.all"/>
Expand Down Expand Up @@ -268,19 +268,19 @@
<grass name="v.surf.bspline"/>
<grass name="v.surf.idw"/>
<grass name="v.surf.rst"/>
<grass name="r.bilinear" version_min="6.4"/>
<grass name="r.surf.idw"/>
<grass name="r.surf.idw2"/>
<grass name="r.bilinear" version_min="6.4"/>
<grass name="r.surf.idw"/>
<grass name="r.surf.idw2"/>
<grass name="r.fillnulls"/>
<grass name="r.surf.contour"/>
<grass name="r.surf.contour"/>
</section>
</section>
<section label="Reports and statistics">
<section label="Reports">
<grass name="r.category"/>
</section>
<section label="Statistics">
<grass name="r.stats"/>
<grass name="r.stats"/>
<grass name="r.sum"/>
<grass name="r.report"/>
<grass name="r.average"/>
Expand Down Expand Up @@ -475,12 +475,14 @@
<grass name="v.db.droptable"/>
</section>
<section label="Columns management">
<grass name="v.db.addcol"/>
<grass name="v.db.addcol" version_max="6.4"/>
<grass name="v.db.addcolumn" version_min="7.0"/>
<grass name="v.db.update_const"/>
<grass name="v.db.update_query"/>
<grass name="v.db.update_op"/>
<grass name="v.db.update_op_query"/>
<grass name="v.db.dropcol" version_min="6.4"/>
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
<grass name="v.db.dropcolumn" version_min="7.0"/>
<grass name="v.db.renamecol"/>
<grass name="db.execute"/>
<grass name="db.select"/>
Expand Down
12 changes: 6 additions & 6 deletions src/plugins/grass/modules/r.basins.fill.qgm
View file
Expand Up @@ -4,10 +4,10 @@
<!-- direct note: the module runs, but it was not tested with real data -->
<qgisgrassmodule label="Create watershed subbasins raster" module="r.basins.fill" direct="1">
<option key="number" />
<option key="c_map" version_max="6.4"/>
<option key="cnetwork" version_min="7.0"/>
<option key="t_map" version_max="6.4"/>
<option key="tnetwork" version_min="7.0"/>
<option key="result" version_max="6.4"/>
<option key="output" version_min="7.0"/>
<option key="c_map" version_max="6"/>
<option key="cnetwork" version_min="7"/>
<option key="t_map" version_max="6"/>
<option key="tnetwork" version_min="7"/>
<option key="result" version_max="6"/>
<option key="output" version_min="7"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.carve.qgm
View file
Expand Up @@ -2,10 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Take vector stream data, transform it to raster, and subtract depth from the output DEM" module="r.carve">
<option key="rast" version_max="6.4"/>
<option key="raster" version_min="7.0"/>
<option key="vect" version_max="6.4"/>
<option key="vector" version_min="7.0"/>
<option key="rast" version_max="6"/>
<option key="raster" version_min="7"/>
<option key="vect" version_max="6"/>
<option key="vector" version_min="7"/>
<option key="width" />
<option key="depth" />
<flag key="n" />
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.circle.qgm
View file
Expand Up @@ -2,11 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create a map containing concentric rings" module="r.circle">
<option key="coordinate" version_max="6.4"/>
<option key="coordinates" version_min="7.0"/>
<option key="coordinate" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="min" answer="0" />
<option key="max" />
<option key="mult" answer="1" version_max="6.4"/>
<option key="multiplier" answer="1" version_min="7.0"/>
<option key="mult" answer="1" version_max="6"/>
<option key="multiplier" answer="1" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.coin.qgm
View file
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
View file
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>

8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.fill.dir.qgm
View file
Expand Up @@ -3,9 +3,9 @@

<qgisgrassmodule label="Filter and create depressionless elevation map and flow direction map from elevation raster" module="r.fill.dir">
<option key="input" />
<option key="type" answer="grass" hidden="yes" version_max="6.4"/>
<option key="format" answer="grass" hidden="yes" version_min="7.0"/>
<option key="elevation" version_max="6.4"/>
<option key="output" version_min="7.0"/>
<option key="type" answer="grass" hidden="yes" version_max="6"/>
<option key="format" answer="grass" hidden="yes" version_min="7"/>
<option key="elevation" version_max="6"/>
<option key="output" version_min="7"/>
<option key="direction" />
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.lake.seed.qgm
View file
Expand Up @@ -2,10 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Fill lake from seed at given level" module="r.lake">
<option key="dem" version_max="6.4"/>
<option key="elevation" version_min="7.0"/>
<option key="dem" version_max="6"/>
<option key="elevation" version_min="7"/>
<option key="seed" />
<option key="wl" version_max="6.4"/>
<option key="water_level" version_min="7.0"/>
<option key="wl" version_max="6"/>
<option key="water_level" version_min="7"/>
<option key="lake" />
</qgisgrassmodule>
12 changes: 6 additions & 6 deletions src/plugins/grass/modules/r.lake.xy.qgm
View file
Expand Up @@ -2,12 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Fill lake from seed point at given level" module="r.lake">
<option key="dem" version_max="6.4"/>
<option key="elevation" version_min="7.0"/>
<option key="xy" version_max="6.4"/>
<option key="coordinates" version_min="7.0"/>
<option key="wl" version_max="6.4"/>
<option key="water_level" version_min="7.0"/>
<option key="dem" version_max="6"/>
<option key="elevation" version_min="7"/>
<option key="xy" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="wl" version_max="6"/>
<option key="water_level" version_min="7"/>
<flag key="n" />
<flag key="o" />
<option key="lake" />
Expand Down
5 changes: 3 additions & 2 deletions src/plugins/grass/modules/r.plane.qgm
View file
Expand Up @@ -7,5 +7,6 @@
<option key="easting" />
<option key="northing" />
<option key="elevation" />
<option key="name" />
</qgisgrassmodule>
<option key="name" version_max="6"/>
<option key="output" version_min="7"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.random.qgm
View file
Expand Up @@ -3,8 +3,8 @@

<qgisgrassmodule label="Create random vector point contained in raster" module="r.random">
<option key="input"/>
<option key="n" answer="1" hidden="no" version_max="6.4"/>
<option key="npoints" answer="1" hidden="no" version_min="7.0"/>
<option key="vector_output" version_max="6.4"/>
<option key="vector" version_min="7.0"/>
<option key="n" answer="1" hidden="no" version_max="6"/>
<option key="npoints" answer="1" hidden="no" version_min="7"/>
<option key="vector_output" version_max="6"/>
<option key="vector" version_min="7"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.random.raster.qgm
View file
Expand Up @@ -3,8 +3,8 @@

<qgisgrassmodule label="Create random raster" module="r.random" direct="1">
<option key="input"/>
<option key="n" answer="1" hidden="no" version_max="6.4"/>
<option key="npoints" answer="1" hidden="no" version_min="7.0"/>
<option key="raster_output" version_max="6.4"/>
<option key="raster" version_min="7.0"/>
<option key="n" answer="1" hidden="no" version_max="6"/>
<option key="npoints" answer="1" hidden="no" version_min="7"/>
<option key="raster_output" version_max="6"/>
<option key="raster" version_min="7"/>
</qgisgrassmodule>
6 changes: 3 additions & 3 deletions src/plugins/grass/modules/r.reclass.area.greater.qgm
View file
Expand Up @@ -3,8 +3,8 @@

<qgisgrassmodule label="Reclass raster with patches larger than user-defined area size (in hectares)" module="r.reclass.area">
<option key="input" />
<option key="greater" version_max="6.4"/>
<option key="mode" answer="greater" hidden="yes" version_min="7.0"/>
<option key="value" version_min="7.0"/>
<option key="greater" version_max="6"/>
<option key="mode" answer="greater" hidden="yes" version_min="7"/>
<option key="value" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 3 additions & 3 deletions src/plugins/grass/modules/r.reclass.area.lesser.qgm
View file
Expand Up @@ -3,8 +3,8 @@

<qgisgrassmodule label="Reclass raster with patches smaller than user-defined area size (in hectares)" module="r.reclass.area">
<option key="input" />
<option key="lesser" version_max="6.4"/>
<option key="mode" answer="lesser" hidden="yes" version_min="7.0"/>
<option key="value" version_min="7.0"/>
<option key="lesser" version_max="6"/>
<option key="mode" answer="lesser" hidden="yes" version_min="7"/>
<option key="value" version_min="7"/>
<option key="output" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.regression.line.qgm
View file
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
View file
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
View file
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>
14 changes: 7 additions & 7 deletions src/plugins/grass/modules/r.water.outlet.qgm
View file
Expand Up @@ -2,11 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create watershed basin" module="r.water.outlet">
<option key="drainage" version_max="6.4"/>
<option key="input" version_min="7.0"/>
<option key="easting" version_max="6.4"/>
<option key="northing" version_max="6.4"/>
<option key="coordinates" version_min="7.0"/>
<option key="basin" version_max="6.4"/>
<option key="output" version_min="7.0"/>
<option key="drainage" version_max="6"/>
<option key="input" version_min="7"/>
<option key="easting" version_max="6"/>
<option key="northing" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="basin" version_max="6"/>
<option key="output" version_min="7"/>
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/v.db.addcolumn.1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/plugins/grass/modules/v.db.addcolumn.qgm
View file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Add one or more columns to attribute table" module="v.db.addcolumn">
<option key="map" layeroption="layer" />
<option key="columns"/>
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/v.db.dropcolumn.1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/plugins/grass/modules/v.db.dropcolumn.qgm
View file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Drop column from attribute table" module="v.db.dropcolumn">
<option key="map" layeroption="layer" />
<field key="columns" layer="map" label="Attribute field" type="integer,double,varchar,string"/>
</qgisgrassmodule>
3 changes: 2 additions & 1 deletion src/plugins/grass/modules/v.extract.list.qgm
View file
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
View file
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>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/v.in.ogr.loc.qgm
View file
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
<file key="dsn" version_max="6.4"/>
<file key="input" version_min="7.0"/>
<file key="dsn" version_max="6"/>
<file key="input" version_min="7"/>
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
<flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
<flag key="z" answer="off" hidden="no" advanced="yes" version_max="6"/>
<flag key="2" answer="off" hidden="no" advanced="yes" version_min="7"/>
<flag key="t" answer="off" hidden="no" advanced="yes"/>
<flag key="o" answer="off" hidden="no" advanced="yes"/>
<flag key="r" answer="off" hidden="no" advanced="yes"/>
Expand Down
10 changes: 6 additions & 4 deletions src/plugins/grass/modules/v.kcv.qgm
View file
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>
6 changes: 5 additions & 1 deletion src/plugins/grass/modules/v.kernel.qgm
View file
Expand Up @@ -3,6 +3,10 @@

<qgisgrassmodule label="Gaussian kernel density" module="v.kernel" manual="v.kernel">
<option key="input" />
<option key="stddeviation" />
<option key="stddeviation" version_max="6"/>
<option key="radius" version_min="7"/>
<option key="mult" answer="1" advanced="yes" version_max="6"/>
<option key="multiplier" answer="1" advanced="yes" version_min="7"/>
<option key="kernel" answer="Gaussian" advanced="yes"/>
<option key="output" />
</qgisgrassmodule>

0 comments on commit 539c952

Please sign in to comment.