Skip to content
Permalink
Browse files
apply GRASS plugin update from Marco Pasetti (fixes #1101)
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 160d3da2768edb75cac26352ea8cfe3f8c1fbc7a
Showing with 176 additions and 30 deletions.
  1. +20 −5 src/plugins/grass/config/default.qgc
  2. BIN src/plugins/grass/modules/{g.proj.region.1.png → g.proj.ascii.1.png}
  3. +1 −1 src/plugins/grass/modules/g.proj.ascii.new.qgm
  4. +2 −3 src/plugins/grass/modules/{g.proj.region.qgm → g.proj.ascii.qgm}
  5. +1 −1 src/plugins/grass/modules/g.proj.geo.new.qgm
  6. +1 −1 src/plugins/grass/modules/g.proj.geo.qgm
  7. BIN src/plugins/grass/modules/g.proj.print.2.png
  8. +1 −1 src/plugins/grass/modules/g.proj.print.qgm
  9. +1 −1 src/plugins/grass/modules/g.proj.proj.new.qgm
  10. +1 −1 src/plugins/grass/modules/g.proj.proj.qgm
  11. BIN src/plugins/grass/modules/{g.region.1.png → g.region.multiple.raster.1.png}
  12. +6 −0 src/plugins/grass/modules/g.region.multiple.raster.qgm
  13. BIN src/plugins/grass/modules/g.region.multiple.vector.1.png
  14. +6 −0 src/plugins/grass/modules/g.region.multiple.vector.qgm
  15. BIN src/plugins/grass/modules/g.region.save.1.png
  16. +2 −2 src/plugins/grass/modules/{g.region.qgm → g.region.save.qgm}
  17. BIN src/plugins/grass/modules/g.region.zoom.1.png
  18. +6 −0 src/plugins/grass/modules/g.region.zoom.qgm
  19. BIN src/plugins/grass/modules/r.patch.1.png
  20. BIN src/plugins/grass/modules/r.patch.2.png
  21. +8 −0 src/plugins/grass/modules/r.patch.qgm
  22. +4 −5 src/plugins/grass/modules/r.proj.qgm
  23. BIN src/plugins/grass/modules/r.proj.res.1.png
  24. BIN src/plugins/grass/modules/r.proj.res.2.png
  25. +11 −0 src/plugins/grass/modules/r.proj.res.qgm
  26. +4 −3 src/plugins/grass/modules/v.in.db.qgm
  27. +8 −0 src/plugins/grass/modules/v.in.ogr.all.1.svg
  28. BIN src/plugins/grass/modules/v.in.ogr.all.2.png
  29. +8 −0 src/plugins/grass/modules/v.in.ogr.all.loc.1.svg
  30. BIN src/plugins/grass/modules/v.in.ogr.all.loc.2.png
  31. +12 −0 src/plugins/grass/modules/v.in.ogr.all.loc.qgm
  32. +11 −0 src/plugins/grass/modules/v.in.ogr.all.qgm
  33. +7 −3 src/plugins/grass/modules/v.in.ogr.loc.qgm
  34. +7 −3 src/plugins/grass/modules/v.in.ogr.qgm
  35. +8 −0 src/plugins/grass/modules/v.in.shape.1.svg
  36. BIN src/plugins/grass/modules/v.in.shape.2.png
  37. +8 −0 src/plugins/grass/modules/v.in.shape.loc.1.svg
  38. BIN src/plugins/grass/modules/v.in.shape.loc.2.png
  39. +12 −0 src/plugins/grass/modules/v.in.shape.loc.qgm
  40. +11 −0 src/plugins/grass/modules/v.in.shape.qgm
  41. BIN src/plugins/grass/modules/v.patch.1.png
  42. BIN src/plugins/grass/modules/v.patch.2.png
  43. +9 −0 src/plugins/grass/modules/v.patch.qgm
@@ -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"/>
@@ -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>
@@ -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"/>
@@ -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">
@@ -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"/>
@@ -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>
@@ -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>
@@ -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>
@@ -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" />
Binary file not shown.
@@ -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" />
@@ -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>
@@ -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" />
File renamed without changes.
@@ -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>
Binary file not shown.
@@ -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 not shown.
@@ -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 not shown.
@@ -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 not shown.
Binary file not shown.
@@ -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>
@@ -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 not shown.
Binary file not shown.
@@ -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>
@@ -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"/>
@@ -0,0 +1,8 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20001102//EN" "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
<svg xmlns="http://www.w3.org/2000/svg" width="500" x="0" y="0" height="500" id="/hardmnt/janacek0/ssi/blazek/inst/qgis/cvs/plugins/grass/modules/r.to.vect.line.2" >
<rect width="500" x="0" y="0" height="500" style="stroke:rgb(0,0,0);stroke-width:0;fill:rgb(255,255,255);" />
<g style="stroke:rgb(0,0,0);stroke-width:0.9;fill:none;" >
<line transform="translate(0.331263 0.331263)" style="stroke:rgb(0,0,0);stroke-width:15;fill:rgb(220,220,220);" y1="401" y2="96" x1="94" x2="399" />
</g>
</svg>
Binary file not shown.
@@ -0,0 +1,8 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20001102//EN" "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
<svg xmlns="http://www.w3.org/2000/svg" width="500" x="0" y="0" height="500" id="/hardmnt/janacek0/ssi/blazek/inst/qgis/cvs/plugins/grass/modules/r.to.vect.line.2" >
<rect width="500" x="0" y="0" height="500" style="stroke:rgb(0,0,0);stroke-width:0;fill:rgb(255,255,255);" />
<g style="stroke:rgb(0,0,0);stroke-width:0.9;fill:none;" >
<line transform="translate(0.331263 0.331263)" style="stroke:rgb(0,0,0);stroke-width:15;fill:rgb(220,220,220);" y1="401" y2="96" x1="94" x2="399" />
</g>
</svg>
Binary file not shown.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1,8 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20001102//EN" "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
<svg xmlns="http://www.w3.org/2000/svg" width="500" x="0" y="0" height="500" id="/hardmnt/janacek0/ssi/blazek/inst/qgis/cvs/plugins/grass/modules/r.to.vect.line.2" >
<rect width="500" x="0" y="0" height="500" style="stroke:rgb(0,0,0);stroke-width:0;fill:rgb(255,255,255);" />
<g style="stroke:rgb(0,0,0);stroke-width:0.9;fill:none;" >
<line transform="translate(0.331263 0.331263)" style="stroke:rgb(0,0,0);stroke-width:15;fill:rgb(220,220,220);" y1="401" y2="96" x1="94" x2="399" />
</g>
</svg>
Binary file not shown.
@@ -0,0 +1,8 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20001102//EN" "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001102.dtd">
<svg xmlns="http://www.w3.org/2000/svg" width="500" x="0" y="0" height="500" id="/hardmnt/janacek0/ssi/blazek/inst/qgis/cvs/plugins/grass/modules/r.to.vect.line.2" >
<rect width="500" x="0" y="0" height="500" style="stroke:rgb(0,0,0);stroke-width:0;fill:rgb(255,255,255);" />
<g style="stroke:rgb(0,0,0);stroke-width:0.9;fill:none;" >
<line transform="translate(0.331263 0.331263)" style="stroke:rgb(0,0,0);stroke-width:15;fill:rgb(220,220,220);" y1="401" y2="96" x1="94" x2="399" />
</g>
</svg>
Binary file not shown.
@@ -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>
@@ -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 not shown.
Binary file not shown.
@@ -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.