Skip to content

Commit 2acff9b

Browse files
blazekblazek
committed
Merge pull request #2264 from NINAnor/grass7_pluginupdate
Grass7 pluginupdate - File management
2 parents d594a56 + 20f0a5a commit 2acff9b

35 files changed

+156
-71
lines changed

‎src/plugins/grass/modules/db.in.ogr.qgm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

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

‎src/plugins/grass/modules/db.out.ogr.qgm‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
55
<option key="input" />
6-
<file key="dsn" type="new" />
6+
<file key="dsn" type="new" version_max="6.4"/>
7+
<file key="output" type="new" version_max="7.0"/>
78
<option key="format" />
8-
<option key="db_table" />
9+
<option key="db_table" version_max="6.4"/>
10+
<option key="table" version_min="7.0"/>
911
</qgisgrassmodule>

‎src/plugins/grass/modules/default.qgc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<grass name="r.in.ascii"/>
4242
<grass name="r.in.poly"/>
4343
<grass name="r.in.bin"/>
44-
<grass name="r.in.arc"/>
44+
<grass name="r.in.arc" version_max="6.4"/>
4545
<grass name="r.in.gridatb"/>
4646
<grass name="r.in.mat"/>
4747
<grass name="i.in.spotvgt"/>
@@ -61,10 +61,10 @@
6161
<grass name="v.in.ascii"/>
6262
<grass name="v.in.mapgen"/>
6363
<grass name="v.in.db"/>
64-
<grass name="v.in.garmin"/>
65-
<grass name="v.in.gpsbabel"/>
64+
<grass name="v.in.garmin" version_max="6.4"/>
65+
<grass name="v.in.gpsbabel" version_max="6.4"/>
6666
<grass name="v.in.geonames" version_min="6.4"/>
67-
<grass name="v.in.gns"/>
67+
<grass name="v.in.gns" version_max="6.4"/>
6868
</section>
6969
<section label="Import from database into GRASS">
7070
<grass name="db.in.ogr"/>
@@ -76,7 +76,7 @@
7676
<grass name="r.out.gdal"/>
7777
<grass name="r.out.ascii"/>
7878
<grass name="r.out.xyz"/>
79-
<grass name="r.out.arc"/>
79+
<grass name="r.out.arc" version_max="6.4"/>
8080
<grass name="r.out.gridatb"/>
8181
<grass name="r.out.mat"/>
8282
<grass name="r.out.bin"/>
@@ -85,7 +85,7 @@
8585
<grass name="r.out.ppm"/>
8686
<grass name="r.out.ppm3"/>
8787
<grass name="r.out.pov"/>
88-
<grass name="r.out.tiff"/>
88+
<grass name="r.out.tiff" version_max="6.4"/>
8989
<grass name="r.out.vrml"/>
9090
<grass name="r.out.vtk"/>
9191
</section>

‎src/plugins/grass/modules/g.region.multiple.raster.qgm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
5-
<file key="rast" label="Type in map names separated by a comma" />
5+
<file key="rast" label="Type in map names separated by a comma" version_max="6.4"/>
6+
<file key="raster" label="Type in map names separated by a comma" version_min="7.0"/>
67
</qgisgrassmodule>

‎src/plugins/grass/modules/g.region.multiple.vector.qgm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
5-
<file key="vect" label="Type in map names separated by a comma" />
5+
<file key="vect" label="Type in map names separated by a comma" version_max="6.4"/>
6+
<file key="vector" label="Type in map names separated by a comma" version_min="7.0"/>
67
</qgisgrassmodule>

‎src/plugins/grass/modules/i.in.spotvgt.qgm‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import SPOT VGT NDVI" module="i.in.spotvgt">
5-
<file key="file" type="new" />
5+
<file key="file" type="new" version_max="6.4"/>
6+
<file key="input" version_min="7.0"/>
67
<flag key="a" />
7-
<option key="rast" />
8+
<option key="rast" version_max="6.4"/>
9+
<option key="output" version_min="7.0"/>
810
</qgisgrassmodule>

‎src/plugins/grass/modules/r.external.all.qgm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
33
<qgisgrassmodule label="Link all GDAL supported rasters in a directory as GRASS rasters" module="r.external.all.py" manual="r.external">
44
<file key="input" type="directory" label="Directory of rasters to be linked"/>
5-
<option key="title" advanced="yes"/>
65
<option key="band" advanced="yes"/>
76
<flag key="r" advanced="yes"/>
87
<flag key="o" advanced="yes"/>

‎src/plugins/grass/modules/r.in.ascii.qgm‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33

44
<qgisgrassmodule label="Import ASCII raster" module="r.in.ascii">
55
<file key="input" type="old" />
6-
<option key="mult" />
7-
<option key="nv" />
8-
<flag key="i" />
9-
<flag key="f" />
10-
<flag key="d" />
6+
<option key="mult" version_max="6.4" />
7+
<option key="multiplier" version_min="7.0" />
8+
<option key="nv" version_max="6.4" />
9+
<option key="null_value" version_min="7.0" />
10+
<option key="type" version_min="7.0" />
11+
<flag key="i" version_max="6.4" />
12+
<flag key="f" version_max="6.4" />
13+
<flag key="d" version_max="6.4" />
1114
<flag key="s" />
1215
<option key="output" />
1316
</qgisgrassmodule>

‎src/plugins/grass/modules/r.in.wms.qgm‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,29 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Download and import data from WMS server" module="r.in.wms">
5-
<option key="mapserver" />
5+
<option key="mapserver" version_max="6.4"/>
6+
<option key="url" version_min="7.0"/>
67
<option key="layers" />
78
<option key="srs" />
89
<option key="format" />
9-
<option key="wmsquery" />
10-
<flag key="d" answer="off" />
10+
<option key="wms_version" version_min="7.0"/>
11+
<option key="wmsquery" version_max="6.4"/>
12+
<flag key="d" answer="off" version_max="6.4"/>
1113
<flag key="c" answer="off" />
12-
<option key="folder" />
13-
<option key="wgetoptions" />
14-
<option key="curloptions" />
15-
<flag key="k" answer="off" />
16-
<flag key="p" answer="off" />
14+
<option key="folder" version_max="6.4"/>
15+
<option key="wgetoptions" version_max="6.4"/>
16+
<option key="curloptions" version_max="6.4"/>
17+
<flag key="k" answer="off" version_max="6.4"/>
18+
<flag key="o" answer="off"/>
19+
<flag key="p" answer="off" version_max="6.4"/>
1720
<option key="method" />
1821
<option key="output" />
22+
<option key="maxcols" advanced="yes" version_min="7.0"/>
23+
<option key="maxrows" advanced="yes" version_min="7.0"/>
24+
<option key="username" advanced="yes" version_min="7.0"/>
25+
<option key="password" advanced="yes" version_min="7.0"/>
26+
<option key="method" advanced="yes" version_min="7.0"/>
27+
<option key="region" advanced="yes" version_min="7.0"/>
28+
<option key="bgcolor" advanced="yes" version_min="7.0"/>
29+
<option key="urlparams" advanced="yes" version_min="7.0"/>
1930
</qgisgrassmodule>

‎src/plugins/grass/modules/r.in.xyz.qgm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<file key="input" type="old" filters="TXT (*.txt), CSV (*.csv)"/>
66
<option key="method" />
77
<option key="type" />
8-
<option key="fs" />
8+
<option key="fs" version_max="6.4" />
9+
<option key="separator" version_min="7.0" />
910
<option key="x" />
1011
<option key="y" />
1112
<option key="z" />

0 commit comments

Comments
 (0)