Skip to content

Commit 781bffa

Browse files
committed
Update and adaptation of some GRASS plugin modules to GRASS 7 (default.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)
1 parent a6b92c6 commit 781bffa

11 files changed

+38
-20
lines changed

src/plugins/grass/modules/default.qgc

+3-2
Original file line numberDiff line numberDiff line change
@@ -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">
@@ -563,8 +564,8 @@
563564
</section>
564565
</section>
565566

566-
<section label="3d Visualization">
567-
<grass name="nviz"/>
567+
<section label="3d Visualization" version_max="6.4">
568+
<grass name="nviz" version_max="6.4"/>
568569
</section>
569570
<section label="Convert coordinates">
570571
<grass name="m.cogo"/>

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

+3-2
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

+4-3
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>

src/plugins/grass/modules/v.generalize.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<qgisgrassmodule label="Simplify vector" module="v.generalize">
55
<option key="input" typeoption="type" layeroption="layer" />
6-
<flag key="c" answer="on" hidden="yes" />
6+
<flag key="c" answer="on" hidden="yes" version_max="6"/>
77
<option key="type" label="Feature type (for polygons, choose Boundary)"/>
88
<option key="method" />
99
<option key="threshold" answer="1.0" label="Maximal tolerance value (higher value=more simplification)" />
-590 Bytes
Loading
791 Bytes
Loading
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Create random 3D vector points" module="v.random">
5+
<flag key="z" answer="yes" hidden="yes"/>
6+
<option key="n" version_max="6"/>
7+
<option key="npoints" version_min="7"/>
8+
<option key="column" answer="zvalue" hidden="yes"/>
9+
<option key="column_type" advanced="yes" version_min="7"/>
10+
<option key="zmin" advanced="yes"/>
11+
<option key="zmax" advanced="yes"/>
12+
<option key="output" />
13+
</qgisgrassmodule>
+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Create random 2D/3D vector points" module="v.random">
4+
<qgisgrassmodule label="Create random 2D vector points" module="v.random">
55
<option key="n" version_max="6"/>
66
<option key="npoints" version_min="7"/>
7-
<option key="column" advanced="yes"/>
8-
<option key="column_type" advanced="yes" version_min="7"/>
9-
<option key="zmin" advanced="yes"/>
10-
<option key="zmax" advanced="yes"/>
117
<option key="output" />
128
</qgisgrassmodule>

src/plugins/grass/modules/v.segment.qgm

+4-2
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="Create points/segments from input vector lines and positions" module="v.segment">
5-
<option key="input" layeroption="llayer" typemask="line,boundary"/>
6-
<file key="file" type="old" filters="Txt (*.txt), Csv (*.csv)" />
5+
<option key="input" layeroption="llayer" typemask="line,boundary" version_max="6"/>
6+
<option key="input" layeroption="layer" typemask="line,boundary" version_min="7"/>
7+
<file key="file" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_max="6"/>
8+
<file key="rules" type="old" filters="Txt (*.txt);;Csv (*.csv)" version_min="7"/>
79
<option key="output"/>
810
</qgisgrassmodule>

src/plugins/grass/modules/v.support.qgm

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<option key="map_date" />
1111
<option key="scale" />
1212
<option key="zone" />
13-
<option key="thresh" />
13+
<option key="thresh" version_max="6"/>
14+
<option key="threshold" version_min="7"/>
1415
<option key="comment" />
1516
<option key="cmdhist" />
16-
</qgisgrassmodule>
17+
</qgisgrassmodule>

src/plugins/grass/modules/v.to.points.qgm

+6-3
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="Create points along input lines" module="v.to.points">
5-
<option key="input" layeroption="llayer" typeoption="type" />
6-
<file key="output" type="new" />
5+
<option key="input" layeroption="llayer" typeoption="type" version_max="6"/>
6+
<option key="input" layeroption="layer" typeoption="type" version_min="7"/>
7+
<option key="output"/>
78
<option key="dmax" answer="100" hidden="no"/>
8-
<flag key="v" answer="on" hidden="no" />
9+
<flag key="v" answer="on" hidden="no" version_max="6"/>
10+
<option key="use" answer="Vertex" hidden="no" version_min="7"/>
11+
<flag key="i"/>
912
</qgisgrassmodule>

0 commit comments

Comments
 (0)