Skip to content

Commit 3cc0aa8

Browse files
author
jef
committed
apply GRASS plugin update from Marco Pasetti (fixes #1101)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8798 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 21e49da commit 3cc0aa8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+176
-30
lines changed

‎src/plugins/grass/config/default.qgc

+20-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
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"/>
27+
<grass name="v.in.shape"/>
28+
<grass name="v.in.shape.loc"/>
2529
<grass name="v.in.dxf"/>
2630
<grass name="v.in.e00"/>
2731
<grass name="v.in.mapgen"/>
@@ -71,19 +75,23 @@
7175
<section label="Config">
7276
<section label="Region">
7377
<section label="Region settings">
74-
<grass name="g.region"/>
78+
<grass name="g.region.save"/>
79+
<grass name="g.region.zoom"/>
80+
<grass name="g.region.multiple.raster"/>
81+
<grass name="g.region.multiple.vector"/>
7582
</section>
7683
<section label="Projection management">
77-
<section label="Print projection info of current Location">
84+
<section label="Print projection information of the current location">
7885
<grass name="g.proj.print"/>
7986
</section>
80-
<section label="Print projection info from a file">
87+
<section label="Print projection information from a georeferenced file">
8188
<grass name="g.proj.geo"/>
89+
<grass name="g.proj.ascii"/>
8290
<grass name="g.proj.proj"/>
8391
</section>
84-
<section label="Print projection info from a file to create new location">
85-
<grass name="g.proj.ascii.new"/>
92+
<section label="Print projection information from a georeferenced file and create a new location based on it">
8693
<grass name="g.proj.geo.new"/>
94+
<grass name="g.proj.ascii.new"/>
8795
<grass name="g.proj.proj.new"/>
8896
</section>
8997
</section>
@@ -101,6 +109,9 @@
101109
<section label="Compress raster">
102110
<grass name="r.compress"/>
103111
</section>
112+
<section label="Patch raster layers">
113+
<grass name="r.patch"/>
114+
</section>
104115
<section label="Sets the boundary definitions for a raster map">
105116
<grass name="r.region.region"/>
106117
<grass name="r.region.raster"/>
@@ -125,6 +136,7 @@
125136
</section>
126137
<section label="Reproject raster from another Location">
127138
<grass name="r.proj"/>
139+
<grass name="r.proj.res"/>
128140
</section>
129141
</section>
130142
<section label="Manage map colors">
@@ -241,6 +253,9 @@
241253
<section label="Topology management">
242254
<grass name="v.build.all"/>
243255
</section>
256+
<section label="Patch vector layers">
257+
<grass name="v.patch"/>
258+
</section>
244259
<section label="Toolset for cleaning topology of vector map">
245260
<grass name="v.clean.break"/>
246261
<grass name="v.clean.snap"/>

‎src/plugins/grass/modules/g.proj.region.1.png renamed to ‎src/plugins/grass/modules/g.proj.ascii.1.png

File renamed without changes.

‎src/plugins/grass/modules/g.proj.ascii.new.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between ASCII formats and create NEW LOCATION" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a georeferenced ASCII file containing a WKT projection description and create a new location based on it" module="g.proj">
55
<file key="wkt" type="old" />
66
<option key="location" />
77
</qgisgrassmodule>

‎src/plugins/grass/modules/g.proj.region.qgm renamed to ‎src/plugins/grass/modules/g.proj.ascii.qgm

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) from location" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a georeferenced ASCII file containing a WKT projection description" module="g.proj">
5+
<file key="wkt" type="old" />
56
<flag key="p" />
67
<flag key="d" />
78
<flag key="j" />
89
<flag key="w" />
910
<flag key="e" />
1011
<flag key="f" />
11-
<flag key="c" />
12-
<option key="location" />
1312
</qgisgrassmodule>

‎src/plugins/grass/modules/g.proj.geo.new.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENCED FILE (including GRASS format) and create a NEW LOCATION" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a georeferenced file (raster, vector or image) and create a new location based on it" module="g.proj">
55
<file key="georef" type="old" />
66
<option key="location" />
77
</qgisgrassmodule>

‎src/plugins/grass/modules/g.proj.geo.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENED FILE (including GRASS format)" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a georeferenced file (raster, vector or image)" module="g.proj">
55
<file key="georef" type="old" />
66
<flag key="p" />
77
<flag key="d" />

‎src/plugins/grass/modules/g.proj.print.2.png

-48.2 KB
Binary file not shown.

‎src/plugins/grass/modules/g.proj.print.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Print projection information" module="g.proj">
4+
<qgisgrassmodule label="Print projection information of the current location" module="g.proj">
55
<flag key="p" />
66
<flag key="d" />
77
<flag key="j" />

‎src/plugins/grass/modules/g.proj.proj.new.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION and produce a NEW LOCATION" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a PROJ.4 projection description file and create a new location based on it" module="g.proj">
55
<file key="proj4" type="new"/>
66
<option key="location" />
77
</qgisgrassmodule>

‎src/plugins/grass/modules/g.proj.proj.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION" module="g.proj">
4+
<qgisgrassmodule label="Print projection information from a PROJ.4 projection description file" module="g.proj">
55
<flag key="p" />
66
<flag key="d" />
77
<flag key="j" />

‎src/plugins/grass/modules/g.region.1.png renamed to ‎src/plugins/grass/modules/g.region.multiple.raster.1.png

File renamed without changes.

‎src/plugins/grass/modules/g.region.multiple.raster.qgm

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Set the region to match multiple raster maps" module="g.region">
5+
<file key="rast" label="Type in map names separated by a comma" />
6+
</qgisgrassmodule>

‎src/plugins/grass/modules/g.region.multiple.vector.1.png

21.4 KB

‎src/plugins/grass/modules/g.region.multiple.vector.qgm

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Set the region to match multiple vector maps" module="g.region">
5+
<file key="vect" label="Type in map names separated by a comma" />
6+
</qgisgrassmodule>

‎src/plugins/grass/modules/g.region.save.1.png

21.4 KB

‎src/plugins/grass/modules/g.region.qgm renamed to ‎src/plugins/grass/modules/g.region.save.qgm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Save your geographic region" module="g.region">
5-
<option key="save"/>
4+
<qgisgrassmodule label="Save the current region as a named region" module="g.region">
5+
<option key="save" />
66
</qgisgrassmodule>

‎src/plugins/grass/modules/g.region.zoom.1.png

21.4 KB

‎src/plugins/grass/modules/g.region.zoom.qgm

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Shrink the current region until it meets non-NULL data from a given raster map" module="g.region">
5+
<option key="zoom" />
6+
</qgisgrassmodule>

‎src/plugins/grass/modules/r.patch.1.png

16.6 KB

‎src/plugins/grass/modules/r.patch.2.png

8.71 KB

‎src/plugins/grass/modules/r.patch.qgm

+8
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 new raster map by combining other raster maps" module="r.patch">
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>

‎src/plugins/grass/modules/r.proj.qgm

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Re-project a raster map from one location to the current location" module="r.proj">
5-
<option key="input" />
6-
<option key="dbase"/>
7-
<option key="location"/>
8-
<option key="mapset"/>
5+
<file key="input" />
6+
<option key="dbase" />
7+
<option key="location" />
8+
<option key="mapset" />
99
<option key="method" />
10-
<option key="resolution" />
1110
</qgisgrassmodule>

‎src/plugins/grass/modules/r.proj.res.1.png

37.7 KB

‎src/plugins/grass/modules/r.proj.res.2.png

44 KB

‎src/plugins/grass/modules/r.proj.res.qgm

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Re-project a raster map from one location to the current location and change the map resolution" module="r.proj">
5+
<file key="input" />
6+
<option key="dbase" />
7+
<option key="location" />
8+
<option key="mapset" />
9+
<option key="method" />
10+
<option key="resolution" />
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.db.qgm

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Import vector point from table dbf format" module="v.in.db">
5-
<option key="driver" answer="dbf" hidden="yes"/>
6-
<file key="database" type="old" fileoption="table" label="Input table" filters="dbf (*.dbf)" />
4+
<qgisgrassmodule label="Import vector points from a database table containing coordinates" module="v.in.db">
5+
<file key="database" type="old" label="Database file" />
6+
<option key="table" />
7+
<option key="driver" />
78
<option key="x"/>
89
<option key="y"/>
910
<option key="key"/>

‎src/plugins/grass/modules/v.in.ogr.all.1.svg

+8

‎src/plugins/grass/modules/v.in.ogr.all.2.png

1.63 KB

‎src/plugins/grass/modules/v.in.ogr.all.loc.1.svg

+8

‎src/plugins/grass/modules/v.in.ogr.all.loc.2.png

1.63 KB

‎src/plugins/grass/modules/v.in.ogr.all.loc.qgm

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Import all the OGR/PostGIS vector layers in a given data source and create a fitted location" module="v.in.ogr">
5+
<flag key="o" answer="off" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="e" answer="off" hidden="no" />
8+
<option key="dsn" label="Path to the OGR data source" />
9+
<option key="output" />
10+
<option key="location" />
11+
<option key="type" />
12+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.all.qgm

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Import all the OGR/PostGIS vector layers in a given data source" module="v.in.ogr">
5+
<flag key="o" answer="on" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="r" answer="off" hidden="no" />
8+
<option key="dsn" label="Path to the OGR data source" />
9+
<option key="output" />
10+
<option key="type" />
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.loc.qgm

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Import OGR/PostGIS vector layer and create a fitted location" module="v.in.ogr">
5-
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
4+
<qgisgrassmodule label="Import OGR/PostGIS vector layers and create a fitted location" module="v.in.ogr">
5+
<flag key="o" answer="off" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="e" answer="off" hidden="no" />
8+
<option key="dsn" label="Path to the OGR data source" />
9+
<option key="layer" label="OGR layer name" />
610
<option key="output" />
711
<option key="location" />
8-
<flag key="e" answer="on" hidden="yes" />
12+
<option key="type" />
913
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.ogr.qgm

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

4-
<qgisgrassmodule label="Import OGR/PostGIS vector layer" module="v.in.ogr">
5-
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
6-
<option key="output" />
4+
<qgisgrassmodule label="Import OGR/PostGIS vector layers" module="v.in.ogr">
75
<flag key="o" answer="on" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="r" answer="off" hidden="no" />
8+
<option key="dsn" label="Path to the OGR data source" />
9+
<option key="layer" label="OGR layer name" />
10+
<option key="output" />
11+
<option key="type" />
812
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.shape.1.svg

+8

‎src/plugins/grass/modules/v.in.shape.2.png

1.63 KB

‎src/plugins/grass/modules/v.in.shape.loc.1.svg

+8

‎src/plugins/grass/modules/v.in.shape.loc.2.png

1.63 KB

‎src/plugins/grass/modules/v.in.shape.loc.qgm

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Import ESRI Shapefile vector layers and create a fitted location" module="v.in.ogr">
5+
<flag key="o" answer="on" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="e" answer="off" hidden="no" />
8+
<file key="dsn" label="ESRI Shapefile" filters="shp(*.shp)" />
9+
<option key="output" />
10+
<option key="location" />
11+
<option key="type" />
12+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.in.shape.qgm

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Import ESRI Shapefile vector layers" module="v.in.ogr">
5+
<flag key="o" answer="on" hidden="yes" />
6+
<flag key="z" answer="off" hidden="no" />
7+
<flag key="r" answer="off" hidden="no" />
8+
<file key="dsn" label="ESRI Shapefile" filters="shp(*.shp)" />
9+
<option key="output" />
10+
<option key="type" />
11+
</qgisgrassmodule>

‎src/plugins/grass/modules/v.patch.1.png

7.44 KB

‎src/plugins/grass/modules/v.patch.2.png

7.41 KB

‎src/plugins/grass/modules/v.patch.qgm

+9
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="Create a new vector map by combining other vector maps" module="v.patch">
5+
<flag key="a" answer="off" hidden="no" />
6+
<flag key="e" answer="off" hidden="no" label="Copy also the attribute table (only the table of layer 1 is currently supported)" />
7+
<file key="input" label="Type in map names separated by a comma" />
8+
<option key="output" />
9+
</qgisgrassmodule>

0 commit comments

Comments
 (0)