Skip to content

Commit 1ad2b76

Browse files
blazekblazek
committed
Merge pull request #2285 from PedroVenancio/grass7_plugin
Update and adaptation of some GRASS plugin modules to GRASS 7
2 parents c0a8958 + 781bffa commit 1ad2b76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+190
-83
lines changed

‎src/plugins/grass/modules/db.select.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
77
<option key="driver" />
88
<option key="sql" />
9-
<option key="fs" answer="|" hidden="yes" />
9+
<option key="fs" answer="|" hidden="yes" version_max="6"/>
10+
<option key="separator" answer="|" hidden="yes" version_min="7"/>
1011
</qgisgrassmodule>

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

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@
268268
<grass name="v.surf.bspline"/>
269269
<grass name="v.surf.idw"/>
270270
<grass name="v.surf.rst"/>
271-
<grass name="r.bilinear" version_min="6.4"/>
271+
<grass name="r.bilinear" version_max="6.4"/>
272272
<grass name="r.surf.idw"/>
273-
<grass name="r.surf.idw2"/>
273+
<grass name="r.surf.idw2" version_max="6.4"/>
274274
<grass name="r.fillnulls"/>
275275
<grass name="r.surf.contour"/>
276276
</section>
@@ -281,10 +281,10 @@
281281
</section>
282282
<section label="Statistics">
283283
<grass name="r.stats"/>
284-
<grass name="r.sum"/>
284+
<grass name="r.sum" version_max="6.4"/>
285285
<grass name="r.report"/>
286-
<grass name="r.average"/>
287-
<grass name="r.median"/>
286+
<grass name="r.average" version_max="6.4"/>
287+
<grass name="r.median" version_max="6.4"/>
288288
<grass name="r.mode"/>
289289
<grass name="r.volume"/>
290290
<grass name="r.surf.area"/>
@@ -402,6 +402,7 @@
402402
</section>
403403
<section label="Create points">
404404
<grass name="v.random"/>
405+
<grass name="v.random.3d"/>
405406
<grass name="v.perturb"/>
406407
</section>
407408
<section label="Manage training dataset">
@@ -431,33 +432,36 @@
431432
</section>
432433

433434
<section label="Imagery">
434-
<section label="Develop images and group">
435-
<grass name="i.image.mosaic"/>
435+
<section label="Develop images and group" version_max="6.4">
436+
<grass name="i.image.mosaic" version_max="6.4"/>
436437
</section>
437438
<section label="Manage image colors">
438439
<grass name="i.rgb.his"/>
439440
<grass name="i.his.rgb"/>
440-
<grass name="i.landsat.rgb"/>
441-
<grass name="i.fusion.brovey"/>
441+
<grass name="i.landsat.rgb" version_max="6.4"/>
442+
<grass name="i.colors.enhance" version_min="7.0"/>
443+
<grass name="i.fusion.brovey" version_max="6.4"/>
444+
<grass name="i.pansharpen" version_min="7.0"/>
442445
</section>
443446
<section label="Filter image">
444447
<grass name="i.zc"/>
445448
<grass name="r.mfilter"/>
446449
</section>
447-
<section label="Tassled cap vegetation index">
448-
<grass name="i.tasscap4"/>
449-
<grass name="i.tasscap5"/>
450-
<grass name="i.tasscap7"/>
450+
<section label="Tassled cap vegetation index" version_max="6.4">
451+
<grass name="i.tasscap4" version_max="6.4"/>
452+
<grass name="i.tasscap5" version_max="6.4"/>
453+
<grass name="i.tasscap7" version_max="6.4"/>
451454
</section>
452455
<section label="Transform image">
453456
<grass name="i.fft"/>
454457
<grass name="i.ifft"/>
455458
</section>
456459
<section label="Reports and statistics">
457460
<grass name="r.describe"/>
458-
<grass name="r.bitpattern"/>
461+
<grass name="r.bitpattern" version_max="6.4"/>
462+
<grass name="i.modis.qc" version_min="7.0"/>
459463
<grass name="r.kappa"/>
460-
<grass name="i.oif"/>
464+
<grass name="i.oif" version_max="6.4"/>
461465
</section>
462466
</section>
463467

@@ -545,9 +549,10 @@
545549
<grass name="v.db.update_query"/>
546550
<grass name="v.db.update_op"/>
547551
<grass name="v.db.update_op_query"/>
548-
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
552+
<grass name="v.db.dropcol" version_max="6.4"/>
549553
<grass name="v.db.dropcolumn" version_min="7.0"/>
550-
<grass name="v.db.renamecol"/>
554+
<grass name="v.db.renamecol" version_max="6.4"/>
555+
<grass name="v.db.renamecolumn" version_min="7.0"/>
551556
<grass name="db.execute"/>
552557
<grass name="db.select"/>
553558
<grass name="v.db.select"/>
@@ -559,8 +564,8 @@
559564
</section>
560565
</section>
561566

562-
<section label="3d Visualization">
563-
<grass name="nviz"/>
567+
<section label="3d Visualization" version_max="6.4">
568+
<grass name="nviz" version_max="6.4"/>
564569
</section>
565570
<section label="Convert coordinates">
566571
<grass name="m.cogo"/>

‎src/plugins/grass/modules/i.colors.enhance.1.png

3.82 KB
Loading

‎src/plugins/grass/modules/i.colors.enhance.2.png

2.54 KB
Loading

‎src/plugins/grass/modules/i.colors.enhance.3.png

4.06 KB
Loading

‎src/plugins/grass/modules/i.colors.enhance.qgm

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Auto-balancing of colors for RGB images" module="i.colors.enhance">
5+
<option key="red" />
6+
<option key="green" />
7+
<option key="blue" />
8+
<option key="strength" />
9+
<flag key="f" advanced="yes"/>
10+
<flag key="p" advanced="yes"/>
11+
<flag key="r" advanced="yes"/>
12+
</qgisgrassmodule>

‎src/plugins/grass/modules/i.fft.qgm

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

44
<qgisgrassmodule label="Fast fourier transform for image processing" module="i.fft">
5-
<option key="input_image" />
6-
<option key="real_image" />
7-
<option key="imaginary_image" />
8-
<option key="range" />
5+
<option key="input_image" version_max="6"/>
6+
<option key="input" version_min="7"/>
7+
<option key="real_image" version_max="6"/>
8+
<option key="real" version_min="7"/>
9+
<option key="imaginary_image" version_max="6"/>
10+
<option key="imaginary" version_min="7"/>
11+
<option key="range" version_max="6"/>
912
</qgisgrassmodule>

‎src/plugins/grass/modules/i.his.rgb.qgm

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

44
<qgisgrassmodule label="Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function" module="i.his.rgb">
5-
<option key="hue_input" />
6-
<option key="intensity_input" />
7-
<option key="saturation_input" />
8-
<option key="red_output" />
9-
<option key="green_output" />
10-
<option key="blue_output" />
5+
<option key="hue_input" version_max="6"/>
6+
<option key="hue" version_min="7"/>
7+
<option key="intensity_input" version_max="6"/>
8+
<option key="intensity" version_min="7"/>
9+
<option key="saturation_input" version_max="6"/>
10+
<option key="saturation" version_min="7"/>
11+
<option key="red_output" version_max="6"/>
12+
<option key="red" version_min="7"/>
13+
<option key="green_output" version_max="6"/>
14+
<option key="green" version_min="7"/>
15+
<option key="blue_output" version_max="6"/>
16+
<option key="blue" version_min="7"/>
1117
</qgisgrassmodule>

‎src/plugins/grass/modules/i.ifft.qgm

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

44
<qgisgrassmodule label="Inverse fast fourier transform for image processing" module="i.ifft">
5-
<option key="real_image" />
6-
<option key="imaginary_image" />
7-
<option key="output_image" />
5+
<option key="real_image" version_max="6"/>
6+
<option key="real" version_min="7"/>
7+
<option key="imaginary_image" version_max="6"/>
8+
<option key="imaginary" version_min="7"/>
9+
<option key="output_image" version_max="6"/>
10+
<option key="output" version_min="7"/>
811
</qgisgrassmodule>

‎src/plugins/grass/modules/i.modis.qc.1.png

2.95 KB
Loading

‎src/plugins/grass/modules/i.modis.qc.qgm

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Extracts quality control parameters from MODIS QC layers" module="i.modis.qc">
5+
<option key="input" />
6+
<option key="output" />
7+
<option key="productname" />
8+
<option key="qcname" />
9+
<option key="band" />
10+
</qgisgrassmodule>

‎src/plugins/grass/modules/i.pansharpen.1.png

3.82 KB
Loading

‎src/plugins/grass/modules/i.pansharpen.2.png

2.17 KB
Loading

‎src/plugins/grass/modules/i.pansharpen.3.png

3.73 KB
Loading

‎src/plugins/grass/modules/i.pansharpen.qgm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Image fusion algorithms to sharpen multispectral with high-res panchromatic channels" module="i.pansharpen">
5+
<option key="red" />
6+
<option key="green" />
7+
<option key="blue" />
8+
<option key="pan" />
9+
<option key="output" />
10+
<option key="method" answer="brovey" advanced="yes"/>
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/i.rgb.his.qgm

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

44
<qgisgrassmodule label="Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function" module="i.rgb.his">
5-
<option key="red_input" />
6-
<option key="green_input" />
7-
<option key="blue_input" />
8-
<option key="hue_output" />
9-
<option key="intensity_output" />
10-
<option key="saturation_output" />
5+
<option key="red_input" version_max="6"/>
6+
<option key="red" version_min="7"/>
7+
<option key="green_input" version_max="6"/>
8+
<option key="green" version_min="7"/>
9+
<option key="blue_input" version_max="6"/>
10+
<option key="blue" version_min="7"/>
11+
<option key="hue_output" version_max="6"/>
12+
<option key="hue" version_min="7"/>
13+
<option key="intensity_output" version_max="6"/>
14+
<option key="intensity" version_min="7"/>
15+
<option key="saturation_output" version_max="6"/>
16+
<option key="saturation" version_min="7"/>
1117
</qgisgrassmodule>

‎src/plugins/grass/modules/m.cogo.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
<qgisgrassmodule label="Convert bearing and distance measurements to coordinates and vice versa" module="m.cogo">
55
<file key="input" type="old" />
6-
<option key="coord" />
6+
<option key="coord" version_max="6"/>
7+
<option key="coordinates" version_min="7"/>
78
<flag key="r" />
89
<file key="output" type="new" />
910
</qgisgrassmodule>

‎src/plugins/grass/modules/m.proj.qgm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<flag key="i" />
66
<flag key="o" />
77
<flag key="d" />
8-
<flag key="v" />
8+
<flag key="v" version_max="6"/>
9+
<option key="coordinates" version_min="7"/>
910
<option key="input" />
1011
<option key="output" />
11-
<option key="fs" />
12+
<option key="fs" version_max="6"/>
13+
<option key="separator" version_min="7"/>
1214
<option key="proj_in" />
1315
<option key="proj_out" />
1416
</qgisgrassmodule>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
<qgisgrassmodule label="Display list of category values found in raster" module="r.describe">
55
<flag key="1" />
66
<flag key="r" />
7+
<flag key="n" />
78
<flag key="d" />
89
<flag key="i" />
9-
<flag key="q" />
10+
<flag key="q" version_max="6"/>
1011
<option key="map" />
11-
<option key="nv" />
12+
<option key="nv" version_max="6"/>
13+
<option key="null_value" version_min="7"/>
1214
<option key="nsteps" />
1315
</qgisgrassmodule>

‎src/plugins/grass/modules/r.mask.rast.1.png

2.11 KB
Loading

‎src/plugins/grass/modules/r.mask.rast.2.png

5.66 KB
Loading

‎src/plugins/grass/modules/r.mask.vect.1.png

2.11 KB
Loading

‎src/plugins/grass/modules/r.mask.vect.2.png

5.66 KB
Loading

‎src/plugins/grass/modules/v.clean.chdangles.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Change the type of boundary dangle to line" module="v.clean">
55
<option key="input" typemask="area"/>
66
<option key="tool" answer="chdangle" hidden="yes"/>
7-
<option key="thresh"/>
7+
<option key="thresh" version_max="6"/>
8+
<option key="threshold" version_min="7"/>
89
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.clean.prune.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Remove vertices in threshold from lines and boundaries, boundary is pruned only if topology is not damaged (new intersection, changed attachement of centroid), first and last segment of the boundary is never changed" module="v.clean">
55
<option key="input" typeoption="type"/>
66
<option key="tool" answer="prune" hidden="yes"/>
7-
<option key="thresh"/>
7+
<option key="thresh" version_max="6"/>
8+
<option key="threshold" version_min="7"/>
89
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.clean.rmarea.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Remove small areas, the longest boundary with adjacent area is removed" module="v.clean">
55
<option key="input" typeoption="type"/>
66
<option key="tool" answer="rmarea" hidden="yes"/>
7-
<option key="thresh"/>
7+
<option key="thresh" version_max="6"/>
8+
<option key="threshold" version_min="7"/>
89
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.clean.rmdangles.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Remove dangles" module="v.clean">
55
<option key="input" typeoption="type"/>
66
<option key="tool" answer="rmdangle" hidden="yes"/>
7-
<option key="thresh"/>
7+
<option key="thresh" version_max="6"/>
8+
<option key="threshold" version_min="7"/>
89
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.clean.snap.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Snap lines to vertex in threshold" module="v.clean">
55
<option key="input" typeoption="type"/>
66
<option key="tool" answer="snap" hidden="yes"/>
7-
<option key="thresh"/>
7+
<option key="thresh" version_max="6"/>
8+
<option key="threshold" version_min="7"/>
89
<option key="output"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.join.qgm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<qgisgrassmodule label="Join table to existing vector table" module="v.db.join">
55
<option key="map" layeroption="layer" />
66
<field key="column" layer="map" type="integer,string" label="Attribute field" />
7-
<option key="otable"/>
8-
<option key="ocolumn" label="Attribute field to join" />
7+
<option key="otable" version_max="6"/>
8+
<option key="other_table" version_min="7"/>
9+
<option key="ocolumn" label="Attribute field to join" version_max="6"/>
10+
<option key="other_column" label="Attribute field to join" version_min="7"/>
911
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.renamecolumn.1.png

1.74 KB
Loading

‎src/plugins/grass/modules/v.db.renamecolumn.2.png

1.74 KB
Loading

‎src/plugins/grass/modules/v.db.renamecolumn.qgm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Rename column in attribute table" module="v.db.renamecolumn">
5+
<option key="map" layeroption="layer" />
6+
<option key="column"/>
7+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.select.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<option key="map" layeroption="layer" />
66
<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
77
<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
8-
<option key="fs" answer="|" hidden="yes" />
8+
<option key="fs" answer="|" hidden="yes" version_max="6"/>
9+
<option key="separator" answer="|" hidden="yes" version_min="7"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.select.where.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
77
<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
88
<option key="where" />
9-
<option key="fs" answer="|" hidden="yes" />
9+
<option key="fs" answer="|" hidden="yes" version_max="6"/>
10+
<option key="separator" answer="|" hidden="yes" version_min="7"/>
1011
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.univar.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="Calculate univariate statistics for numeric attributes in a data table" module="v.db.univar">
5-
<option key="table" />
6-
<field key="column" layer="table" type="integer,double" label="Attribute field" />
5+
<option key="table" version_max="6"/>
6+
<option key="map" version_min="7"/>
7+
<field key="column" layer="table" type="integer,double" label="Attribute field" version_max="6"/>
8+
<field key="column" layer="map" type="integer,double" label="Attribute field" version_min="7"/>
79
<flag key="e" answer="no"/>
810
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.update_op.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<qgisgrassmodule label="Assign new value as result of operation on columns to column in attribute table" module="v.db.update">
55
<option key="map" layeroption="layer" />
66
<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
7-
<option key="qcolumn" />
7+
<option key="qcolumn" version_max="6"/>
8+
<option key="query_column" version_min="7"/>
89
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.update_op_query.qgm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<qgisgrassmodule label="Assign new value to column as result of operation on columns only if the result of query is TRUE" module="v.db.update">
55
<option key="map" layeroption="layer" />
66
<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
7-
<option key="qcolumn" />
7+
<option key="qcolumn" version_max="6"/>
8+
<option key="query_column" version_min="7"/>
89
<option key="where"/>
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.drape.qgm

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

44
<qgisgrassmodule label="Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour" module="v.drape">
5-
<option key="input" />
6-
<option key="rast" />
5+
<option key="input" />
6+
<option key="rast" version_max="6"/>
7+
<option key="elevation" version_min="7"/>
78
<option key="method" />
89
<option key="output" />
910
</qgisgrassmodule>

‎src/plugins/grass/modules/v.extrude.attr.qgm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<qgisgrassmodule label="Extrudes flat vector object to 3D with height based on attribute" module="v.extrude">
55
<option key="input" layeroption="layer"/>
66
<option key="elevation" label="Elevation raster for height extraction (optional)"/>
7-
<flag key="t" answer="on" advanced="yes" />
7+
<flag key="t" answer="on" advanced="yes" />
88
<option key="zshift" advanced="yes" />
9-
<field key="hcolumn" layer="input" type="integer,double" />
10-
<option key="output"/>
9+
<field key="hcolumn" layer="input" type="integer,double" version_max="6"/>
10+
<field key="height_column" layer="input" type="integer,double" version_min="7"/>
11+
<option key="output"/>
1112
</qgisgrassmodule>

0 commit comments

Comments
 (0)