Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup and improvements to r.external, r.in.gdal, and v.in.ogr GRASS…
… modules
  • Loading branch information
pcav committed Mar 8, 2012
1 parent 3906922 commit 5bbb593
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 34 deletions.
9 changes: 5 additions & 4 deletions src/plugins/grass/modules/r.external.all.qgm
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link all GDAL supported rasters in a directory as GRASS rasters" module="r.external.all.py" manual="r.external">
<flag key="o"/>
<flag key="e"/>
<flag key="r"/>
<file key="input" type="directory" label="Directory of rasters to be linked"/>
<option key="band"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="r" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.external.qgis.qgm
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link GDAL supported raster loaded in QGIS as GRASS raster" module="r.external">
<flag key="o"/>
<flag key="e"/>
<gdal key="source" label="GDAL raster layer"/>
<option key="output"/>
<option key="band"/>
<option key="title"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
8 changes: 4 additions & 4 deletions src/plugins/grass/modules/r.external.qgm
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
<qgisgrassmodule label="Link GDAL supported raster as GRASS raster" module="r.external">
<flag key="o"/>
<flag key="e"/>
<file key="input"/>
<option key="output"/>
<option key="band"/>
<option key="title"/>
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
5 changes: 3 additions & 2 deletions src/plugins/grass/modules/r.in.gdal.loc.qgm
Expand Up @@ -2,9 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import GDAL supported raster and create a fitted location" module="r.in.gdal">
<flag key="o" answer="off" hidden="yes" />
<flag key="e" answer="on" hidden="yes" />
<file key="input" />
<option key="output" />
<option key="location" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
</qgisgrassmodule>
9 changes: 5 additions & 4 deletions src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm
Expand Up @@ -2,9 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded raster and create a fitted location" module="r.in.gdal">
<flag key="o" answer="off" hidden="yes" />
<flag key="e" answer="on" hidden="yes" />
<gdal key="input" label="GDAL raster layer" />
<option key="output" />
<gdal key="input" label="Loaded layer"/>
<option key="output" />
<option key="location" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
</qgisgrassmodule>
8 changes: 5 additions & 3 deletions src/plugins/grass/modules/r.in.gdal.qgis.qgm
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded raster" module="r.in.gdal">
<flag key="o" answer="on" hidden="yes" />
<flag key="e" answer="off" hidden="yes" />
<gdal key="input" label="GDAL raster layer" />
<gdal key="input" label="Loaded layer"/>
<option key="output" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
6 changes: 4 additions & 2 deletions src/plugins/grass/modules/r.in.gdal.qgm
Expand Up @@ -2,8 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import GDAL supported raster" module="r.in.gdal">
<flag key="o" answer="on" hidden="yes" />
<flag key="e" answer="off" hidden="yes" />
<file key="input" />
<option key="output" />
<option key="title" advanced="yes"/>
<option key="band" advanced="yes"/>
<flag key="o" advanced="yes"/>
<flag key="e" advanced="yes"/>
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/v.in.ogr.all.loc.qgm
Expand Up @@ -2,7 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<option key="dsn" label="Path to the OGR data source" />
<option key="output" />
<option key="location" />
Expand All @@ -11,4 +10,5 @@
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
2 changes: 1 addition & 1 deletion src/plugins/grass/modules/v.in.ogr.all.qgm
Expand Up @@ -2,12 +2,12 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<file key="dsn" type="directory" label="Path to the OGR data source" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
6 changes: 3 additions & 3 deletions src/plugins/grass/modules/v.in.ogr.loc.qgm
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR/PostGIS vector and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<file key="dsn" type="old" label="OGR file" />
<qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
<file key="dsn" />
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
Expand All @@ -12,4 +11,5 @@
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
Expand Up @@ -2,8 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr">
<flag key="o" answer="off" hidden="yes" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<option key="location" />
<option key="type" advanced="yes"/>
Expand All @@ -12,4 +11,5 @@
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgis.qgm
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="OGR vector layer" />
<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes" />
<flag key="e" answer="off" hidden="no" advanced="yes" />
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>
4 changes: 2 additions & 2 deletions src/plugins/grass/modules/v.in.ogr.qgm
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import OGR vector" module="v.in.ogr">
<flag key="o" answer="on" hidden="yes" />
<file key="dsn" type="old" label="OGR file" />
<file key="dsn" />
<option key="output" />
<option key="type" advanced="yes"/>
<flag key="z" answer="off" hidden="no" advanced="yes"/>
<flag key="e" answer="off" hidden="no" advanced="yes"/>
<option key="snap" advanced="yes" />
<option key="min_area" advanced="yes" />
<option key="where" advanced="yes"/>
<flag key="o" answer="on" advanced="yes" />
</qgisgrassmodule>

0 comments on commit 5bbb593

Please sign in to comment.