Skip to content

Commit 2d82949

Browse files
author
leolami
committed
Update v.sample, v.what.rast, v.what.vect and add db.select, r.cross, r.series, r.reconnect.all, v.db.select, v.db.select.where, v.generalize, v.kcv, v.out.ogr.postgis, v.support
git-svn-id: http://svn.osgeo.org/qgis/trunk@9165 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 363d63d commit 2d82949

32 files changed

+246
-14
lines changed

src/plugins/grass/config/default.qgc

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<section label="Import vector">
2323
<grass name="v.in.ogr"/>
2424
<grass name="v.in.ogr.loc"/>
25+
<grass name="v.in.ogr.all"/>
26+
<grass name="v.in.ogr.all.loc"/>
2527
<grass name="v.in.dxf"/>
2628
<grass name="v.in.e00"/>
2729
<grass name="v.in.mapgen"/>
@@ -46,6 +48,7 @@
4648
</section>
4749
<section label="Export vector">
4850
<grass name="v.out.ogr"/>
51+
<grass name="v.out.ogr.postgis"/>
4952
<grass name="v.out.ogr.gml"/>
5053
<grass name="v.out.ogr.mapinfo"/>
5154
<grass name="v.out.ascii"/>
@@ -71,19 +74,21 @@
7174
<section label="Config">
7275
<section label="Region">
7376
<section label="Region settings">
74-
<grass name="g.region"/>
75-
</section>
77+
<grass name="g.region.save"/>
78+
<grass name="g.region.zoom"/>
79+
<grass name="g.region.multiple.raster"/>
80+
<grass name="g.region.multiple.vector"/> </section>
7681
<section label="Projection management">
77-
<section label="Print projection info of current Location">
78-
<grass name="g.proj.print"/>
82+
<section label="Print projection information of the current location"> <grass name="g.proj.print"/>
7983
</section>
80-
<section label="Print projection info from a file">
84+
<section label="Print projection information from a georeferenced file">
8185
<grass name="g.proj.geo"/>
86+
<grass name="g.proj.ascii"/>
8287
<grass name="g.proj.proj"/>
8388
</section>
84-
<section label="Print projection info from a file to create new location">
89+
<section label="Print projection information from a georeferenced file and create a new location based on it">
90+
<grass name="g.proj.geo.new"/>
8591
<grass name="g.proj.ascii.new"/>
86-
<grass name="g.proj.geo.new"/>
8792
<grass name="g.proj.proj.new"/>
8893
</section>
8994
</section>
@@ -151,6 +156,9 @@
151156
<grass name="v.neighbors"/>
152157
</section>
153158
<section label="Overlay maps">
159+
<grass name="r.cross"/>
160+
<grass name="r.series"/>
161+
<grass name="r.patch"/>
154162
<grass name="r.statistics"/>
155163
</section>
156164
<section label="Terrain analysis">
@@ -278,6 +286,12 @@
278286
<grass name="v.transform"/>
279287
<grass name="v.proj"/>
280288
</section>
289+
<section label="Metadata support">
290+
<grass name="v.support"/>
291+
</section>
292+
<section label="Generalization">
293+
<grass name="v.generalize"/>
294+
</section>
281295
</section>
282296
<section label="Database connection">
283297
<grass name="v.db.connect"/>
@@ -304,6 +318,7 @@
304318
<grass name="v.net.steiner"/>
305319
</section>
306320
<section label="Overlay">
321+
<grass name="v.patch"/>
307322
<grass name="v.overlay.or"/>
308323
<grass name="v.overlay.and"/>
309324
<grass name="v.overlay.not"/>
@@ -330,6 +345,10 @@
330345
<grass name="v.in.db"/>
331346
<grass name="v.random"/>
332347
</section>
348+
<section label="Manage training dataset">
349+
<grass name="v.kcv"/>
350+
<grass name="v.outlier"/>
351+
</section>
333352
<section label="Delaunay triangulation, Voronoi diagram and convex hull">
334353
<grass name="v.hull"/>
335354
<grass name="v.delaunay.line"/>
@@ -393,6 +412,7 @@
393412
<section label="Database management">
394413
<grass name="db.connect"/>
395414
<grass name="db.connect.schema"/>
415+
<grass name="v.db.reconnect.all"/>
396416
<grass name="db.login"/>
397417
<grass name="db.in.ogr"/>
398418
</section>
@@ -409,6 +429,9 @@
409429
<grass name="v.db.dropcol"/>
410430
<grass name="v.db.renamecol"/>
411431
<grass name="db.execute"/>
432+
<grass name="db.select"/>
433+
<grass name="v.db.select"/>
434+
<grass name="v.db.select.where"/>
412435
</section>
413436
<section label="Others">
414437
<grass name="v.db.join"/>
2.11 KB
Loading
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Prints result of selection from database based on SQL" module="db.select">
5+
<option key="table" />
6+
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
7+
<option key="driver" />
8+
<option key="sql" />
9+
<option key="fs" answer="|" hidden="yes" />
10+
</qgisgrassmodule>
16.6 KB
Loading
8.71 KB
Loading

src/plugins/grass/modules/r.cross.qgm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Create a cross product of the category value from multiple raster map layers" module="r.cross">
5+
<flag key="z" answer="off" hidden="no" />
6+
<file key="input" label="Type in map names separated by a comma" />
7+
<option key="output" />
8+
</qgisgrassmodule>
16.6 KB
Loading
8.71 KB
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Makes each output cell a function of the values assigned to the corresponding cells in the input raster map layers" module="r.series">
5+
<flag key="n" answer="off" hidden="no" />
6+
<file key="input" label="Type in map names separated by a comma" />
7+
<option key="method" />
8+
<option key="output" />
9+
</qgisgrassmodule>
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Reconnect vector to a new database" module="v.db.reconnect.all">
5+
<option key="old_database" />
6+
<option key="new_database" />
7+
<option key="old_schema" />
8+
<option key="new_schema" />
9+
</qgisgrassmodule>
34.2 KB
Loading
7.16 KB
Loading
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Prints vector map attribute" module="v.db.select">
5+
<option key="map" layeroption="layer" />
6+
<option key="column" />
7+
<option key="fs" answer="|" hidden="yes" />
8+
</qgisgrassmodule>
Loading
Loading
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Prints vector map attributes with SQL" module="v.db.select">
5+
<option key="map" layeroption="layer" />
6+
<option key="column" />
7+
<option key="where" />
8+
<option key="fs" answer="|" hidden="yes" />
9+
</qgisgrassmodule>
Lines changed: 50 additions & 0 deletions
Loading
7.04 KB
Loading
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Vector based generalization" module="v.generalize">
5+
<option key="input" typeoption="type" layeroption="layer" />
6+
<option key="method" />
7+
<option key="threshold" ansewr="1.0" />
8+
<option key="look_ahead" ansewr="7" />
9+
<option key="reduction" ansewr="50" />
10+
<option key="slide" ansewr="0.5" />
11+
<option key="angle_thresh" ansewr="3" />
12+
<option key="degree_thresh" ansewr="0" />
13+
<option key="closeness_thresh" ansewr="0" />
14+
<option key="betweeness_thresh" ansewr="0" />
15+
<option key="alpha" ansewr="1.0" />
16+
<option key="beta" ansewr="1.0" />
17+
<option key="iterations" ansewr="1" />
18+
<option key="layer" ansewr="1" />
19+
<flag key="r" />
20+
<option key="output" />
21+
</qgisgrassmodule>

src/plugins/grass/modules/v.kcv.1.png

509 Bytes
Loading

src/plugins/grass/modules/v.kcv.2.png

490 Bytes
Loading

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Randomly partition points into test/train sets" module="v.kcv">
5+
<option key="input" />
6+
<option key="k" />
7+
<option key="column" ansewr="part" />
8+
<option key="output" />
9+
</qgisgrassmodule>
Loading
Loading
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Export vector layer to various formats (OGR library)" module="v.out.ogr">
5+
<option key="input" layeroption="layer" typeoption="type" />
6+
<option key="format" answer="PostgreSQL" hidden="yes"/>
7+
<option key="dsn" label="Database parameters" />
8+
<option key="olayer" label="Name of the table to create" />
9+
<flag key="c" answer="on" hidden="no" label="Write only features link to a record"/>
10+
</qgisgrassmodule>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<field key="column" layer="vector" type="integer,double"/>
77
<option key="raster"/>
88
<option key="output"/>
9-
<flag key="B" answer="off" hidden="no" />
10-
<flag key="C" answer="off" hidden="no" />
9+
<flag key="b" answer="off" hidden="no" />
10+
<flag key="c" answer="off" hidden="no" />
1111
</qgisgrassmodule>

0 commit comments

Comments
 (0)