Skip to content

Commit edafb7e

Browse files
author
pcav
committed
Updated various GRASS modules - patches applied (thanks Giovanni Manghi). Closes #2229 and #2046
git-svn-id: http://svn.osgeo.org/qgis/trunk@12473 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent fbc814e commit edafb7e

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

src/plugins/grass/modules-6.4/v.buffer.qgm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Vector buffer" module="v.buffer">
5-
<flag key="s" answer="off" hidden="no" />
6-
<flag key="c" answer="off" hidden="no" />
75
<option key="input" typeoption="type" layeroption="layer" />
86
<option key="distance"/>
9-
<option key="minordistance"/>
10-
<option key="angle"/>
117
<option key="output" />
128
</qgisgrassmodule>

src/plugins/grass/modules-6.4/v.out.ogr.pg.qgm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Export vector to PostGIS (PostgreSQL) database table." module="v.out.ogr.pg.py" manual="v.out.ogr">
5+
<flag key="c" answer="off" hidden="no"/>
56
<option key="input" layeroption="layer" typeoption="type" />
67
<option key="olayer" />
78
<option key="database" />
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Create a map conteining concentrinc rings" module="r.circle">
4+
<qgisgrassmodule label="Create a map containing concentric rings" module="r.circle">
55
<option key="coordinate" />
66
<option key="min" answer="0" />
77
<option key="max" />
88
<option key="mult" answer="1"/>
99
<option key="output" />
10-
</qgisgrassmodule>
10+
</qgisgrassmodule>

src/plugins/grass/modules-common/r.watershed.qgm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<option key="elevation" />
88
<option key="threshold" />
9-
9+
<flag key="m" answer="off" hidden="no" />
1010
<option key="accumulation" />
1111
<option key="drainage" />
1212
<option key="stream" />

src/plugins/grass/scripts/v.out.ogr.pg.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@
103103
#% required : no
104104
#%end
105105

106+
#%flag
107+
#% key: c
108+
#% description: to export features with category (labeled) only. Otherwise all features are exported
109+
#%end
110+
106111
import sys
107112
import os
108113
import string
@@ -132,9 +137,10 @@ def main():
132137
if user: dsn += " user=" + user
133138
if password: dsn += " password=" + password
134139

135-
if grass.run_command('v.out.ogr', input=input, layer=layer, type=type, format="PostgreSQL", dsn=dsn, olayer=olayer ) != 0:
140+
if grass.run_command('v.out.ogr', flags=flags_string, input=input, layer=layer, type=type, format="PostgreSQL", dsn=dsn, olayer=olayer ) != 0:
136141
grass.fatal("Cannot export vector to database.")
137142

138143
if __name__ == "__main__":
139144
options, flags = grass.parser()
145+
flags_string = "".join([k for k in flags.keys() if flags[k] and k != 'r'])
140146
main()

0 commit comments

Comments
 (0)