Skip to content

Commit 5975031

Browse files
author
rugginoso
committed
Changed some grass modules to work with grass 6.4 and guarantee the compatibility with previous versions. Fixed #1629.
git-svn-id: http://svn.osgeo.org/qgis/trunk@10903 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 535490a commit 5975031

23 files changed

+91
-8
lines changed

‎cmake/FindGRASS.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,15 @@ ENDIF (WITH_GRASS)
6666

6767
IF (GRASS_FOUND)
6868
FILE(READ ${GRASS_INCLUDE_DIR}/grass/version.h VERSIONFILE)
69+
# We can avoid the following block using version_less version_equal and
70+
# version_greater. Are there compatibility problems?
6971
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[^ ]+" GRASS_VERSION ${VERSIONFILE})
72+
STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\..*$" "\\1" GRASS_MAJOR_VERSION ${GRASS_VERSION})
73+
STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\..*$" "\\1" GRASS_MINOR_VERSION ${GRASS_VERSION})
74+
STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.(.*)$" "\\1" GRASS_MICRO_VERSION ${GRASS_VERSION})
75+
# Add micro version too?
76+
# How to numerize RC versions?
77+
MATH( EXPR GRASS_NUM_VERSION "${GRASS_MAJOR_VERSION}*10000 + ${GRASS_MINOR_VERSION}*100")
7078

7179
IF (NOT GRASS_FIND_QUIETLY)
7280
MESSAGE(STATUS "Found GRASS: ${GRASS_PREFIX} (${GRASS_VERSION})")

‎src/plugins/grass/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
SUBDIRS(config modules scripts themes)
2+
SUBDIRS(config modules modules-old scripts themes)
33

44
ADD_DEFINITIONS(-DGRASS_BASE=\\\"${GRASS_PREFIX}\\\")
55
ADD_DEFINITIONS(-DHAVE_OPENPTY=${HAVE_OPENPTY})

‎src/plugins/grass/modules-old/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
IF ( GRASS_NUM_VERSION LESS 60400 )
2+
FILE (GLOB MODULE_FILES *.qgm *.svg *.png)
3+
INSTALL (FILES ${MODULE_FILES}
4+
DESTINATION ${QGIS_DATA_DIR}/grass/modules)
5+
ENDIF ( GRASS_NUM_VERSION LESS 60400 )
6+

‎src/plugins/grass/modules-old/r.surf.fractal.1.png

25.3 KB
Loading

‎src/plugins/grass/modules-old/r.surf.fractal.2.png

25.6 KB
Loading

‎src/plugins/grass/modules-old/r.surf.fractal.qgm

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Create fractal surface of given fractal dimension" module="r.surf.fractal">
5+
<option key="d" />
6+
<option key="n" />
7+
<option key="out" />
8+
</qgisgrassmodule>

‎src/plugins/grass/modules-old/v.buffer.1.svg

+13
Loading

‎src/plugins/grass/modules-old/v.buffer.2.svg

+14
Loading

‎src/plugins/grass/modules-old/v.buffer.qgm

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Vector buffer" module="v.buffer">
5+
<option key="input" typeoption="type" layeroption="layer" />
6+
<option key="buffer"/>
7+
<option key="output" />
8+
</qgisgrassmodule>

‎src/plugins/grass/modules-old/v.db.select.1.png

34.2 KB
Loading

‎src/plugins/grass/modules-old/v.db.select.2.png

7.16 KB
Loading

‎src/plugins/grass/modules-old/v.db.select.qgm

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Display vector attributes" module="v.db.select">
5+
<option key="map" layeroption="layer" />
6+
<field key="column" layer="map" type="integer,double,varchar"/>
7+
<option key="fs" answer="|" hidden="yes" />
8+
</qgisgrassmodule>

‎src/plugins/grass/modules-old/v.db.select.where.1.png

34.2 KB
Loading

‎src/plugins/grass/modules-old/v.db.select.where.2.png

13.2 KB
Loading

‎src/plugins/grass/modules-old/v.db.select.where.qgm

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Display vector map attributes with SQL" module="v.db.select">
5+
<option key="map" layeroption="layer" />
6+
<field key="column" layer="map" type="integer,double,varchar"/>
7+
<option key="where" />
8+
<option key="fs" answer="|" hidden="yes" />
9+
</qgisgrassmodule>

‎src/plugins/grass/modules-old/v.to.db.1.png

13.3 KB
Loading

‎src/plugins/grass/modules-old/v.to.db.2.png

14.4 KB
Loading

‎src/plugins/grass/modules-old/v.to.db.qgm

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
3+
4+
<qgisgrassmodule label="Put geometry variables in database" module="v.to.db">
5+
<option key="map" layeroption="layer"/>
6+
<option key="option"/>
7+
<option key="units"/>
8+
<field key="column" layer="map" type="integer,double" label="Attribute field" />
9+
</qgisgrassmodule>

‎src/plugins/grass/modules/r.surf.fractal.qgm

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
33

44
<qgisgrassmodule label="Create fractal surface of given fractal dimension" module="r.surf.fractal">
5-
<option key="d" />
6-
<option key="n" />
7-
<option key="out" />
5+
<option key="dimension" />
6+
<option key="number" />
7+
<option key="output" />
88
</qgisgrassmodule>

‎src/plugins/grass/modules/v.buffer.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
<qgisgrassmodule label="Vector buffer" module="v.buffer">
55
<option key="input" typeoption="type" layeroption="layer" />
6-
<option key="buffer"/>
6+
<option key="distance"/>
77
<option key="output" />
88
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.select.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
<qgisgrassmodule label="Display vector attributes" module="v.db.select">
55
<option key="map" layeroption="layer" />
6-
<field key="column" layer="map" type="integer,double,varchar"/>
6+
<field key="columns" layer="map" type="integer,double,varchar"/>
77
<option key="fs" answer="|" hidden="yes" />
88
</qgisgrassmodule>

‎src/plugins/grass/modules/v.db.select.where.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<qgisgrassmodule label="Display vector map attributes with SQL" module="v.db.select">
55
<option key="map" layeroption="layer" />
6-
<field key="column" layer="map" type="integer,double,varchar"/>
6+
<field key="columns" layer="map" type="integer,double,varchar"/>
77
<option key="where" />
88
<option key="fs" answer="|" hidden="yes" />
99
</qgisgrassmodule>

‎src/plugins/grass/modules/v.to.db.qgm

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<option key="map" layeroption="layer"/>
66
<option key="option"/>
77
<option key="units"/>
8-
<field key="column" layer="map" type="integer,double" label="Attribute field" />
8+
<field key="columns" layer="map" type="integer,double" label="Attribute field" />
99
</qgisgrassmodule>

0 commit comments

Comments
 (0)