Skip to content

Commit

Permalink
Merge branch 'NINAnor-grass7_pluginupdate'
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Aug 31, 2015
2 parents 6b16826 + 5eac108 commit 9a89d52
Show file tree
Hide file tree
Showing 46 changed files with 635 additions and 25 deletions.
114 changes: 89 additions & 25 deletions src/plugins/grass/modules/default.qgc
View file
Expand Up @@ -25,7 +25,7 @@
<section label="File management">
<section label="Import into GRASS">
<section label="Import raster into GRASS">
<section label="Import raster into GRASS from QGIS view">
<section label="Import raster into GRASS from QGIS view">
<grass name="r.in.gdal.qgis"/>
<grass name="r.in.gdal.qgis.loc"/>
</section>
Expand All @@ -51,20 +51,20 @@
</section>
</section>
<section label="Import vector into GRASS">
<grass name="v.in.ogr.qgis"/>
<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.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.ascii"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin" version_max="6.4"/>
<grass name="v.in.gpsbabel" version_max="6.4"/>
<grass name="v.in.geonames" version_min="6.4"/>
<grass name="v.in.gns" version_max="6.4"/>
<grass name="v.in.ogr.qgis"/>
<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.dxf"/>
<grass name="v.in.e00"/>
<grass name="v.in.ascii"/>
<grass name="v.in.mapgen"/>
<grass name="v.in.db"/>
<grass name="v.in.garmin" version_max="6.4"/>
<grass name="v.in.gpsbabel" version_max="6.4"/>
<grass name="v.in.geonames" version_min="6.4"/>
<grass name="v.in.gns" version_max="6.4"/>
</section>
<section label="Import from database into GRASS">
<grass name="db.in.ogr"/>
Expand Down Expand Up @@ -192,14 +192,14 @@
<grass name="v.neighbors"/>
</section>
<section label="Overlay maps">
<grass name="r.cross"/>
<grass name="r.series"/>
<grass name="r.patch"/>
<grass name="r.cross"/>
<grass name="r.series"/>
<grass name="r.patch"/>
<grass name="r.statistics"/>
</section>
<section label="Solar and irradiation model">
<grass name="r.sunmask.position"/>
<grass name="r.sunmask.date.time"/>
<grass name="r.sunmask.position"/>
<grass name="r.sunmask.date.time"/>
</section>
<section label="Terrain analysis">
<grass name="r.cost.coord"/>
Expand Down Expand Up @@ -377,7 +377,7 @@
<grass name="v.net.steiner"/>
</section>
<section label="Overlay">
<grass name="v.patch"/>
<grass name="v.patch"/>
<grass name="v.overlay.or"/>
<grass name="v.overlay.and"/>
<grass name="v.overlay.not"/>
Expand Down Expand Up @@ -461,6 +461,70 @@
</section>
</section>

<section label="Temporal" version_min="7.0">
<section label="Manage datasets" version_min="7.0">
<grass name="t.create" version_min="7.0"/>
<grass name="t.rename" version_min="7.0"/>
<grass name="t.remove" version_min="7.0"/>
<grass name="t.support" version_min="7.0"/>
<grass name="t.merge" version_min="7.0"/>
<grass name="t.shift" version_min="7.0"/>
<grass name="t.snap" version_min="7.0"/>
<grass name="t.list" version_min="7.0"/>
<grass name="t.connect" version_min="7.0"/>
<grass name="t.select" version_min="7.0"/>
</section>
<section label="Manage maps in datasets" version_min="7.0">
<grass name="t.register" version_min="7.0"/>
<grass name="t.unregister" version_min="7.0"/>
<grass name="t.vect.list" version_min="7.0"/>
<grass name="t.rast.list" version_min="7.0"/>
<grass name="t.rast3d.list" version_min="7.0"/>
</section>
<section label="Import" version_min="7.0">
<grass name="t.rast.import" version_min="7.0"/>
<grass name="t.vect.import" version_min="7.0"/>
</section>
<section label="Export" version_min="7.0">
<grass name="t.rast.export" version_min="7.0"/>
<grass name="t.rast.out.vtk" version_min="7.0"/>
<grass name="t.vect.export" version_min="7.0"/>
</section>
<grass name="t.rast.to.rast3" version_min="7.0"/>
<section label="Extraction" version_min="7.0">
<grass name="t.rast.extract" version_min="7.0"/>
<grass name="t.rast3d.extract" version_min="7.0"/>
<grass name="t.vect.extract" version_min="7.0"/>
</section>
<grass name="t.vect.db.select" version_min="7.0"/>
<grass name="t.rast.colors.predefined" version_min="7.0"/>
<grass name="t.rast.colors.copy" version_min="7.0"/>
<grass name="t.rast.colors.rules" version_min="7.0"/>
<grass name="t.rast.mapcalc" version_min="7.0"/>
<grass name="t.rast3d.mapcalc" version_min="7.0"/>
<grass name="t.rast.gapfill" version_min="7.0"/>
<section label="Aggregation" version_min="7.0">
<grass name="t.rast.neighbors" version_min="7.0"/>
<grass name="t.rast.series" version_min="7.0"/>
<grass name="t.rast.aggregate" version_min="7.0"/>
<grass name="t.rast.aggregate.ds" version_min="7.0"/>
<grass name="t.rast.accdetect" version_min="7.0"/>
<grass name="t.rast.accumulate" version_min="7.0"/>
</section>
<section label="Sampling" version_min="7.0">
<grass name="t.sample" version_min="7.0"/>
<grass name="t.vect.what.strds" version_min="7.0"/>
<grass name="t.vect.observe.strds" version_min="7.0"/>
</section>
<section label="Report and statistics" version_min="7.0">
<grass name="t.info" version_min="7.0"/>
<grass name="t.rast.univar" version_min="7.0"/>
<grass name="t.rast3d.univar" version_min="7.0"/>
<grass name="t.vect.univar" version_min="7.0"/>
<grass name="t.topology" version_min="7.0"/>
</section>
</section>

<section label="Database">
<section label="Database management">
<grass name="db.connect"/>
Expand All @@ -475,14 +539,14 @@
<grass name="v.db.droptable"/>
</section>
<section label="Columns management">
<grass name="v.db.addcol" version_max="6.4"/>
<grass name="v.db.addcolumn" version_min="7.0"/>
<grass name="v.db.addcol" version_max="6.4"/>
<grass name="v.db.addcolumn" version_min="7.0"/>
<grass name="v.db.update_const"/>
<grass name="v.db.update_query"/>
<grass name="v.db.update_op"/>
<grass name="v.db.update_op_query"/>
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
<grass name="v.db.dropcolumn" version_min="7.0"/>
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
<grass name="v.db.dropcolumn" version_min="7.0"/>
<grass name="v.db.renamecol"/>
<grass name="db.execute"/>
<grass name="db.select"/>
Expand Down
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/t.connect.qgm
View file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Prints/sets general temporal GIS database connection for current mapset" module="t.connect">
<option key="driver"/>
<option key="database"/>
<flag key="p" hidden="no" advanced="yes"/>
<flag key="c" hidden="no" advanced="yes"/>
<flag key="d" hidden="no" advanced="yes"/>
<flag key="g" hidden="no" advanced="yes"/>
</qgisgrassmodule>
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/t.create.qgm
View file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Creates a space time dataset" module="t.create">
<option key="output"/>
<option key="type"/>
<option key="temporaltype"/>
<option key="semantictype"/>
<option key="title"/>
<option key="description"/>
</qgisgrassmodule>
10 changes: 10 additions & 0 deletions src/plugins/grass/modules/t.info.qgm
View file
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Lists information about space time datasets and maps" module="t.info">
<option key="input"/>
<option key="type"/>
<flag key="h" hidden="no"/>
<flag key="s" hidden="no"/>
<flag key="g" hidden="no" advanced="yes"/>
</qgisgrassmodule>
12 changes: 12 additions & 0 deletions src/plugins/grass/modules/t.list.qgm
View file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Lists space time datasets and maps registered in the temporal database" module="t.list">
<option key="type"/>
<option key="temporaltype"/>
<option key="order" advanced="yes"/>
<option key="columns" advanced="yes"/>
<option key="where" advanced="yes"/>
<option key="separator" advanced="yes"/>
<flag key="c" hidden="no" advanced="yes"/>
</qgisgrassmodule>
8 changes: 8 additions & 0 deletions src/plugins/grass/modules/t.merge.qgm
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Merges several space time datasets into a single space time dataset." module="t.merge">
<option key="inputs"/>
<option key="type"/>
<option key="output"/>
</qgisgrassmodule>
19 changes: 19 additions & 0 deletions src/plugins/grass/modules/t.rast.accdetect.qgm
View file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Detects accumulation patterns in temporally accumulated space time raster datasets created by t.rast.accumulate" module="t.rast.accdetect">
<option key="input"/>
<option key="basename"/>
<option key="occurrence"/>
<option key="indicator" advanced="yes"/>
<option key="minimum" advanced="yes"/>
<option key="maximum" advanced="yes"/>
<option key="start"/>
<option key="stop" advanced="yes"/>
<option key="cycle"/>
<option key="offset" advanced="yes"/>
<option key="range" advanced="yes"/>
<option key="staend" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
</qgisgrassmodule>
21 changes: 21 additions & 0 deletions src/plugins/grass/modules/t.rast.accumulate.qgm
View file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Computes cyclic accumulations of a space time raster dataset" module="t.rast.accumulate">
<option key="input"/>
<option key="output"/>
<option key="basename"/>
<option key="granularity"/>
<option key="method"/>
<option key="lower"/>
<option key="upper"/>
<option key="start"/>
<option key="stop"/>
<option key="cycle"/>
<option key="offset" advanced="yes"/>
<option key="limits" advanced="yes"/>
<option key="shift" advanced="yes"/>
<option key="scale" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
</qgisgrassmodule>
17 changes: 17 additions & 0 deletions src/plugins/grass/modules/t.rast.aggregate.ds.qgm
View file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Aggregates data of an existing space time raster dataset using the time intervals of a second space time dataset" module="t.rast.aggregate.ds">
<option key="input"/>
<option key="output"/>
<option key="basename"/>
<option key="sample"/>
<option key="type"/>
<option key="method"/>
<flag key="s" hidden="no" answer="on" advanced="yes"/>
<option key="where" advanced="yes"/>
<option key="sampling" advanced="yes"/>
<option key="nprocs" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
<option key="offset" hidden="yes" advanced="yes"/>
</qgisgrassmodule>
16 changes: 16 additions & 0 deletions src/plugins/grass/modules/t.rast.aggregate.qgm
View file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Aggregates temporally the maps of a space time raster dataset by a user defined granularity" module="t.rast.aggregate">
<option key="input"/>
<option key="output"/>
<option key="basename"/>
<option key="granularity"/>
<option key="method"/>
<flag key="s" hidden="no" answer="on" advanced="yes"/>
<option key="where" advanced="yes"/>
<option key="sampling" advanced="yes"/>
<option key="nprocs" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
<option key="offset" hidden="yes" advanced="yes"/>
</qgisgrassmodule>
15 changes: 15 additions & 0 deletions src/plugins/grass/modules/t.rast.colors.copy.qgm
View file
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Assignes a color table from an existing raster or raster3d map to each raster map of the space time raster dataset" module="t.rast.colors">
<option key="input"/>
<option key="raster"/>
<option key="raster_3d"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="w" hidden="no" advanced="yes"/>
<flag key="l" hidden="no" advanced="yes"/>
<flag key="n" hidden="no"/>
<flag key="g" hidden="no"/>
<flag key="a" hidden="no" advanced="yes"/>
<flag key="e" hidden="no"/>
</qgisgrassmodule>
14 changes: 14 additions & 0 deletions src/plugins/grass/modules/t.rast.colors.predefined.qgm
View file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Assignes a predefined color table to each raster map of the space time raster dataset" module="t.rast.colors">
<option key="input"/>
<option key="color"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="w" hidden="no" advanced="yes"/>
<flag key="l" hidden="no" advanced="yes"/>
<flag key="n" hidden="no"/>
<flag key="g" hidden="no"/>
<flag key="a" hidden="no" advanced="yes"/>
<flag key="e" hidden="no"/>
</qgisgrassmodule>
14 changes: 14 additions & 0 deletions src/plugins/grass/modules/t.rast.colors.rules.qgm
View file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Creates / modifies the color table for each raster map of the space time raster dataset according to user defined rules" module="t.rast.colors">
<option key="input"/>
<file key="rules" type="old" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="w" hidden="no" advanced="yes"/>
<flag key="l" hidden="no" advanced="yes"/>
<flag key="n" hidden="no"/>
<flag key="g" hidden="no"/>
<flag key="a" hidden="no"/>
<flag key="e" hidden="no"/>
</qgisgrassmodule>
11 changes: 11 additions & 0 deletions src/plugins/grass/modules/t.rast.export.qgm
View file
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Exports space time raster dataset" module="t.rast.export">
<option key="input"/>
<option key="output"/>
<option key="where"/>
<option key="directory" advanced="yes"/>
<option key="compression" advanced="yes"/>
<option key="format" advanced="yes"/>
</qgisgrassmodule>
12 changes: 12 additions & 0 deletions src/plugins/grass/modules/t.rast.extract.qgm
View file
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Extracts a subset of a space time raster dataset" module="t.rast.extract">
<option key="input"/>
<option key="output"/>
<option key="basename"/>
<option key="where"/>
<option key="expression"/>
<option key="nprocs" advanced="yes"/>
<flag key="n" hidden="no" advanced="yes"/>
</qgisgrassmodule>
10 changes: 10 additions & 0 deletions src/plugins/grass/modules/t.rast.gapfill.qgm
View file
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Replaces gaps in a space time raster dataset with interpolated raster maps" module="t.rast.gapfill">
<option key="input"/>
<option key="where"/>
<option key="basename"/>
<flag key="t" hidden="no"/>
<option key="nprocs" advanced="yes"/>
</qgisgrassmodule>
17 changes: 17 additions & 0 deletions src/plugins/grass/modules/t.rast.import.qgm
View file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Imports space time raster dataset" module="t.rast.import">
<option key="input"/>
<option key="output"/>
<option key="basename"/>
<option key="title"/>
<option key="description"/>
<flag key="l" hidden="no"/>
<flag key="o" hidden="no"/>
<option key="directory" advanced="yes"/>
<option key="location" advanced="yes"/>
<flag key="c" hidden="no" advanced="yes"/>
<flag key="r" hidden="no" advanced="yes"/>
<flag key="e" hidden="no" advanced="yes"/>
</qgisgrassmodule>

0 comments on commit 9a89d52

Please sign in to comment.