[QGIS Commit] r12473 - in trunk/qgis/src/plugins/grass: modules-6.4 modules-common scripts

[svn_qgis at osgeo.org]

Author: pcav
Date: 2009-12-15 11:06:18 -0500 (Tue, 15 Dec 2009)
New Revision: 12473

Modified:
   trunk/qgis/src/plugins/grass/modules-6.4/v.buffer.qgm
   trunk/qgis/src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.circle.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.watershed.qgm
   trunk/qgis/src/plugins/grass/scripts/v.out.ogr.pg.py
Log:
Updated various GRASS modules - patches applied (thanks Giovanni Manghi). Closes #2229 and #2046

Modified: trunk/qgis/src/plugins/grass/modules-6.4/v.buffer.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/v.buffer.qgm	2009-12-15 14:01:40 UTC (rev 12472)
+++ trunk/qgis/src/plugins/grass/modules-6.4/v.buffer.qgm	2009-12-15 16:06:18 UTC (rev 12473)
@@ -2,11 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Vector buffer" module="v.buffer">
-	<flag key="s" answer="off" hidden="no" />
-	<flag key="c" answer="off" hidden="no" />
 	<option key="input" typeoption="type" layeroption="layer" />
 	<option key="distance"/>
-	<option key="minordistance"/>
-	<option key="angle"/>
 	<option key="output" />
 </qgisgrassmodule>

Modified: trunk/qgis/src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm	2009-12-15 14:01:40 UTC (rev 12472)
+++ trunk/qgis/src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm	2009-12-15 16:06:18 UTC (rev 12473)
@@ -2,6 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Export vector to PostGIS (PostgreSQL) database table." module="v.out.ogr.pg.py" manual="v.out.ogr">
+	<flag key="c" answer="off" hidden="no"/>
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="olayer" />
 	<option key="database" />

Modified: trunk/qgis/src/plugins/grass/modules-common/r.circle.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.circle.qgm	2009-12-15 14:01:40 UTC (rev 12472)
+++ trunk/qgis/src/plugins/grass/modules-common/r.circle.qgm	2009-12-15 16:06:18 UTC (rev 12473)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
-<qgisgrassmodule label="Create a map conteining concentrinc rings" module="r.circle">
+<qgisgrassmodule label="Create a map containing concentric rings" module="r.circle">
 	<option key="coordinate" />
 	<option key="min" answer="0" />
 	<option key="max" />
 	<option key="mult" answer="1"/>
 	<option key="output" />
-</qgisgrassmodule>
\ No newline at end of file
+</qgisgrassmodule>

Modified: trunk/qgis/src/plugins/grass/modules-common/r.watershed.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.watershed.qgm	2009-12-15 14:01:40 UTC (rev 12472)
+++ trunk/qgis/src/plugins/grass/modules-common/r.watershed.qgm	2009-12-15 16:06:18 UTC (rev 12473)
@@ -6,7 +6,7 @@
 
 	<option key="elevation" />
 	<option key="threshold" />
-
+	<flag key="m" answer="off" hidden="no" />
 	<option key="accumulation" />
 	<option key="drainage" />
 	<option key="stream" />

Modified: trunk/qgis/src/plugins/grass/scripts/v.out.ogr.pg.py
===================================================================
--- trunk/qgis/src/plugins/grass/scripts/v.out.ogr.pg.py	2009-12-15 14:01:40 UTC (rev 12472)
+++ trunk/qgis/src/plugins/grass/scripts/v.out.ogr.pg.py	2009-12-15 16:06:18 UTC (rev 12473)
@@ -103,6 +103,11 @@
 #% required : no
 #%end
 
+#%flag
+#% key: c
+#% description: to export features with category (labeled) only. Otherwise all features are exported
+#%end
+
 import sys
 import os
 import string
@@ -132,9 +137,10 @@
     if user: dsn += " user=" + user
     if password: dsn += " password=" + password
 
-    if grass.run_command('v.out.ogr', input=input, layer=layer, type=type, format="PostgreSQL", dsn=dsn, olayer=olayer ) != 0:
+    if grass.run_command('v.out.ogr', flags=flags_string, input=input, layer=layer, type=type, format="PostgreSQL", dsn=dsn, olayer=olayer ) != 0:
         grass.fatal("Cannot export vector to database.")
 	
 if __name__ == "__main__":
     options, flags = grass.parser()
+    flags_string = "".join([k for k in flags.keys() if flags[k] and k != 'r'])
     main()