Skip to content

Commit

Permalink
apply GRASS plugin update from Marco Pasetti (fixes #1101)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@8798 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jul 16, 2008
1 parent 6894089 commit 160d3da
Show file tree
Hide file tree
Showing 43 changed files with 176 additions and 30 deletions.
25 changes: 20 additions & 5 deletions src/plugins/grass/config/default.qgc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<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.shape"/>
<grass name="v.in.shape.loc"/>
<grass name="v.in.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.mapgen"/>
Expand Down Expand Up @@ -71,19 +75,23 @@
<section label="Config">
<section label="Region">
<section label="Region settings">
<grass name="g.region"/>
<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">
<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">
<grass name="g.proj.ascii.new"/>
<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.proj.new"/>
</section>
</section>
Expand All @@ -101,6 +109,9 @@
<section label="Compress raster">
<grass name="r.compress"/>
</section>
<section label="Patch raster layers">
<grass name="r.patch"/>
</section>
<section label="Sets the boundary definitions for a raster map">
<grass name="r.region.region"/>
<grass name="r.region.raster"/>
Expand All @@ -125,6 +136,7 @@
</section>
<section label="Reproject raster from another Location">
<grass name="r.proj"/>
<grass name="r.proj.res"/>
</section>
</section>
<section label="Manage map colors">
Expand Down Expand Up @@ -241,6 +253,9 @@
<section label="Topology management">
<grass name="v.build.all"/>
</section>
<section label="Patch vector layers">
<grass name="v.patch"/>
</section>
<section label="Toolset for cleaning topology of vector map">
<grass name="v.clean.break"/>
<grass name="v.clean.snap"/>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.ascii.new.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between ASCII formats and create NEW LOCATION" module="g.proj">
<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">
<file key="wkt" type="old" />
<option key="location" />
</qgisgrassmodule>
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) from location" module="g.proj">
<qgisgrassmodule label="Print projection information from a georeferenced ASCII file containing a WKT projection description" module="g.proj">
<file key="wkt" type="old" />
<flag key="p" />
<flag key="d" />
<flag key="j" />
<flag key="w" />
<flag key="e" />
<flag key="f" />
<flag key="c" />
<option key="location" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.geo.new.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENCED FILE (including GRASS format) and create a NEW LOCATION" module="g.proj">
<qgisgrassmodule label="Print projection information from a georeferenced file (raster, vector or image) and create a new location based on it" module="g.proj">
<file key="georef" type="old" />
<option key="location" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.geo.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between GEOREFERENED FILE (including GRASS format)" module="g.proj">
<qgisgrassmodule label="Print projection information from a georeferenced file (raster, vector or image)" module="g.proj">
<file key="georef" type="old" />
<flag key="p" />
<flag key="d" />
Expand Down
Binary file removed src/plugins/grass/modules/g.proj.print.2.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.print.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Print projection information" module="g.proj">
<qgisgrassmodule label="Print projection information of the current location" module="g.proj">
<flag key="p" />
<flag key="d" />
<flag key="j" />
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.proj.new.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION and produce a NEW LOCATION" module="g.proj">
<qgisgrassmodule label="Print projection information from a PROJ.4 projection description file and create a new location based on it" module="g.proj">
<file key="proj4" type="new"/>
<option key="location" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/g.proj.proj.qgm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Converts coordinate system descriptions (i.e. projection information) between PROJ INFORMATION" module="g.proj">
<qgisgrassmodule label="Print projection information from a PROJ.4 projection description file" module="g.proj">
<flag key="p" />
<flag key="d" />
<flag key="j" />
Expand Down
File renamed without changes
6 changes: 6 additions & 0 deletions src/plugins/grass/modules/g.region.multiple.raster.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple raster maps" module="g.region">
<file key="rast" label="Type in map names separated by a comma" />
</qgisgrassmodule>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/plugins/grass/modules/g.region.multiple.vector.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple vector maps" module="g.region">
<file key="vect" label="Type in map names separated by a comma" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/g.region.save.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Save your geographic region" module="g.region">
<option key="save"/>
<qgisgrassmodule label="Save the current region as a named region" module="g.region">
<option key="save" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/g.region.zoom.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/plugins/grass/modules/g.region.zoom.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Shrink the current region until it meets non-NULL data from a given raster map" module="g.region">
<option key="zoom" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/r.patch.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/r.patch.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/r.patch.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create a new raster map by combining other raster maps" module="r.patch">
<flag key="z" answer="off" hidden="no" />
<file key="input" label="Type in map names separated by a comma" />
<option key="output" />
</qgisgrassmodule>
9 changes: 4 additions & 5 deletions src/plugins/grass/modules/r.proj.qgm
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Re-project a raster map from one location to the current location" module="r.proj">
<option key="input" />
<option key="dbase"/>
<option key="location"/>
<option key="mapset"/>
<file key="input" />
<option key="dbase" />
<option key="location" />
<option key="mapset" />
<option key="method" />
<option key="resolution" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/r.proj.res.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/r.proj.res.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/r.proj.res.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Re-project a raster map from one location to the current location and change the map resolution" module="r.proj">
<file key="input" />
<option key="dbase" />
<option key="location" />
<option key="mapset" />
<option key="method" />
<option key="resolution" />
</qgisgrassmodule>
7 changes: 4 additions & 3 deletions src/plugins/grass/modules/v.in.db.qgm
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import vector point from table dbf format" module="v.in.db">
<option key="driver" answer="dbf" hidden="yes"/>
<file key="database" type="old" fileoption="table" label="Input table" filters="dbf (*.dbf)" />
<qgisgrassmodule label="Import vector points from a database table containing coordinates" module="v.in.db">
<file key="database" type="old" label="Database file" />
<option key="table" />
<option key="driver" />
<option key="x"/>
<option key="y"/>
<option key="key"/>
Expand Down
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/v.in.ogr.all.1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/v.in.ogr.all.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/v.in.ogr.all.loc.1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/v.in.ogr.all.loc.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/plugins/grass/modules/v.in.ogr.all.loc.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import all the OGR/PostGIS vector layers in a given data source and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="e" answer="off" hidden="no" />
<option key="dsn" label="Path to the OGR data source" />
<option key="output" />
<option key="location" />
<option key="type" />
</qgisgrassmodule>
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/v.in.ogr.all.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import all the OGR/PostGIS vector layers in a given data source" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="r" answer="off" hidden="no" />
<option key="dsn" label="Path to the OGR data source" />
<option key="output" />
<option key="type" />
</qgisgrassmodule>
10 changes: 7 additions & 3 deletions src/plugins/grass/modules/v.in.ogr.loc.qgm
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR/PostGIS vector layer and create a fitted location" module="v.in.ogr">
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<qgisgrassmodule label="Import OGR/PostGIS vector layers and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="e" answer="off" hidden="no" />
<option key="dsn" label="Path to the OGR data source" />
<option key="layer" label="OGR layer name" />
<option key="output" />
<option key="location" />
<flag key="e" answer="on" hidden="yes" />
<option key="type" />
</qgisgrassmodule>
10 changes: 7 additions & 3 deletions src/plugins/grass/modules/v.in.ogr.qgm
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR/PostGIS vector layer" module="v.in.ogr">
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<option key="output" />
<qgisgrassmodule label="Import OGR/PostGIS vector layers" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="r" answer="off" hidden="no" />
<option key="dsn" label="Path to the OGR data source" />
<option key="layer" label="OGR layer name" />
<option key="output" />
<option key="type" />
</qgisgrassmodule>
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/v.in.shape.1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/v.in.shape.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/v.in.shape.loc.1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/v.in.shape.loc.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/plugins/grass/modules/v.in.shape.loc.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import ESRI Shapefile vector layers and create a fitted location" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="e" answer="off" hidden="no" />
<file key="dsn" label="ESRI Shapefile" filters="shp(*.shp)" />
<option key="output" />
<option key="location" />
<option key="type" />
</qgisgrassmodule>
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/v.in.shape.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import ESRI Shapefile vector layers" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<flag key="z" answer="off" hidden="no" />
<flag key="r" answer="off" hidden="no" />
<file key="dsn" label="ESRI Shapefile" filters="shp(*.shp)" />
<option key="output" />
<option key="type" />
</qgisgrassmodule>
Binary file added src/plugins/grass/modules/v.patch.1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/plugins/grass/modules/v.patch.2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/plugins/grass/modules/v.patch.qgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

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

0 comments on commit 160d3da

Please sign in to comment.