Skip to content

Commit

Permalink
Merge pull request #2349 from NINAnor/grass7_pluginupdate
Browse files Browse the repository at this point in the history
Grass7 pluginupdate
  • Loading branch information
blazek committed Oct 5, 2015
2 parents 32e6d9c + 26c1311 commit b219b5e
Show file tree
Hide file tree
Showing 50 changed files with 11,395 additions and 9 deletions.
5 changes: 5 additions & 0 deletions src/plugins/grass/modules/default.qgc
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@
<grass name="r.distance"/>
</section>
</section>
<section label="Query raster maps">
<grass name="r.what" version_max="6.4"/>
<grass name="r.what.coordinates" version_min="7.0"/>
<grass name="r.what.vectorpoints" version_min="7.0"/>
</section>
</section>

<section label="Vector">
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/g.region.multiple.raster.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
<file key="rast" label="Type in map names separated by a comma" version_max="6.4"/>
<file key="raster" label="Type in map names separated by a comma" version_min="7.0"/>
<option key="rast" version_max="6.4"/>
<option key="raster" version_min="7.0"/>
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/g.region.multiple.vector.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
<file key="vect" label="Type in map names separated by a comma" version_max="6.4"/>
<file key="vector" label="Type in map names separated by a comma" version_min="7.0"/>
<option key="vect" version_max="6.4"/>
<option key="vector" version_min="7.0"/>
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/m.proj.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<flag key="d" />
<flag key="v" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="input" />
<option key="output" />
<file key="input" />
<file key="output" />
<option key="fs" version_max="6"/>
<option key="separator" version_min="7"/>
<option key="proj_in" />
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/r.cross.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

<qgisgrassmodule label="Create cross product of category values from multiple rasters" module="r.cross">
<flag key="z" answer="off" hidden="no" />
<file key="input" label="Type in map names separated by a comma" />
<option key="input" label="Type in map names separated by a comma" />
<option key="output" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/r.series.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<qgisgrassmodule label="Make each output cell function of the values assigned to the corresponding cells in the input rasters" module="r.series">
<flag key="n" answer="off" hidden="no" />
<file key="input" label="Type in map names separated by a comma" />
<option key="input" />
<option key="method" />
<option key="output" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/r.stats.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
<option key="nv" advanced="yes" version_max="6.4"/>
<option key="null_value" advanced="yes" version_min="7.0"/>
<option key="nsteps" advanced="yes"/>
<file key="output" type="new" advanced="yes"/>
<file key="output" type="new"/>
</qgisgrassmodule>
19 changes: 19 additions & 0 deletions src/plugins/grass/modules/r.what.coordinates.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Query rasters on their category values and labels" module="r.what">
<flag key="n" />
<flag key="f" />
<flag key="c" />
<flag key="i" />
<option key="input" version_max="6.4"/>
<option key="map" version_min="7.0"/>
<option key="east_north" version_max="6.4" />
<option key="coordinates" version_min="7.0" />
<file key="output" type="new" version_min="7.0" />
<option key="cache" advanced="yes"/>
<option key="null" advanced="yes" version_max="6.4" />
<option key="null_value" advanced="yes" version_min="7.0" />
<option key="fs" advanced="yes" version_max="6.4" />
<option key="separator" advanced="yes" version_min="7.0" />
</qgisgrassmodule>
15 changes: 15 additions & 0 deletions src/plugins/grass/modules/r.what.vectorpoints.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Query rasters on their category values and labels" module="r.what">
<flag key="n" />
<flag key="f" />
<flag key="c" />
<flag key="i" />
<option key="map" />
<option key="points" />
<file key="output" type="new"/>
<option key="cache" advanced="yes"/>
<option key="null_value" advanced="yes" />
<option key="separator" advanced="yes" />
</qgisgrassmodule>
Loading

0 comments on commit b219b5e

Please sign in to comment.