Skip to content

Commit 9a89d52

Browse files
blazekblazek
committedAug 31, 2015
Merge branch 'NINAnor-grass7_pluginupdate'
·
ltr-3_40archive/master_2
2 parents 6b16826 + 5eac108 commit 9a89d52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+635
-25
lines changed
 

‎src/plugins/grass/modules/default.qgc

Lines changed: 89 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<section label="File management">
2626
<section label="Import into GRASS">
2727
<section label="Import raster into GRASS">
28-
<section label="Import raster into GRASS from QGIS view">
28+
<section label="Import raster into GRASS from QGIS view">
2929
<grass name="r.in.gdal.qgis"/>
3030
<grass name="r.in.gdal.qgis.loc"/>
3131
</section>
@@ -51,20 +51,20 @@
5151
</section>
5252
</section>
5353
<section label="Import vector into GRASS">
54-
<grass name="v.in.ogr.qgis"/>
55-
<grass name="v.in.ogr"/>
56-
<grass name="v.in.ogr.loc"/>
57-
<grass name="v.in.ogr.all"/>
58-
<grass name="v.in.ogr.all.loc"/>
59-
<grass name="v.in.dxf"/>
60-
<grass name="v.in.e00"/>
61-
<grass name="v.in.ascii"/>
62-
<grass name="v.in.mapgen"/>
63-
<grass name="v.in.db"/>
64-
<grass name="v.in.garmin" version_max="6.4"/>
65-
<grass name="v.in.gpsbabel" version_max="6.4"/>
66-
<grass name="v.in.geonames" version_min="6.4"/>
67-
<grass name="v.in.gns" version_max="6.4"/>
54+
<grass name="v.in.ogr.qgis"/>
55+
<grass name="v.in.ogr"/>
56+
<grass name="v.in.ogr.loc"/>
57+
<grass name="v.in.ogr.all"/>
58+
<grass name="v.in.ogr.all.loc"/>
59+
<grass name="v.in.dxf"/>
60+
<grass name="v.in.e00"/>
61+
<grass name="v.in.ascii"/>
62+
<grass name="v.in.mapgen"/>
63+
<grass name="v.in.db"/>
64+
<grass name="v.in.garmin" version_max="6.4"/>
65+
<grass name="v.in.gpsbabel" version_max="6.4"/>
66+
<grass name="v.in.geonames" version_min="6.4"/>
67+
<grass name="v.in.gns" version_max="6.4"/>
6868
</section>
6969
<section label="Import from database into GRASS">
7070
<grass name="db.in.ogr"/>
@@ -192,14 +192,14 @@
192192
<grass name="v.neighbors"/>
193193
</section>
194194
<section label="Overlay maps">
195-
<grass name="r.cross"/>
196-
<grass name="r.series"/>
197-
<grass name="r.patch"/>
195+
<grass name="r.cross"/>
196+
<grass name="r.series"/>
197+
<grass name="r.patch"/>
198198
<grass name="r.statistics"/>
199199
</section>
200200
<section label="Solar and irradiation model">
201-
<grass name="r.sunmask.position"/>
202-
<grass name="r.sunmask.date.time"/>
201+
<grass name="r.sunmask.position"/>
202+
<grass name="r.sunmask.date.time"/>
203203
</section>
204204
<section label="Terrain analysis">
205205
<grass name="r.cost.coord"/>
@@ -377,7 +377,7 @@
377377
<grass name="v.net.steiner"/>
378378
</section>
379379
<section label="Overlay">
380-
<grass name="v.patch"/>
380+
<grass name="v.patch"/>
381381
<grass name="v.overlay.or"/>
382382
<grass name="v.overlay.and"/>
383383
<grass name="v.overlay.not"/>
@@ -461,6 +461,70 @@
461461
</section>
462462
</section>
463463

464+
<section label="Temporal" version_min="7.0">
465+
<section label="Manage datasets" version_min="7.0">
466+
<grass name="t.create" version_min="7.0"/>
467+
<grass name="t.rename" version_min="7.0"/>
468+
<grass name="t.remove" version_min="7.0"/>
469+
<grass name="t.support" version_min="7.0"/>
470+
<grass name="t.merge" version_min="7.0"/>
471+
<grass name="t.shift" version_min="7.0"/>
472+
<grass name="t.snap" version_min="7.0"/>
473+
<grass name="t.list" version_min="7.0"/>
474+
<grass name="t.connect" version_min="7.0"/>
475+
<grass name="t.select" version_min="7.0"/>
476+
</section>
477+
<section label="Manage maps in datasets" version_min="7.0">
478+
<grass name="t.register" version_min="7.0"/>
479+
<grass name="t.unregister" version_min="7.0"/>
480+
<grass name="t.vect.list" version_min="7.0"/>
481+
<grass name="t.rast.list" version_min="7.0"/>
482+
<grass name="t.rast3d.list" version_min="7.0"/>
483+
</section>
484+
<section label="Import" version_min="7.0">
485+
<grass name="t.rast.import" version_min="7.0"/>
486+
<grass name="t.vect.import" version_min="7.0"/>
487+
</section>
488+
<section label="Export" version_min="7.0">
489+
<grass name="t.rast.export" version_min="7.0"/>
490+
<grass name="t.rast.out.vtk" version_min="7.0"/>
491+
<grass name="t.vect.export" version_min="7.0"/>
492+
</section>
493+
<grass name="t.rast.to.rast3" version_min="7.0"/>
494+
<section label="Extraction" version_min="7.0">
495+
<grass name="t.rast.extract" version_min="7.0"/>
496+
<grass name="t.rast3d.extract" version_min="7.0"/>
497+
<grass name="t.vect.extract" version_min="7.0"/>
498+
</section>
499+
<grass name="t.vect.db.select" version_min="7.0"/>
500+
<grass name="t.rast.colors.predefined" version_min="7.0"/>
501+
<grass name="t.rast.colors.copy" version_min="7.0"/>
502+
<grass name="t.rast.colors.rules" version_min="7.0"/>
503+
<grass name="t.rast.mapcalc" version_min="7.0"/>
504+
<grass name="t.rast3d.mapcalc" version_min="7.0"/>
505+
<grass name="t.rast.gapfill" version_min="7.0"/>
506+
<section label="Aggregation" version_min="7.0">
507+
<grass name="t.rast.neighbors" version_min="7.0"/>
508+
<grass name="t.rast.series" version_min="7.0"/>
509+
<grass name="t.rast.aggregate" version_min="7.0"/>
510+
<grass name="t.rast.aggregate.ds" version_min="7.0"/>
511+
<grass name="t.rast.accdetect" version_min="7.0"/>
512+
<grass name="t.rast.accumulate" version_min="7.0"/>
513+
</section>
514+
<section label="Sampling" version_min="7.0">
515+
<grass name="t.sample" version_min="7.0"/>
516+
<grass name="t.vect.what.strds" version_min="7.0"/>
517+
<grass name="t.vect.observe.strds" version_min="7.0"/>
518+
</section>
519+
<section label="Report and statistics" version_min="7.0">
520+
<grass name="t.info" version_min="7.0"/>
521+
<grass name="t.rast.univar" version_min="7.0"/>
522+
<grass name="t.rast3d.univar" version_min="7.0"/>
523+
<grass name="t.vect.univar" version_min="7.0"/>
524+
<grass name="t.topology" version_min="7.0"/>
525+
</section>
526+
</section>
527+
464528
<section label="Database">
465529
<section label="Database management">
466530
<grass name="db.connect"/>
@@ -475,14 +539,14 @@
475539
<grass name="v.db.droptable"/>
476540
</section>
477541
<section label="Columns management">
478-
<grass name="v.db.addcol" version_max="6.4"/>
479-
<grass name="v.db.addcolumn" version_min="7.0"/>
542+
<grass name="v.db.addcol" version_max="6.4"/>
543+
<grass name="v.db.addcolumn" version_min="7.0"/>
480544
<grass name="v.db.update_const"/>
481545
<grass name="v.db.update_query"/>
482546
<grass name="v.db.update_op"/>
483547
<grass name="v.db.update_op_query"/>
484-
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
485-
<grass name="v.db.dropcolumn" version_min="7.0"/>
548+
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
549+
<grass name="v.db.dropcolumn" version_min="7.0"/>
486550
<grass name="v.db.renamecol"/>
487551
<grass name="db.execute"/>
488552
<grass name="db.select"/>

‎src/plugins/grass/modules/t.connect.qgm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Prints/sets general temporal GIS database connection for current mapset" module="t.connect">
5+
<option key="driver"/>
6+
<option key="database"/>
7+
<flag key="p" hidden="no" advanced="yes"/>
8+
<flag key="c" hidden="no" advanced="yes"/>
9+
<flag key="d" hidden="no" advanced="yes"/>
10+
<flag key="g" hidden="no" advanced="yes"/>
11+
</qgisgrassmodule>

0 commit comments

Comments
 (0)
Please sign in to comment.