Update and adaptation of some GRASS plugin modules to GRASS 7 (db.sel…

…ect.qgm, default.qgc, i.fft.qgm, i.ifft.qgm, r.describe.qgm, v.clean.chdangles.qgm, v.clean.prune.qgm, v.clean.rmarea.qgm, v.clean.rmdangles.qgm, v.clean.snap.qgm, v.db.join.qgm, v.db.select.qgm, v.db.select.where.qgm, v.db.univar.qgm, v.db.update_op.qgm, v.db.update_op_query.qgm, v.surf.rst.qgm, v.type.bl.qgm, v.type.cp.qgm, v.type.lb.qgm, v.type.pc.qgm, i.modis.qc.1.png, i.modis.qc.qgm, v.db.renamecolumn.1.png, v.db.renamecolumn.2.png, v.db.renamecolumn.qgm)
qgis · Sep 2, 2015 · a6b92c6 · a6b92c6
1 parent f4a1396
commit a6b92c6
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 40 deletions.
diff --git a/src/plugins/grass/modules/db.select.qgm b/src/plugins/grass/modules/db.select.qgm
@@ -6,5 +6,6 @@
 	<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
 	<option key="driver" />
 	<option key="sql" />
-	<option key="fs" answer="|" hidden="yes" />
+	<option key="fs" answer="|" hidden="yes" version_max="6"/>
+	<option key="separator" answer="|" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
@@ -284,7 +284,7 @@
                 <grass name="r.sum" version_max="6.4"/>
                 <grass name="r.report"/>
                 <grass name="r.average" version_max="6.4"/>
-                <grass name="r.median"/>
+                <grass name="r.median" version_max="6.4"/>
                 <grass name="r.mode"/>
                 <grass name="r.volume"/>
                 <grass name="r.surf.area"/>
@@ -446,20 +446,21 @@
             <grass name="i.zc"/>
             <grass name="r.mfilter"/>
         </section>
-        <section label="Tassled cap vegetation index">
-            <grass name="i.tasscap4"/>
-            <grass name="i.tasscap5"/>
-            <grass name="i.tasscap7"/>
+        <section label="Tassled cap vegetation index" version_max="6.4">
+            <grass name="i.tasscap4" version_max="6.4"/>
+            <grass name="i.tasscap5" version_max="6.4"/>
+            <grass name="i.tasscap7" version_max="6.4"/>
         </section>
         <section label="Transform image">
             <grass name="i.fft"/>
             <grass name="i.ifft"/>
         </section>
         <section label="Reports and statistics">
             <grass name="r.describe"/>
-            <grass name="r.bitpattern"/>
+            <grass name="r.bitpattern" version_max="6.4"/>
+            <grass name="i.modis.qc" version_min="7.0"/>
             <grass name="r.kappa"/>
-            <grass name="i.oif"/>
+            <grass name="i.oif" version_max="6.4"/>
         </section>
     </section>
 
@@ -547,9 +548,10 @@
             <grass name="v.db.update_query"/>
             <grass name="v.db.update_op"/>
             <grass name="v.db.update_op_query"/>
-            <grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
+            <grass name="v.db.dropcol" version_max="6.4"/>
             <grass name="v.db.dropcolumn" version_min="7.0"/>
-            <grass name="v.db.renamecol"/>
+            <grass name="v.db.renamecol" version_max="6.4"/>
+            <grass name="v.db.renamecolumn" version_min="7.0"/>
             <grass name="db.execute"/>
             <grass name="db.select"/>
             <grass name="v.db.select"/>

diff --git a/src/plugins/grass/modules/i.fft.qgm b/src/plugins/grass/modules/i.fft.qgm
@@ -2,8 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Fast fourier transform for image processing" module="i.fft">
-	<option key="input_image" />
-	<option key="real_image" />
-	<option key="imaginary_image" />
-	<option key="range" />
+	<option key="input_image" version_max="6"/>
+	<option key="input" version_min="7"/>
+	<option key="real_image" version_max="6"/>
+	<option key="real" version_min="7"/>
+	<option key="imaginary_image" version_max="6"/>
+	<option key="imaginary" version_min="7"/>
+	<option key="range" version_max="6"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.ifft.qgm b/src/plugins/grass/modules/i.ifft.qgm
@@ -2,7 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Inverse fast fourier transform for image processing" module="i.ifft">
-	<option key="real_image" />
-	<option key="imaginary_image" />
-	<option key="output_image" />
+	<option key="real_image" version_max="6"/>
+	<option key="real" version_min="7"/>
+	<option key="imaginary_image" version_max="6"/>
+	<option key="imaginary" version_min="7"/>
+	<option key="output_image" version_max="6"/>
+	<option key="output" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.modis.qc.1.png b/src/plugins/grass/modules/i.modis.qc.1.png
diff --git a/src/plugins/grass/modules/i.modis.qc.qgm b/src/plugins/grass/modules/i.modis.qc.qgm
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Extracts quality control parameters from MODIS QC layers" module="i.modis.qc">
+	<option key="input" />
+	<option key="output" />
+	<option key="productname" />
+	<option key="qcname" />
+	<option key="band" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.describe.qgm b/src/plugins/grass/modules/r.describe.qgm
@@ -4,10 +4,12 @@
 <qgisgrassmodule label="Display list of category values found in raster" module="r.describe">
 	<flag key="1" />
 	<flag key="r" />
+	<flag key="n" />
 	<flag key="d" />
 	<flag key="i" />
-	<flag key="q" />
+	<flag key="q" version_max="6"/>
 	<option key="map" />
-	<option key="nv" />
+	<option key="nv" version_max="6"/>
+	<option key="null_value" version_min="7"/>
 	<option key="nsteps" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.chdangles.qgm b/src/plugins/grass/modules/v.clean.chdangles.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Change the type of boundary dangle to line" module="v.clean">
 	<option key="input" typemask="area"/>
 	<option key="tool" answer="chdangle" hidden="yes"/>
-	<option key="thresh"/>
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.prune.qgm b/src/plugins/grass/modules/v.clean.prune.qgm
@@ -4,6 +4,7 @@
 <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">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="prune" hidden="yes"/>
-	<option key="thresh"/>
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.rmarea.qgm b/src/plugins/grass/modules/v.clean.rmarea.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Remove small areas, the longest boundary with adjacent area is removed" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="rmarea" hidden="yes"/>
-	<option key="thresh"/>
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.rmdangles.qgm b/src/plugins/grass/modules/v.clean.rmdangles.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Remove dangles" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="rmdangle" hidden="yes"/>
-	<option key="thresh"/>
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.clean.snap.qgm b/src/plugins/grass/modules/v.clean.snap.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Snap lines to vertex in threshold" module="v.clean">
 	<option key="input" typeoption="type"/>
 	<option key="tool" answer="snap" hidden="yes"/>
-	<option key="thresh"/>
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.join.qgm b/src/plugins/grass/modules/v.db.join.qgm
@@ -4,6 +4,8 @@
 <qgisgrassmodule label="Join table to existing vector table" module="v.db.join">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,string" label="Attribute field" />
-	<option key="otable"/>
-	<option key="ocolumn" label="Attribute field to join" />
+	<option key="otable" version_max="6"/>
+	<option key="other_table" version_min="7"/>
+	<option key="ocolumn" label="Attribute field to join" version_max="6"/>
+	<option key="other_column" label="Attribute field to join" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.renamecolumn.1.png b/src/plugins/grass/modules/v.db.renamecolumn.1.png
diff --git a/src/plugins/grass/modules/v.db.renamecolumn.2.png b/src/plugins/grass/modules/v.db.renamecolumn.2.png
diff --git a/src/plugins/grass/modules/v.db.renamecolumn.qgm b/src/plugins/grass/modules/v.db.renamecolumn.qgm
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Rename column in attribute table" module="v.db.renamecolumn">
+	<option key="map" layeroption="layer" />
+	<option key="column"/>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.qgm b/src/plugins/grass/modules/v.db.select.qgm
@@ -5,5 +5,6 @@
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
 	<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
-	<option key="fs" answer="|" hidden="yes" />
+	<option key="fs" answer="|" hidden="yes" version_max="6"/>
+	<option key="separator" answer="|" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.where.qgm b/src/plugins/grass/modules/v.db.select.where.qgm
@@ -6,5 +6,6 @@
 	<field key="column" layer="map" type="integer,double,varchar" version_max="6.3"/>
 	<field key="columns" layer="map" type="integer,double,varchar" version_min="6.4"/>
 	<option key="where" />
-	<option key="fs" answer="|" hidden="yes" />
+	<option key="fs" answer="|" hidden="yes" version_max="6"/>
+	<option key="separator" answer="|" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.univar.qgm b/src/plugins/grass/modules/v.db.univar.qgm
@@ -2,7 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Calculate univariate statistics for numeric attributes in a data table" module="v.db.univar">
-	<option key="table" />
-	<field key="column" layer="table" type="integer,double" label="Attribute field" />
+	<option key="table" version_max="6"/>
+	<option key="map" version_min="7"/>
+	<field key="column" layer="table" type="integer,double" label="Attribute field" version_max="6"/>
+	<field key="column" layer="map" type="integer,double" label="Attribute field" version_min="7"/>
 	<flag key="e" answer="no"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op.qgm b/src/plugins/grass/modules/v.db.update_op.qgm
@@ -4,5 +4,6 @@
 <qgisgrassmodule label="Assign new value as result of operation on columns to column in attribute table" module="v.db.update">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<option key="qcolumn" />
+	<option key="qcolumn" version_max="6"/>
+	<option key="query_column" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.update_op_query.qgm b/src/plugins/grass/modules/v.db.update_op_query.qgm
@@ -4,6 +4,7 @@
 <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">
 	<option key="map" layeroption="layer" />
 	<field key="column" layer="map" type="integer,double,varchar,string" label="Attribute field" />
-	<option key="qcolumn" />
+	<option key="qcolumn" version_max="6"/>
+	<option key="query_column" version_min="7"/>
 	<option key="where"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.surf.rst.qgm b/src/plugins/grass/modules/v.surf.rst.qgm
@@ -8,6 +8,8 @@
 	<!--option key="smooth" /-->
 	<option key="elev" version_max="6"/>
 	<option key="elevation" version_min="7"/>
+		<option key="segmax" advanced="yes" />
+		<option key="npmin" advanced="yes" />
 		<option key="dmin" advanced="yes" />
 		<option key="dmax" advanced="yes" />
         <option key="where" advanced="yes" />
@@ -28,10 +30,8 @@
         <option key="overwin" advanced="yes" version_min="7"/>
         <option key="scolumn" advanced="yes" version_max="6"/>
         <option key="smooth_column" advanced="yes" version_min="7"/>
-	<option key="segmax" hidden="yes" />
-	<option key="npmin" hidden="yes" />
     <option key="zmult" hidden="yes" version_max="6"/>
     <option key="zscale" hidden="yes" version_min="7"/>
-    <option key="theta" hidden="yes" />
-    <option key="scalex" hidden="yes" />
+		<option key="theta" advanced="yes"/>
+		<option key="scalex" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.bl.qgm b/src/plugins/grass/modules/v.type.bl.qgm
@@ -4,5 +4,7 @@
 <qgisgrassmodule label="Convert boundaries to lines" module="v.type">
 	<option key="input" typemask="area"/>
 	<option key="output"/>
-	<option key="type" answer="boundary,line" hidden="yes" />
+	<option key="type" answer="boundary,line" hidden="yes" version_max="6"/>
+	<option key="from_type" answer="boundary" hidden="yes" version_min="7"/>
+	<option key="to_type" answer="line" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.cp.qgm b/src/plugins/grass/modules/v.type.cp.qgm
@@ -4,5 +4,7 @@
 <qgisgrassmodule label="Convert centroids to points" module="v.type">
 	<option key="input" typemask="area"/>
 	<option key="output"/>
-	<option key="type" answer="centroid,point" hidden="yes" />
+	<option key="type" answer="centroid,point" hidden="yes" version_max="6"/>
+	<option key="from_type" answer="centroid" hidden="yes" version_min="7"/>
+	<option key="to_type" answer="point" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.lb.qgm b/src/plugins/grass/modules/v.type.lb.qgm
@@ -4,5 +4,7 @@
 <qgisgrassmodule label="Convert lines to boundaries" module="v.type">
 	<option key="input" typemask="line"/>
 	<option key="output"/>
-	<option key="type" answer="line,boundary" hidden="yes" />
+	<option key="type" answer="line,boundary" hidden="yes" version_max="6"/>
+	<option key="from_type" answer="line" hidden="yes" version_min="7"/>
+	<option key="to_type" answer="boundary" hidden="yes" version_min="7"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.type.pc.qgm b/src/plugins/grass/modules/v.type.pc.qgm
@@ -4,5 +4,7 @@
 <qgisgrassmodule label="Convert points to centroids" module="v.type">
 	<option key="input" typemask="point"/>
 	<option key="output"/>
-	<option key="type" answer="point,centroid" hidden="yes" />
+	<option key="type" answer="point,centroid" hidden="yes" version_max="6"/>
+	<option key="from_type" answer="point" hidden="yes" version_min="7"/>
+	<option key="to_type" answer="centroid" hidden="yes" version_min="7"/>
 </qgisgrassmodule>