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)
qgis · Aug 31, 2015 · f4a1396 · f4a1396
1 parent 5326c6b
commit f4a1396
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 23 deletions.
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
@@ -268,9 +268,9 @@
                 <grass name="v.surf.bspline"/>
                 <grass name="v.surf.idw"/>
                 <grass name="v.surf.rst"/>
-                <grass name="r.bilinear" version_min="6.4"/>
+                <grass name="r.bilinear" version_max="6.4"/>
                 <grass name="r.surf.idw"/>
-                <grass name="r.surf.idw2"/>
+                <grass name="r.surf.idw2" version_max="6.4"/>
                 <grass name="r.fillnulls"/>
                 <grass name="r.surf.contour"/>
             </section>
@@ -281,9 +281,9 @@
             </section>
             <section label="Statistics">
                 <grass name="r.stats"/>
-                <grass name="r.sum"/>
+                <grass name="r.sum" version_max="6.4"/>
                 <grass name="r.report"/>
-                <grass name="r.average"/>
+                <grass name="r.average" version_max="6.4"/>
                 <grass name="r.median"/>
                 <grass name="r.mode"/>
                 <grass name="r.volume"/>
@@ -431,14 +431,16 @@
     </section>
 
     <section label="Imagery">
-        <section label="Develop images and group">
-            <grass name="i.image.mosaic"/>
+        <section label="Develop images and group" version_max="6.4">
+            <grass name="i.image.mosaic" version_max="6.4"/>
         </section>
         <section label="Manage image colors">
             <grass name="i.rgb.his"/>
             <grass name="i.his.rgb"/>
-            <grass name="i.landsat.rgb"/>
-            <grass name="i.fusion.brovey"/>
+            <grass name="i.landsat.rgb" version_max="6.4"/>
+            <grass name="i.colors.enhance" version_min="7.0"/>
+            <grass name="i.fusion.brovey" version_max="6.4"/>
+            <grass name="i.pansharpen" version_min="7.0"/>
         </section>
         <section label="Filter image">
             <grass name="i.zc"/>

diff --git a/src/plugins/grass/modules/i.colors.enhance.1.png b/src/plugins/grass/modules/i.colors.enhance.1.png
diff --git a/src/plugins/grass/modules/i.colors.enhance.2.png b/src/plugins/grass/modules/i.colors.enhance.2.png
diff --git a/src/plugins/grass/modules/i.colors.enhance.3.png b/src/plugins/grass/modules/i.colors.enhance.3.png
diff --git a/src/plugins/grass/modules/i.colors.enhance.qgm b/src/plugins/grass/modules/i.colors.enhance.qgm
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Auto-balancing of colors for RGB images" module="i.colors.enhance">
+	<option key="red" />
+	<option key="green" />
+	<option key="blue" />
+	<option key="strength" />
+	<flag key="f" advanced="yes"/>
+	<flag key="p" advanced="yes"/>
+	<flag key="r" advanced="yes"/>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.his.rgb.qgm b/src/plugins/grass/modules/i.his.rgb.qgm
@@ -2,10 +2,16 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function" module="i.his.rgb">
-	<option key="hue_input" />
-	<option key="intensity_input" />
-	<option key="saturation_input" />
-	<option key="red_output" />
-	<option key="green_output" />
-	<option key="blue_output" />
+	<option key="hue_input" version_max="6"/>
+	<option key="hue" version_min="7"/>
+	<option key="intensity_input" version_max="6"/>
+	<option key="intensity" version_min="7"/>
+	<option key="saturation_input" version_max="6"/>
+	<option key="saturation" version_min="7"/>
+	<option key="red_output" version_max="6"/>
+	<option key="red" version_min="7"/>
+	<option key="green_output" version_max="6"/>
+	<option key="green" version_min="7"/>
+	<option key="blue_output" version_max="6"/>
+	<option key="blue" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.pansharpen.1.png b/src/plugins/grass/modules/i.pansharpen.1.png
diff --git a/src/plugins/grass/modules/i.pansharpen.2.png b/src/plugins/grass/modules/i.pansharpen.2.png
diff --git a/src/plugins/grass/modules/i.pansharpen.3.png b/src/plugins/grass/modules/i.pansharpen.3.png
diff --git a/src/plugins/grass/modules/i.pansharpen.qgm b/src/plugins/grass/modules/i.pansharpen.qgm
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Image fusion algorithms to sharpen multispectral with high-res panchromatic channels" module="i.pansharpen">
+	<option key="red" />
+	<option key="green" />
+	<option key="blue" />
+	<option key="pan" />
+	<option key="output" />
+	<option key="method" answer="brovey" advanced="yes"/>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.rgb.his.qgm b/src/plugins/grass/modules/i.rgb.his.qgm
@@ -2,10 +2,16 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function" module="i.rgb.his">
-	<option key="red_input" />
-	<option key="green_input" />
-	<option key="blue_input" />
-	<option key="hue_output" />
-	<option key="intensity_output" />
-	<option key="saturation_output" />
+	<option key="red_input" version_max="6"/>
+	<option key="red" version_min="7"/>
+	<option key="green_input" version_max="6"/>
+	<option key="green" version_min="7"/>
+	<option key="blue_input" version_max="6"/>
+	<option key="blue" version_min="7"/>
+	<option key="hue_output" version_max="6"/>
+	<option key="hue" version_min="7"/>
+	<option key="intensity_output" version_max="6"/>
+	<option key="intensity" version_min="7"/>
+	<option key="saturation_output" version_max="6"/>
+	<option key="saturation" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/m.cogo.qgm b/src/plugins/grass/modules/m.cogo.qgm
@@ -3,7 +3,8 @@
 
 <qgisgrassmodule label="Convert bearing and distance measurements to coordinates and vice versa" module="m.cogo">
 	<file key="input" type="old" />
-	<option key="coord" />
+	<option key="coord" version_max="6"/>
+	<option key="coordinates" version_min="7"/>
 	<flag key="r" />
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/m.proj.qgm b/src/plugins/grass/modules/m.proj.qgm
@@ -5,10 +5,12 @@
 	<flag key="i" />
 	<flag key="o" />
 	<flag key="d" />
-	<flag key="v" />
+	<flag key="v" version_max="6"/>
+	<option key="coordinates" version_min="7"/>
 	<option key="input" />
 	<option key="output" />
-	<option key="fs" />
+	<option key="fs" version_max="6"/>
+	<option key="separator" version_min="7"/>
 	<option key="proj_in" />
 	<option key="proj_out" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.mask.rast.1.png b/src/plugins/grass/modules/r.mask.rast.1.png
diff --git a/src/plugins/grass/modules/r.mask.rast.2.png b/src/plugins/grass/modules/r.mask.rast.2.png
diff --git a/src/plugins/grass/modules/r.mask.vect.1.png b/src/plugins/grass/modules/r.mask.vect.1.png
diff --git a/src/plugins/grass/modules/r.mask.vect.2.png b/src/plugins/grass/modules/r.mask.vect.2.png