Skip to content

Commit f4a1396

Browse files
PedroVenancioPedroVenancio
committed
Update and adaptation of GRASS plugin modules to GRASS 7 (default.qgc, i.colors.enhance.1.png, i.colors.enhance.2.png, i.colors.enhance.3.png, i.colors.enhance.qgm, i.his.rgb.qgm, i.pansharpen.1.png, i.pansharpen.2.png, i.pansharpen.3.png, i.pansharpen.qgm, i.rgb.his.qgm, m.cogo.qgm, m.proj.qgm, r.mask.rast.1.png, r.mask.rast.2.png, r.mask.vect.1.png, r.mask.vect.2.png)
1 parent 5326c6b commit f4a1396

17 files changed

+63
-23
lines changed

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

Lines changed: 10 additions & 8 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,9 +281,9 @@
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"/>
286+
<grass name="r.average" version_max="6.4"/>
287287
<grass name="r.median"/>
288288
<grass name="r.mode"/>
289289
<grass name="r.volume"/>
@@ -431,14 +431,16 @@
431431
</section>
432432

433433
<section label="Imagery">
434-
<section label="Develop images and group">
435-
<grass name="i.image.mosaic"/>
434+
<section label="Develop images and group" version_max="6.4">
435+
<grass name="i.image.mosaic" version_max="6.4"/>
436436
</section>
437437
<section label="Manage image colors">
438438
<grass name="i.rgb.his"/>
439439
<grass name="i.his.rgb"/>
440-
<grass name="i.landsat.rgb"/>
441-
<grass name="i.fusion.brovey"/>
440+
<grass name="i.landsat.rgb" version_max="6.4"/>
441+
<grass name="i.colors.enhance" version_min="7.0"/>
442+
<grass name="i.fusion.brovey" version_max="6.4"/>
443+
<grass name="i.pansharpen" version_min="7.0"/>
442444
</section>
443445
<section label="Filter image">
444446
<grass name="i.zc"/>

‎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.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.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.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

0 commit comments

Comments
 (0)