Update and adaptation of some GRASS plugin modules to GRASS 7 (defaul…

…t.qgc, v.drape.qgm, v.extrude.attr.qgm, v.generalize.qgm, v.random.1.png, v.random.3d.1.png, v.random.3d.qgm, v.random.qgm, v.segment.qgm, v.support.qgm, v.to.points.qgm)
qgis · Sep 3, 2015 · 781bffa · 781bffa
1 parent a6b92c6
commit 781bffa
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 20 deletions.
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
@@ -402,6 +402,7 @@
             </section>
             <section label="Create points">
                 <grass name="v.random"/>
+                <grass name="v.random.3d"/>
                 <grass name="v.perturb"/>
             </section>
             <section label="Manage training dataset">
@@ -563,8 +564,8 @@
         </section>
     </section>
 
-    <section label="3d Visualization">
-        <grass name="nviz"/>
+    <section label="3d Visualization" version_max="6.4">
+        <grass name="nviz" version_max="6.4"/>
     </section>
     <section label="Convert coordinates">
         <grass name="m.cogo"/>

diff --git a/src/plugins/grass/modules/v.drape.qgm b/src/plugins/grass/modules/v.drape.qgm
@@ -2,8 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour" module="v.drape">
-        <option key="input" />
-	<option key="rast" />
+    <option key="input" />
+	<option key="rast" version_max="6"/>
+	<option key="elevation" version_min="7"/>
 	<option key="method" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.extrude.attr.qgm b/src/plugins/grass/modules/v.extrude.attr.qgm
@@ -4,8 +4,9 @@
 <qgisgrassmodule label="Extrudes flat vector object to 3D with height based on attribute" module="v.extrude">
 	<option key="input" layeroption="layer"/>
 	<option key="elevation" label="Elevation raster for height extraction (optional)"/>
-        <flag key="t" answer="on" advanced="yes" />
+    <flag key="t" answer="on" advanced="yes" />
 	<option key="zshift" advanced="yes" />
-        <field key="hcolumn" layer="input" type="integer,double" />
-        <option key="output"/>
+    <field key="hcolumn" layer="input" type="integer,double" version_max="6"/>
+    <field key="height_column" layer="input" type="integer,double" version_min="7"/>
+    <option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.generalize.qgm b/src/plugins/grass/modules/v.generalize.qgm
@@ -3,7 +3,7 @@
 
 <qgisgrassmodule label="Simplify vector" module="v.generalize">
 	<option key="input" typeoption="type" layeroption="layer" />
-        <flag key="c" answer="on" hidden="yes" />
+        <flag key="c" answer="on" hidden="yes" version_max="6"/>
 	<option key="type" label="Feature type (for polygons, choose Boundary)"/>
 	<option key="method" />
 	<option key="threshold" answer="1.0" label="Maximal tolerance value (higher value=more simplification)" />

diff --git a/src/plugins/grass/modules/v.random.1.png b/src/plugins/grass/modules/v.random.1.png
diff --git a/src/plugins/grass/modules/v.random.3d.1.png b/src/plugins/grass/modules/v.random.3d.1.png
diff --git a/src/plugins/grass/modules/v.random.3d.qgm b/src/plugins/grass/modules/v.random.3d.qgm
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Create random 3D vector points" module="v.random">
+	<flag key="z" answer="yes" hidden="yes"/>
+	<option key="n" version_max="6"/>
+	<option key="npoints" version_min="7"/>
+    <option key="column" answer="zvalue" hidden="yes"/>
+        <option key="column_type" advanced="yes" version_min="7"/>
+		<option key="zmin" advanced="yes"/>
+		<option key="zmax" advanced="yes"/>
+	<option key="output" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.random.qgm b/src/plugins/grass/modules/v.random.qgm
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
-<qgisgrassmodule label="Create random 2D/3D vector points" module="v.random">
+<qgisgrassmodule label="Create random 2D vector points" module="v.random">
 	<option key="n" version_max="6"/>
 	<option key="npoints" version_min="7"/>
-        <option key="column" advanced="yes"/>
-        <option key="column_type" advanced="yes" version_min="7"/>
-		<option key="zmin" advanced="yes"/>
-		<option key="zmax" advanced="yes"/>
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.segment.qgm b/src/plugins/grass/modules/v.segment.qgm
@@ -2,7 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create points/segments from input vector lines and positions" module="v.segment">
-	<option key="input" layeroption="llayer" typemask="line,boundary"/>
-	<file key="file" type="old" filters="Txt (*.txt), Csv (*.csv)" />
+	<option key="input" layeroption="llayer" typemask="line,boundary" version_max="6"/>
+	<option key="input" layeroption="layer" typemask="line,boundary" version_min="7"/>
+	<file key="file" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_max="6"/>
+	<file key="rules" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_min="7"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.support.qgm b/src/plugins/grass/modules/v.support.qgm
@@ -10,7 +10,8 @@
 	<option key="map_date" />
 	<option key="scale" />
 	<option key="zone" />
-	<option key="thresh" />
+	<option key="thresh" version_max="6"/>
+	<option key="threshold" version_min="7"/>
 	<option key="comment" />
 	<option key="cmdhist" />
-</qgisgrassmodule>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.to.points.qgm b/src/plugins/grass/modules/v.to.points.qgm
@@ -2,8 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Create points along input lines" module="v.to.points">
-	<option key="input" layeroption="llayer" typeoption="type" />
-	<file key="output" type="new" />
+	<option key="input" layeroption="llayer" typeoption="type" version_max="6"/>
+	<option key="input" layeroption="layer" typeoption="type" version_min="7"/>
+	<option key="output"/>
 	<option key="dmax" answer="100" hidden="no"/>
-	<flag key="v" answer="on" hidden="no" />
+	<flag key="v" answer="on" hidden="no" version_max="6"/>
+	<option key="use" answer="Vertex" hidden="no" version_min="7"/>
+	<flag key="i"/>
 </qgisgrassmodule>