Skip to content
Permalink
Browse files

Merge pull request #2264 from NINAnor/grass7_pluginupdate

Grass7 pluginupdate - File management
  • Loading branch information
blazek committed Aug 24, 2015
2 parents d594a56 + 20f0a5a commit 2acff9b6c9dec05ac89600bdcda628905d2480c8
Showing with 156 additions and 71 deletions.
  1. +2 −1 src/plugins/grass/modules/db.in.ogr.qgm
  2. +4 −2 src/plugins/grass/modules/db.out.ogr.qgm
  3. +6 −6 src/plugins/grass/modules/default.qgc
  4. +2 −1 src/plugins/grass/modules/g.region.multiple.raster.qgm
  5. +2 −1 src/plugins/grass/modules/g.region.multiple.vector.qgm
  6. +4 −2 src/plugins/grass/modules/i.in.spotvgt.qgm
  7. +0 −1 src/plugins/grass/modules/r.external.all.qgm
  8. +8 −5 src/plugins/grass/modules/r.in.ascii.qgm
  9. +19 −8 src/plugins/grass/modules/r.in.wms.qgm
  10. +2 −1 src/plugins/grass/modules/r.in.xyz.qgm
  11. +4 −2 src/plugins/grass/modules/r.out.ascii.qgm
  12. +2 −1 src/plugins/grass/modules/r.out.mpeg.qgm
  13. +4 −2 src/plugins/grass/modules/r.out.pov.qgm
  14. +2 −1 src/plugins/grass/modules/r.out.ppm.qgm
  15. +4 −2 src/plugins/grass/modules/r.out.vrml.qgm
  16. +6 −3 src/plugins/grass/modules/r.out.vtk.qgm
  17. +2 −1 src/plugins/grass/modules/r.out.xyz.qgm
  18. +4 −2 src/plugins/grass/modules/r.stats.qgm
  19. +2 −1 src/plugins/grass/modules/r.to.vect.area.qgm
  20. +2 −1 src/plugins/grass/modules/r.to.vect.line.qgm
  21. +2 −1 src/plugins/grass/modules/r.to.vect.point.qgm
  22. +2 −1 src/plugins/grass/modules/v.in.ascii.qgm
  23. +4 −2 src/plugins/grass/modules/v.in.e00.qgm
  24. +8 −2 src/plugins/grass/modules/v.in.ogr.all.loc.qgm
  25. +8 −2 src/plugins/grass/modules/v.in.ogr.all.qgm
  26. +8 −2 src/plugins/grass/modules/v.in.ogr.loc.qgm
  27. +8 −2 src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
  28. +11 −5 src/plugins/grass/modules/v.in.ogr.qgis.qgm
  29. +8 −2 src/plugins/grass/modules/v.in.ogr.qgm
  30. +2 −1 src/plugins/grass/modules/v.out.ascii.qgm
  31. +4 −2 src/plugins/grass/modules/v.out.ogr.gml.qgm
  32. +2 −1 src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
  33. +4 −2 src/plugins/grass/modules/v.out.ogr.qgm
  34. +2 −1 src/plugins/grass/modules/v.out.vtk.qgm
  35. +2 −1 src/plugins/grass/modules/v.to.rast.attr.qgm
@@ -2,6 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import attribute tables in various formats" module="db.in.ogr">
<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" />
<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_max="6.4"/>
<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_min="7.0"/>
<option key="output"/>
</qgisgrassmodule>
@@ -3,7 +3,9 @@

<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
<option key="input" />
<file key="dsn" type="new" />
<file key="dsn" type="new" version_max="6.4"/>
<file key="output" type="new" version_max="7.0"/>
<option key="format" />
<option key="db_table" />
<option key="db_table" version_max="6.4"/>
<option key="table" version_min="7.0"/>
</qgisgrassmodule>
@@ -41,7 +41,7 @@
<grass name="r.in.ascii"/>
<grass name="r.in.poly"/>
<grass name="r.in.bin"/>
<grass name="r.in.arc"/>
<grass name="r.in.arc" version_max="6.4"/>
<grass name="r.in.gridatb"/>
<grass name="r.in.mat"/>
<grass name="i.in.spotvgt"/>
@@ -61,10 +61,10 @@
<grass name="v.in.ascii"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin"/>
<grass name="v.in.gpsbabel"/>
<grass name="v.in.garmin" version_max="6.4"/>
<grass name="v.in.gpsbabel" version_max="6.4"/>
<grass name="v.in.geonames" version_min="6.4"/>
<grass name="v.in.gns"/>
<grass name="v.in.gns" version_max="6.4"/>
</section>
<section label="Import from database into GRASS">
<grass name="db.in.ogr"/>
@@ -76,7 +76,7 @@
<grass name="r.out.gdal"/>
<grass name="r.out.ascii"/>
<grass name="r.out.xyz"/>
<grass name="r.out.arc"/>
<grass name="r.out.arc" version_max="6.4"/>
<grass name="r.out.gridatb"/>
<grass name="r.out.mat"/>
<grass name="r.out.bin"/>
@@ -85,7 +85,7 @@
<grass name="r.out.ppm"/>
<grass name="r.out.ppm3"/>
<grass name="r.out.pov"/>
<grass name="r.out.tiff"/>
<grass name="r.out.tiff" version_max="6.4"/>
<grass name="r.out.vrml"/>
<grass name="r.out.vtk"/>
</section>
@@ -2,5 +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" />
<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"/>
</qgisgrassmodule>
@@ -2,5 +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" />
<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"/>
</qgisgrassmodule>
@@ -2,7 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import SPOT VGT NDVI" module="i.in.spotvgt">
<file key="file" type="new" />
<file key="file" type="new" version_max="6.4"/>
<file key="input" version_min="7.0"/>
<flag key="a" />
<option key="rast" />
<option key="rast" version_max="6.4"/>
<option key="output" version_min="7.0"/>
</qgisgrassmodule>
@@ -2,7 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link all GDAL supported rasters in a directory as GRASS rasters" module="r.external.all.py" manual="r.external">
<file key="input" type="directory" label="Directory of rasters to be linked"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="r" advanced="yes"/>
<flag key="o" advanced="yes"/>
@@ -3,11 +3,14 @@

<qgisgrassmodule label="Import ASCII raster" module="r.in.ascii">
<file key="input" type="old" />
<option key="mult" />
<option key="nv" />
<flag key="i" />
<flag key="f" />
<flag key="d" />
<option key="mult" version_max="6.4" />
<option key="multiplier" version_min="7.0" />
<option key="nv" version_max="6.4" />
<option key="null_value" version_min="7.0" />
<option key="type" version_min="7.0" />
<flag key="i" version_max="6.4" />
<flag key="f" version_max="6.4" />
<flag key="d" version_max="6.4" />
<flag key="s" />
<option key="output" />
</qgisgrassmodule>
@@ -2,18 +2,29 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Download and import data from WMS server" module="r.in.wms">
<option key="mapserver" />
<option key="mapserver" version_max="6.4"/>
<option key="url" version_min="7.0"/>
<option key="layers" />
<option key="srs" />
<option key="format" />
<option key="wmsquery" />
<flag key="d" answer="off" />
<option key="wms_version" version_min="7.0"/>
<option key="wmsquery" version_max="6.4"/>
<flag key="d" answer="off" version_max="6.4"/>
<flag key="c" answer="off" />
<option key="folder" />
<option key="wgetoptions" />
<option key="curloptions" />
<flag key="k" answer="off" />
<flag key="p" answer="off" />
<option key="folder" version_max="6.4"/>
<option key="wgetoptions" version_max="6.4"/>
<option key="curloptions" version_max="6.4"/>
<flag key="k" answer="off" version_max="6.4"/>
<flag key="o" answer="off"/>
<flag key="p" answer="off" version_max="6.4"/>
<option key="method" />
<option key="output" />
<option key="maxcols" advanced="yes" version_min="7.0"/>
<option key="maxrows" advanced="yes" version_min="7.0"/>
<option key="username" advanced="yes" version_min="7.0"/>
<option key="password" advanced="yes" version_min="7.0"/>
<option key="method" advanced="yes" version_min="7.0"/>
<option key="region" advanced="yes" version_min="7.0"/>
<option key="bgcolor" advanced="yes" version_min="7.0"/>
<option key="urlparams" advanced="yes" version_min="7.0"/>
</qgisgrassmodule>
@@ -5,7 +5,8 @@
<file key="input" type="old" filters="TXT (*.txt), CSV (*.csv)"/>
<option key="method" />
<option key="type" />
<option key="fs" />
<option key="fs" version_max="6.4" />
<option key="separator" version_min="7.0" />
<option key="x" />
<option key="y" />
<option key="z" />
@@ -3,8 +3,10 @@

<qgisgrassmodule label="Export raster to ASCII text file" module="r.out.ascii">
<option key="input" />
<option key="dp" answer="2"/>
<option key="null" />
<option key="dp" answer="2" version_max="6.4"/>
<option key="precision" answer="2" version_min="7.0"/>
<option key="null" version_max="6.4"/>
<option key="null_value" version_min="7.0"/>
<file key="output" type="new" />
<flag key="h" />
<flag key="s" />
@@ -3,7 +3,8 @@

<qgisgrassmodule label="Export raster series to MPEG movie" module="r.out.mpeg">
<file key="view1" label="Type in map names separated by a comma" />
<option key="qual" />
<option key="qual" version_max="6.4"/>
<option key="quality" version_min="7.0"/>
<flag key="c" />
<file key="output" type="new" filters="MPEG (*.mpg)" />
</qgisgrassmodule>
@@ -2,9 +2,11 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Export raster to POVRAY height-field file" module="r.out.pov">
<option key="map" />
<option key="map" version_max="6.4"/>
<option key="input" version_min="7.0"/>
<option key="hftype" />
<option key="bias" />
<option key="scale" />
<file key="tga" type="new" />
<file key="tga" type="new" version_max="6.4"/>
<file key="output" type="new" version_min="7.0"/>
</qgisgrassmodule>
@@ -3,6 +3,7 @@

<qgisgrassmodule label="Export raster to PPM image at the resolution of the current region" module="r.out.ppm">
<option key="input" />
<flag key="G" />
<flag key="G" version_max="6.4"/>
<flag key="g" version_min="7.0"/>
<file key="output" type="new" />
</qgisgrassmodule>
@@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Export raster to Virtual Reality Modeling Language (VRML)" module="r.out.vrml">
<option key="elev" />
<option key="elev" version_max="6.4"/>
<option key="elevation" version_min="7.0"/>
<option key="color" />
<option key="exag" />
<option key="exag" version_max="6.4"/>
<option key="exaggeration" version_min="7.0"/>
<file key="output" type="new" />
</qgisgrassmodule>
@@ -6,8 +6,11 @@
<option key="elevation" />
<flag key="p" answer="off" />
<option key="null" />
<option key="elevation2d" />
<option key="elevscale" />
<option key="dp" />
<option key="elevation2d" version_max="6.4"/>
<option key="elevscale" version_max="6.4"/>
<option key="dp" version_max="6.4"/>
<option key="z" version_min="7.0"/>
<option key="zscale" version_min="7.0"/>
<option key="precision" version_min="7.0"/>
<file key="output" type="new" filters="VTK (*.vtk)" />
</qgisgrassmodule>
@@ -3,6 +3,7 @@

<qgisgrassmodule label="Export raster to text file as x,y,z values based on cell centers" module="r.out.xyz">
<option key="input" />
<option key="fs" />
<option key="fs" version_max="6.4"/>
<option key="separator" version_min="7.0"/>
<file key="output" type="new" />
</qgisgrassmodule>
@@ -16,8 +16,10 @@
<flag key="C" advanced="yes"/>
<flag key="r" advanced="yes"/>
<flag key="i" advanced="yes"/>
<option key="fs" advanced="yes"/>
<option key="nv" advanced="yes"/>
<option key="fs" advanced="yes" version_max="6.4"/>
<option key="separator" advanced="yes" version_min="7.0"/>
<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"/>
</qgisgrassmodule>
@@ -4,6 +4,7 @@
<qgisgrassmodule label="Convert raster to vector areas" module="r.to.vect">
<option key="input" />
<option key="output" />
<option key="feature" answer="area" hidden="yes" />
<option key="feature" answer="area" hidden="yes" version_max="6.4"/>
<option key="type" answer="area" hidden="yes" version_min="7.0"/>
<flag key="s" answer="on" hidden="yes" />
</qgisgrassmodule>
@@ -4,6 +4,7 @@
<qgisgrassmodule label="Convert raster to vector lines" module="r.to.vect">
<option key="input" />
<option key="output" />
<option key="feature" answer="line" hidden="yes" />
<option key="feature" answer="line" hidden="yes" version_max="6.4"/>
<option key="type" answer="line" hidden="yes" version_min="7.0"/>
<flag key="s" answer="on" hidden="yes" />
</qgisgrassmodule>
@@ -4,6 +4,7 @@
<qgisgrassmodule label="Convert raster to vector points" module="r.to.vect">
<option key="input" />
<option key="output" />
<option key="feature" answer="point" hidden="yes" />
<option key="feature" answer="point" hidden="yes" version_max="6.4"/>
<option key="type" answer="point" hidden="yes" version_min="7.0"/>
<flag key="s" answer="on" hidden="yes" />
</qgisgrassmodule>
@@ -5,7 +5,8 @@
<file key="input" label="Text file"/>
<option key="output"/>
<option key="format"/>
<option key="fs" label="Separator (| , \t etc.)" />
<option key="fs" label="Separator (| , \t etc.)" version_max="6.4" />
<option key="separator" label="Separator (| , \t etc.)" version_min="7.0" />
<option key="skip" label="Number of rows to be skipped"/>
<option key="x" label="Which column for the X coordinate? The first is 1"/>
<option key="y" label="Which column for the Y coordinate?"/>
@@ -2,7 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import ESRI E00 vector" module="v.in.e00">
<file key="file" type="old" label="E00 vector layer" />
<file key="file" type="old" label="E00 vector layer" version_max="6.4"/>
<file key="input" type="old" label="E00 vector layer" version_min="7.0"/>
<option key="type" />
<option key="vect" />
<option key="vect" version_max="6.4"/>
<option key="output" version_min="7.0"/>
</qgisgrassmodule>
@@ -2,11 +2,17 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
<option key="dsn" label="Path to the OGR data source" />
<option key="dsn" label="Path to the OGR data source" version_max="6.4"/>
<option key="input" label="Path to the OGR data source" version_min="7.0"/>
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" 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="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"/>
<flag key="w" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
@@ -2,10 +2,16 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
<file key="dsn" type="directory" label="Path to the OGR data source" />
<file key="dsn" type="directory" label="Path to the OGR data source" version_max="6.4"/>
<file key="input" type="directory" label="Path to the OGR data source" version_min="7.0"/>
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" 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="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"/>
<flag key="w" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
@@ -2,11 +2,17 @@
<!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" />
<file key="dsn" version_max="6.4"/>
<file key="input" version_min="7.0"/>
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" 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="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"/>
<flag key="w" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
@@ -2,11 +2,17 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr">
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" 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="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"/>
<flag key="w" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />

0 comments on commit 2acff9b

Please sign in to comment.
You can’t perform that action at this time.