Skip to content

Commit 5bbb593

Browse files
pcavpcav
committed
Cleanup and improvements to r.external, r.in.gdal, and v.in.ogr GRASS modules
1 parent 3906922 commit 5bbb593

13 files changed

+41
-34
lines changed

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
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">
4-
<flag key="o"/>
5-
<flag key="e"/>
6-
<flag key="r"/>
74
<file key="input" type="directory" label="Directory of rasters to be linked"/>
8-
<option key="band"/>
5+
<option key="title" advanced="yes"/>
6+
<option key="band" advanced="yes"/>
7+
<flag key="r" advanced="yes"/>
8+
<flag key="o" advanced="yes"/>
9+
<flag key="e" advanced="yes"/>
910
</qgisgrassmodule>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
33
<qgisgrassmodule label="Link GDAL supported raster loaded in QGIS as GRASS raster" module="r.external">
4-
<flag key="o"/>
5-
<flag key="e"/>
64
<gdal key="source" label="GDAL raster layer"/>
75
<option key="output"/>
8-
<option key="band"/>
9-
<option key="title"/>
6+
<option key="title" advanced="yes"/>
7+
<option key="band" advanced="yes"/>
8+
<flag key="o" advanced="yes"/>
9+
<flag key="e" advanced="yes"/>
1010
</qgisgrassmodule>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
33
<qgisgrassmodule label="Link GDAL supported raster as GRASS raster" module="r.external">
4-
<flag key="o"/>
5-
<flag key="e"/>
64
<file key="input"/>
75
<option key="output"/>
8-
<option key="band"/>
9-
<option key="title"/>
6+
<option key="title" advanced="yes"/>
7+
<option key="band" advanced="yes"/>
8+
<flag key="o" advanced="yes"/>
9+
<flag key="e" advanced="yes"/>
1010
</qgisgrassmodule>

‎src/plugins/grass/modules/r.in.gdal.loc.qgm

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import GDAL supported raster and create a fitted location" module="r.in.gdal">
5-
<flag key="o" answer="off" hidden="yes" />
6-
<flag key="e" answer="on" hidden="yes" />
75
<file key="input" />
86
<option key="output" />
97
<option key="location" />
8+
<option key="title" advanced="yes"/>
9+
<option key="band" advanced="yes"/>
10+
<flag key="o" advanced="yes"/>
1011
</qgisgrassmodule>

‎src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import loaded raster and create a fitted location" module="r.in.gdal">
5-
<flag key="o" answer="off" hidden="yes" />
6-
<flag key="e" answer="on" hidden="yes" />
7-
<gdal key="input" label="GDAL raster layer" />
8-
<option key="output" />
5+
<gdal key="input" label="Loaded layer"/>
6+
<option key="output" />
97
<option key="location" />
8+
<option key="title" advanced="yes"/>
9+
<option key="band" advanced="yes"/>
10+
<flag key="o" advanced="yes"/>
1011
</qgisgrassmodule>

‎src/plugins/grass/modules/r.in.gdal.qgis.qgm

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import loaded raster" module="r.in.gdal">
5-
<flag key="o" answer="on" hidden="yes" />
6-
<flag key="e" answer="off" hidden="yes" />
7-
<gdal key="input" label="GDAL raster layer" />
5+
<gdal key="input" label="Loaded layer"/>
86
<option key="output" />
7+
<option key="title" advanced="yes"/>
8+
<option key="band" advanced="yes"/>
9+
<flag key="o" advanced="yes"/>
10+
<flag key="e" advanced="yes"/>
911
</qgisgrassmodule>

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import GDAL supported raster" module="r.in.gdal">
5-
<flag key="o" answer="on" hidden="yes" />
6-
<flag key="e" answer="off" hidden="yes" />
75
<file key="input" />
86
<option key="output" />
7+
<option key="title" advanced="yes"/>
8+
<option key="band" advanced="yes"/>
9+
<flag key="o" advanced="yes"/>
10+
<flag key="e" advanced="yes"/>
911
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.all.loc.qgm

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

44
<qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
5-
<flag key="o" answer="off" hidden="yes" />
65
<option key="dsn" label="Path to the OGR data source" />
76
<option key="output" />
87
<option key="location" />
@@ -11,4 +10,5 @@
1110
<flag key="e" answer="off" hidden="no" advanced="yes"/>
1211
<option key="snap" advanced="yes" />
1312
<option key="min_area" advanced="yes" />
13+
<flag key="o" answer="on" advanced="yes" />
1414
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.all.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
5-
<flag key="o" answer="on" hidden="yes" />
65
<file key="dsn" type="directory" label="Path to the OGR data source" />
76
<option key="output" />
87
<option key="type" advanced="yes"/>
98
<flag key="z" answer="off" hidden="no" advanced="yes"/>
109
<flag key="e" answer="off" hidden="no" advanced="yes"/>
1110
<option key="snap" advanced="yes" />
1211
<option key="min_area" advanced="yes" />
12+
<flag key="o" answer="on" advanced="yes" />
1313
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.loc.qgm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Import OGR/PostGIS vector and create a fitted location" module="v.in.ogr">
5-
<flag key="o" answer="off" hidden="yes" />
6-
<file key="dsn" type="old" label="OGR file" />
4+
<qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
5+
<file key="dsn" />
76
<option key="output" />
87
<option key="location" />
98
<option key="type" advanced="yes"/>
@@ -12,4 +11,5 @@
1211
<option key="snap" advanced="yes" />
1312
<option key="min_area" advanced="yes" />
1413
<option key="where" advanced="yes"/>
14+
<flag key="o" answer="on" advanced="yes" />
1515
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr">
5-
<flag key="o" answer="off" hidden="yes" />
6-
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
5+
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
76
<option key="output" />
87
<option key="location" />
98
<option key="type" advanced="yes"/>
@@ -12,4 +11,5 @@
1211
<option key="snap" advanced="yes" />
1312
<option key="min_area" advanced="yes" />
1413
<option key="where" advanced="yes"/>
14+
<flag key="o" answer="on" advanced="yes" />
1515
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.qgis.qgm

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
5-
<flag key="o" answer="on" hidden="yes" />
6-
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
5+
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
76
<option key="output" />
87
<option key="type" advanced="yes"/>
98
<flag key="z" answer="off" hidden="no" advanced="yes" />
109
<flag key="e" answer="off" hidden="no" advanced="yes" />
1110
<option key="snap" advanced="yes" />
1211
<option key="min_area" advanced="yes" />
1312
<option key="where" advanced="yes"/>
13+
<flag key="o" answer="on" advanced="yes" />
1414
</qgisgrassmodule>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Import OGR vector" module="v.in.ogr">
5-
<flag key="o" answer="on" hidden="yes" />
6-
<file key="dsn" type="old" label="OGR file" />
5+
<file key="dsn" />
76
<option key="output" />
87
<option key="type" advanced="yes"/>
98
<flag key="z" answer="off" hidden="no" advanced="yes"/>
109
<flag key="e" answer="off" hidden="no" advanced="yes"/>
1110
<option key="snap" advanced="yes" />
1211
<option key="min_area" advanced="yes" />
1312
<option key="where" advanced="yes"/>
13+
<flag key="o" answer="on" advanced="yes" />
1414
</qgisgrassmodule>

0 commit comments

Comments
 (0)