Skip to content

Commit 539c952

Browse files
blazekblazek
committedAug 31, 2015
[GRASS] Update and adaptation of GRASS plugin modules to GRASS 7
2 parents 9a12012 + 6e4c4f3 commit 539c952

Some content is hidden

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

44 files changed

+236
-145
lines changed
 

‎src/plugins/grass/modules/db.out.ogr.qgm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
55
<option key="input" />
6-
<file key="dsn" type="new" version_max="6.4"/>
7-
<file key="output" type="new" version_min="7.0"/>
6+
<file key="dsn" type="new" version_max="6"/>
7+
<file key="output" type="new" version_min="7"/>
88
<option key="format" />
9-
<option key="db_table" version_max="6.4"/>
10-
<option key="table" version_min="7.0"/>
9+
<option key="db_table" version_max="6"/>
10+
<option key="table" version_min="7"/>
1111
</qgisgrassmodule>

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

Lines changed: 11 additions & 9 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,7 +51,7 @@
5151
</section>
5252
</section>
5353
<section label="Import vector into GRASS">
54-
<grass name="v.in.ogr.qgis"/>
54+
<grass name="v.in.ogr.qgis"/>
5555
<grass name="v.in.ogr"/>
5656
<grass name="v.in.ogr.loc"/>
5757
<grass name="v.in.ogr.all"/>
@@ -268,19 +268,19 @@
268268
<grass name="v.surf.bspline"/>
269269
<grass name="v.surf.idw"/>
270270
<grass name="v.surf.rst"/>
271-
<grass name="r.bilinear" version_min="6.4"/>
272-
<grass name="r.surf.idw"/>
273-
<grass name="r.surf.idw2"/>
271+
<grass name="r.bilinear" version_min="6.4"/>
272+
<grass name="r.surf.idw"/>
273+
<grass name="r.surf.idw2"/>
274274
<grass name="r.fillnulls"/>
275-
<grass name="r.surf.contour"/>
275+
<grass name="r.surf.contour"/>
276276
</section>
277277
</section>
278278
<section label="Reports and statistics">
279279
<section label="Reports">
280280
<grass name="r.category"/>
281281
</section>
282282
<section label="Statistics">
283-
<grass name="r.stats"/>
283+
<grass name="r.stats"/>
284284
<grass name="r.sum"/>
285285
<grass name="r.report"/>
286286
<grass name="r.average"/>
@@ -475,12 +475,14 @@
475475
<grass name="v.db.droptable"/>
476476
</section>
477477
<section label="Columns management">
478-
<grass name="v.db.addcol"/>
478+
<grass name="v.db.addcol" version_max="6.4"/>
479+
<grass name="v.db.addcolumn" version_min="7.0"/>
479480
<grass name="v.db.update_const"/>
480481
<grass name="v.db.update_query"/>
481482
<grass name="v.db.update_op"/>
482483
<grass name="v.db.update_op_query"/>
483-
<grass name="v.db.dropcol" version_min="6.4"/>
484+
<grass name="v.db.dropcol" version_min="6.4" version_max="6.4"/>
485+
<grass name="v.db.dropcolumn" version_min="7.0"/>
484486
<grass name="v.db.renamecol"/>
485487
<grass name="db.execute"/>
486488
<grass name="db.select"/>

0 commit comments

Comments
 (0)
Please sign in to comment.