Skip to content

Commit

Permalink
Update and adaptation of GRASS plugin modules to GRASS 7 (default.qgc…
Browse files Browse the repository at this point in the history 
…, db.out.ogr.qgm, r.basins.fill.qgm, r.carve.qgm, r.circle.qgm, r.fill.dir.qgm, r.lake.seed.qgm, r.lake.xy.qgm, r.plane.qgm, r.random.qgm, r.random.raster.qgm, r.reclass.area.greater.qgm, r.reclass.area.lesser.qgm, r.water.outlet.qgm, v.in.ogr.loc.qgm, v.kernel.qgm, v.surf.bspline.qgm, v.surf.rst.qgm, v.what.rast.qgm, v.what.vect.qgm, v.db.addcolumn.1.png, v.db.addcolumn.qgm, v.db.dropcolumn.1.png, v.db.dropcolumn.qgm)
  • Loading branch information
@PedroVenancio
PedroVenancio committed Aug 29, 2015
1 parent 42e7092 commit 3f4cbfc
Show file tree
Hide file tree
Showing 24 changed files with 126 additions and 86 deletions.
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/db.out.ogr.qgm
View file
Original file line number Diff line number Diff line change
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>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/default.qgc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,12 +473,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_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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.fill.dir.qgm
View file
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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>
14 changes: 7 additions & 7 deletions src/plugins/grass/modules/r.water.outlet.qgm
View file
Original file line number Diff line number Diff line change
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
Loading
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
Original file line number Diff line number Diff line change
@@ -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
Loading
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
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/v.in.ogr.loc.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="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
6 changes: 5 additions & 1 deletion src/plugins/grass/modules/v.kernel.qgm
View file
Original file line number Diff line number Diff line change
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>
12 changes: 8 additions & 4 deletions src/plugins/grass/modules/v.surf.bspline.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@

<qgisgrassmodule label="Bicubic or bilinear spline interpolation with Tykhonov regularization" module="v.surf.bspline">
<option key="input"/>
<option key="sparse" />
<option key="sie" advanced="yes"/>
<option key="sin" advanced="yes"/>
<option key="sparse" version_max="6"/>
<option key="sparse_input" version_min="7"/>
<option key="sie" advanced="yes" version_max="6"/>
<option key="ew_step" advanced="yes" version_min="7"/>
<option key="sin" advanced="yes" version_max="6"/>
<option key="ns_step" advanced="yes" version_min="7"/>
<option key="method" advanced="yes"/>
<option key="lambda_i" advanced="yes"/>
<option key="output" advanced="yes"/>
<option key="raster" />
<option key="raster" version_max="6"/>
<option key="raster_output" version_min="7"/>
<flag key="c" />
</qgisgrassmodule>
37 changes: 23 additions & 14 deletions src/plugins/grass/modules/v.surf.rst.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,32 @@
<field key="zcolumn" layer="input" type="integer,double" label="Attribute field (interpolated values)" />
<option key="tension" />
<!--option key="smooth" /-->
<option key="elev" />
<option key="dmin" advanced="yes" />
<option key="dmax" advanced="yes" />
<option key="elev" version_max="6"/>
<option key="elevation" version_min="7"/>
<option key="dmin" advanced="yes" />
<option key="dmax" advanced="yes" />
<option key="where" advanced="yes" />
<option key="slope" advanced="yes" />
<option key="slope" advanced="yes" />
<option key="aspect" advanced="yes" />
<option key="pcurv" advanced="yes" />
<option key="tcurv" advanced="yes" />
<option key="mcurv" advanced="yes" />
<option key="devi" advanced="yes" />
<option key="pcurv" advanced="yes" version_max="6"/>
<option key="pcurvature" advanced="yes" version_min="7"/>
<option key="tcurv" advanced="yes" version_max="6"/>
<option key="tcurvature" advanced="yes" version_min="7"/>
<option key="mcurv" advanced="yes" version_max="6"/>
<option key="mcurvature" advanced="yes" version_min="7"/>
<option key="devi" advanced="yes" version_max="6"/>
<option key="deviations" advanced="yes" version_min="7"/>
<option key="cvdev" advanced="yes" />
<option key="treefile" advanced="yes" />
<option key="overfile" advanced="yes" />
<option key="scolumn" advanced="yes" />
<option key="treefile" advanced="yes" version_max="6"/>
<option key="treeseg" advanced="yes" version_min="7"/>
<option key="overfile" advanced="yes" version_max="6"/>
<option key="overwin" advanced="yes" version_min="7"/>
<option key="scolumn" advanced="yes" version_max="6"/>
<option key="smooth_column" advanced="yes" version_min="7"/>
<option key="segmax" hidden="yes" />
<option key="npmin" hidden="yes" />
<option key="zmult" hidden="yes" />
<option key="theta" hidden="yes" />
<option key="scalex" hidden="yes" />
<option key="zmult" hidden="yes" version_max="6"/>
<option key="zscale" hidden="yes" version_min="7"/>
<option key="theta" hidden="yes" />
<option key="scalex" hidden="yes" />
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/v.what.rast.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Upload raster values at positions of vector points to the table" module="v.what.rast">
<option key="vector" layeroption="layer" typemask="point"/>
<field key="column" layer="vector" type="integer,double"/>
<option key="vector" layeroption="layer" typemask="point" version_max="6"/>
<option key="map" layeroption="layer" typemask="point" version_min="7"/>
<field key="column" layer="vector" type="integer,double" version_max="6"/>
<field key="column" layer="map" type="integer,double" version_min="7"/>
<option key="raster"/>
</qgisgrassmodule>
12 changes: 8 additions & 4 deletions src/plugins/grass/modules/v.what.vect.qgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Upload vector values at positions of vector points" module="v.what.vect">
<option key="vector" layeroption="layer" typemask="point"/>
<field key="column" layer="vector" type="integer,double,string"/>
<option key="qvector" layeroption="qlayer" typemask="area"/>
<field key="qcolumn" layer="qvector" type="integer,double,string"/>
<option key="vector" layeroption="layer" typemask="point" version_max="6"/>
<option key="map" layeroption="layer" typemask="point" version_min="7"/>
<field key="column" layer="vector" type="integer,double,string" version_max="6"/>
<field key="column" layer="map" type="integer,double,string" version_min="7"/>
<option key="qvector" layeroption="qlayer" typemask="area" version_max="6"/>
<option key="query_map" layeroption="query_layer" typemask="area" version_min="7"/>
<field key="qcolumn" layer="qvector" type="integer,double,string" version_max="6"/>
<field key="query_column" layer="query_map" type="integer,double,string" version_min="7"/>
</qgisgrassmodule>

0 comments on commit 3f4cbfc

Please sign in to comment.