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
qgis · Aug 25, 2008 · 2d82949 · 2d82949
1 parent 363d63d
commit 2d82949
Show file tree

Hide file tree

Showing 32 changed files with 246 additions and 14 deletions.
diff --git a/src/plugins/grass/config/default.qgc b/src/plugins/grass/config/default.qgc
@@ -22,6 +22,8 @@
 			<section label="Import vector">
 				<grass name="v.in.ogr"/>
 				<grass name="v.in.ogr.loc"/>
+                                <grass name="v.in.ogr.all"/> 
+                                <grass name="v.in.ogr.all.loc"/> 
 				<grass name="v.in.dxf"/>
 				<grass name="v.in.e00"/>
 				<grass name="v.in.mapgen"/>
@@ -46,6 +48,7 @@
 			</section>
 			<section label="Export vector">
 				<grass name="v.out.ogr"/>
+				<grass name="v.out.ogr.postgis"/>
 				<grass name="v.out.ogr.gml"/>
 				<grass name="v.out.ogr.mapinfo"/>
 				<grass name="v.out.ascii"/>
@@ -71,19 +74,21 @@
 	<section label="Config">
 		<section label="Region">
 			<section label="Region settings">
-				<grass name="g.region"/>
-			</section>
+                                <grass name="g.region.save"/> 
+                                <grass name="g.region.zoom"/> 
+                                <grass name="g.region.multiple.raster"/> 
+                                <grass name="g.region.multiple.vector"/> 			</section>
 			<section label="Projection management">
-				<section label="Print projection info of current Location">
-					<grass name="g.proj.print"/>
+                                <section label="Print projection information of the current location"> 					<grass name="g.proj.print"/>
 				</section>
-				<section label="Print projection info from a file">
+                                <section label="Print projection information from a georeferenced file"> 
 					<grass name="g.proj.geo"/>
+                                        <grass name="g.proj.ascii"/> 
 					<grass name="g.proj.proj"/>
 				</section>
-				<section label="Print projection info from a file to create new location">
+                                <section label="Print projection information from a georeferenced file and create a new location based on it"> 
+                                        <grass name="g.proj.geo.new"/> 
 					<grass name="g.proj.ascii.new"/>
-					<grass name="g.proj.geo.new"/>
 					<grass name="g.proj.proj.new"/>
 				</section>
 			</section>
@@ -151,6 +156,9 @@
 				<grass name="v.neighbors"/>
 			</section>
 			<section label="Overlay maps">
+                                <grass name="r.cross"/> 
+                                <grass name="r.series"/> 
+                                <grass name="r.patch"/> 
 				<grass name="r.statistics"/>
 			</section>
 			<section label="Terrain analysis">
@@ -278,6 +286,12 @@
 				<grass name="v.transform"/>
 				<grass name="v.proj"/>
 			</section>
+			<section label="Metadata support">
+				<grass name="v.support"/>
+			</section>
+			<section label="Generalization">
+				<grass name="v.generalize"/>
+			</section>
 		</section>
 		<section label="Database connection">
 			<grass name="v.db.connect"/>
@@ -304,6 +318,7 @@
 				<grass name="v.net.steiner"/>
 			</section>
 			<section label="Overlay">
+                                <grass name="v.patch"/> 
 				<grass name="v.overlay.or"/>
 				<grass name="v.overlay.and"/>
 				<grass name="v.overlay.not"/>
@@ -330,6 +345,10 @@
 				<grass name="v.in.db"/>
 				<grass name="v.random"/>
 			</section>
+			<section label="Manage training dataset">
+				<grass name="v.kcv"/>
+				<grass name="v.outlier"/>
+			</section>
 			<section label="Delaunay triangulation, Voronoi diagram and convex hull">
 				<grass name="v.hull"/>
 				<grass name="v.delaunay.line"/>
@@ -393,6 +412,7 @@
 		<section label="Database management">
 			<grass name="db.connect"/>
 			<grass name="db.connect.schema"/>
+			<grass name="v.db.reconnect.all"/>
 			<grass name="db.login"/>
 			<grass name="db.in.ogr"/>
 		</section>
@@ -409,6 +429,9 @@
 			<grass name="v.db.dropcol"/>
 			<grass name="v.db.renamecol"/>
 			<grass name="db.execute"/>
+			<grass name="db.select"/>
+			<grass name="v.db.select"/>
+			<grass name="v.db.select.where"/>
 		</section>
 		<section label="Others">
 			<grass name="v.db.join"/>

diff --git a/src/plugins/grass/modules/db.select.1.png b/src/plugins/grass/modules/db.select.1.png
diff --git a/src/plugins/grass/modules/db.select.qgm b/src/plugins/grass/modules/db.select.qgm
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Prints result of selection from database based on SQL" module="db.select">
+	<option key="table" />
+	<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
+	<option key="driver" />
+	<option key="sql" />
+	<option key="fs" answer="|" hidden="yes" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.cross.1.png b/src/plugins/grass/modules/r.cross.1.png
diff --git a/src/plugins/grass/modules/r.cross.2.png b/src/plugins/grass/modules/r.cross.2.png
diff --git a/src/plugins/grass/modules/r.cross.qgm b/src/plugins/grass/modules/r.cross.qgm
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Create a cross product of the category value from multiple raster map layers" module="r.cross">
+	<flag key="z" answer="off" hidden="no" />
+	<file key="input" label="Type in map names separated by a comma" />
+	<option key="output" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.series.1.png b/src/plugins/grass/modules/r.series.1.png
diff --git a/src/plugins/grass/modules/r.series.2.png b/src/plugins/grass/modules/r.series.2.png
diff --git a/src/plugins/grass/modules/r.series.qgm b/src/plugins/grass/modules/r.series.qgm
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<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">
+	<flag key="n" answer="off" hidden="no" />
+	<file key="input" label="Type in map names separated by a comma" />
+	<option key="method" />
+	<option key="output" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.reconnect.all.1.png b/src/plugins/grass/modules/v.db.reconnect.all.1.png
diff --git a/src/plugins/grass/modules/v.db.reconnect.all.qgm b/src/plugins/grass/modules/v.db.reconnect.all.qgm
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Reconnect vector to a new database" module="v.db.reconnect.all">
+	<option key="old_database" />
+	<option key="new_database" />
+	<option key="old_schema" />
+	<option key="new_schema" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.1.png b/src/plugins/grass/modules/v.db.select.1.png
diff --git a/src/plugins/grass/modules/v.db.select.2.png b/src/plugins/grass/modules/v.db.select.2.png
diff --git a/src/plugins/grass/modules/v.db.select.qgm b/src/plugins/grass/modules/v.db.select.qgm
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Prints vector map attribute" module="v.db.select">
+	<option key="map" layeroption="layer" />
+	<option key="column" />
+	<option key="fs" answer="|" hidden="yes" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.db.select.where.1.png b/src/plugins/grass/modules/v.db.select.where.1.png
diff --git a/src/plugins/grass/modules/v.db.select.where.2.png b/src/plugins/grass/modules/v.db.select.where.2.png
diff --git a/src/plugins/grass/modules/v.db.select.where.qgm b/src/plugins/grass/modules/v.db.select.where.qgm
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Prints vector map attributes with SQL" module="v.db.select">
+	<option key="map" layeroption="layer" />
+	<option key="column" />
+	<option key="where" />
+	<option key="fs" answer="|" hidden="yes" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.generalize.1.svg b/src/plugins/grass/modules/v.generalize.1.svg
diff --git a/src/plugins/grass/modules/v.generalize.2.png b/src/plugins/grass/modules/v.generalize.2.png
diff --git a/src/plugins/grass/modules/v.generalize.qgm b/src/plugins/grass/modules/v.generalize.qgm
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Vector based generalization" module="v.generalize">
+	<option key="input" typeoption="type" layeroption="layer" />
+	<option key="method" />
+	<option key="threshold" ansewr="1.0" />
+	<option key="look_ahead" ansewr="7" />
+	<option key="reduction" ansewr="50" />
+	<option key="slide" ansewr="0.5" />
+	<option key="angle_thresh" ansewr="3" />
+	<option key="degree_thresh" ansewr="0" />
+	<option key="closeness_thresh" ansewr="0" />
+	<option key="betweeness_thresh" ansewr="0" />
+	<option key="alpha" ansewr="1.0" />
+	<option key="beta" ansewr="1.0" />
+	<option key="iterations" ansewr="1" />
+	<option key="layer" ansewr="1" />
+	<flag key="r" />
+	<option key="output" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.kcv.1.png b/src/plugins/grass/modules/v.kcv.1.png
diff --git a/src/plugins/grass/modules/v.kcv.2.png b/src/plugins/grass/modules/v.kcv.2.png
diff --git a/src/plugins/grass/modules/v.kcv.qgm b/src/plugins/grass/modules/v.kcv.qgm
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Randomly partition points into test/train sets" module="v.kcv">
+	<option key="input" />
+	<option key="k" />
+	<option key="column" ansewr="part" />
+	<option key="output" />
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ogr.postgis.1.png b/src/plugins/grass/modules/v.out.ogr.postgis.1.png
diff --git a/src/plugins/grass/modules/v.out.ogr.postgis.2.png b/src/plugins/grass/modules/v.out.ogr.postgis.2.png
diff --git a/src/plugins/grass/modules/v.out.ogr.postgis.qgm b/src/plugins/grass/modules/v.out.ogr.postgis.qgm
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Export vector layer to various formats (OGR library)" module="v.out.ogr">
+	<option key="input" layeroption="layer" typeoption="type" />
+	<option key="format" answer="PostgreSQL" hidden="yes"/>
+	<option key="dsn" label="Database parameters" />
+	<option key="olayer" label="Name of the table to create" />
+	<flag key="c" answer="on" hidden="no" label="Write only features link to a record"/>
+</qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.sample.qgm b/src/plugins/grass/modules/v.sample.qgm
@@ -6,6 +6,6 @@
 	<field key="column" layer="vector" type="integer,double"/>
 	<option key="raster"/>
 	<option key="output"/>
-	<flag key="B" answer="off" hidden="no" />
-	<flag key="C" answer="off" hidden="no" />
+	<flag key="b" answer="off" hidden="no" />
+	<flag key="c" answer="off" hidden="no" />
 </qgisgrassmodule>