Skip to content

Commit 160d3da

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

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‎

Lines changed: 20 additions & 5 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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" />

0 commit comments

Comments
 (0)