Skip to content
Permalink
Browse files

[GRASS] remove GRASS 6 support

  • Loading branch information
blazek committed Jul 12, 2017
1 parent 7cbf9df commit eb6301e023e8cfa9d83fbbfc6ca5797b62d8d535
Showing with 576 additions and 1,063 deletions.
  1. +8 −11 CMakeLists.txt
  2. +2 −15 cmake/FindGRASS.cmake
  3. +0 −5 debian/rules
  4. +0 −1 ms-windows/osgeo4w/package-nightly.cmd
  5. +0 −1 ms-windows/osgeo4w/package.cmd
  6. +1 −2 src/plugins/grass/modules/db.in.ogr.qgm
  7. +2 −4 src/plugins/grass/modules/db.out.ogr.qgm
  8. +1 −2 src/plugins/grass/modules/db.select.qgm
  9. +1 −2 src/plugins/grass/modules/g.region.multiple.raster.qgm
  10. +1 −2 src/plugins/grass/modules/g.region.multiple.vector.qgm
  11. +3 −7 src/plugins/grass/modules/i.fft.qgm
  12. +6 −12 src/plugins/grass/modules/i.his.rgb.qgm
  13. +3 −6 src/plugins/grass/modules/i.ifft.qgm
  14. +2 −6 src/plugins/grass/modules/i.image.mosaic.qgm
  15. +2 −4 src/plugins/grass/modules/i.in.spotvgt.qgm
  16. +2 −8 src/plugins/grass/modules/i.oif.qgm
  17. +6 −12 src/plugins/grass/modules/i.rgb.his.qgm
  18. +3 −11 src/plugins/grass/modules/i.tasscap4.qgm
  19. +3 −11 src/plugins/grass/modules/i.tasscap5.qgm
  20. +3 −11 src/plugins/grass/modules/i.tasscap7.qgm
  21. +1 −2 src/plugins/grass/modules/m.cogo.qgm
  22. +2 −4 src/plugins/grass/modules/m.proj.qgm
  23. +3 −6 src/plugins/grass/modules/r.basins.fill.qgm
  24. +2 −4 src/plugins/grass/modules/r.carve.qgm
  25. +2 −4 src/plugins/grass/modules/r.circle.qgm
  26. +2 −4 src/plugins/grass/modules/r.coin.qgm
  27. +1 −2 src/plugins/grass/modules/r.colors.stddev.qgm
  28. +3 −6 src/plugins/grass/modules/r.composite.qgm
  29. +4 −4 src/plugins/grass/modules/r.cost.coord.qgm
  30. +4 −4 src/plugins/grass/modules/r.cost.rast.qgm
  31. +2 −2 src/plugins/grass/modules/r.cost.vect.qgm
  32. +3 −3 src/plugins/grass/modules/r.describe.qgm
  33. +7 −7 src/plugins/grass/modules/r.distance.qgm
  34. +2 −2 src/plugins/grass/modules/r.drain.qgm
  35. +4 −4 src/plugins/grass/modules/r.fill.dir.qgm
  36. +12 −12 src/plugins/grass/modules/r.his.qgm
  37. +8 −8 src/plugins/grass/modules/r.in.ascii.qgm
  38. +18 −18 src/plugins/grass/modules/r.in.wms.qgm
  39. +2 −2 src/plugins/grass/modules/r.in.xyz.qgm
  40. +1 −1 src/plugins/grass/modules/r.info.qgm
  41. +4 −4 src/plugins/grass/modules/r.lake.seed.qgm
  42. +6 −6 src/plugins/grass/modules/r.lake.xy.qgm
  43. +4 −4 src/plugins/grass/modules/r.out.ascii.qgm
  44. +2 −2 src/plugins/grass/modules/r.out.mpeg.qgm
  45. +4 −4 src/plugins/grass/modules/r.out.pov.qgm
  46. +2 −2 src/plugins/grass/modules/r.out.ppm.qgm
  47. +4 −4 src/plugins/grass/modules/r.out.vrml.qgm
  48. +6 −6 src/plugins/grass/modules/r.out.vtk.qgm
  49. +2 −2 src/plugins/grass/modules/r.out.xyz.qgm
  50. +2 −2 src/plugins/grass/modules/r.param.scale.qgm
  51. +2 −2 src/plugins/grass/modules/r.plane.qgm
  52. +4 −4 src/plugins/grass/modules/r.random.qgm
  53. +4 −4 src/plugins/grass/modules/r.random.raster.qgm
  54. +3 −3 src/plugins/grass/modules/r.reclass.area.greater.qgm
  55. +3 −3 src/plugins/grass/modules/r.reclass.area.lesser.qgm
  56. +4 −4 src/plugins/grass/modules/r.regression.line.qgm
  57. +2 −2 src/plugins/grass/modules/r.resamp.rst.qgm
  58. +4 −4 src/plugins/grass/modules/r.stats.qgm
  59. +3 −3 src/plugins/grass/modules/r.surf.area.qgm
  60. +6 −6 src/plugins/grass/modules/r.surf.fractal.qgm
  61. +10 −10 src/plugins/grass/modules/r.texture.bis.qgm
  62. +10 −10 src/plugins/grass/modules/r.texture.qgm
  63. +2 −2 src/plugins/grass/modules/r.to.vect.area.qgm
  64. +2 −2 src/plugins/grass/modules/r.to.vect.line.qgm
  65. +2 −2 src/plugins/grass/modules/r.to.vect.point.qgm
  66. +2 −2 src/plugins/grass/modules/r.volume.qgm
  67. +4 −4 src/plugins/grass/modules/r.walk.coord.qgm
  68. +2 −2 src/plugins/grass/modules/r.walk.vect.qgm
  69. +7 −7 src/plugins/grass/modules/r.water.outlet.qgm
  70. +9 −9 src/plugins/grass/modules/r.what.coordinates.qgm
  71. +2 −2 src/plugins/grass/modules/v.buffer.qgm
  72. +2 −2 src/plugins/grass/modules/v.clean.chdangles.qgm
  73. +2 −2 src/plugins/grass/modules/v.clean.prune.qgm
  74. +2 −2 src/plugins/grass/modules/v.clean.rmarea.qgm
  75. +2 −2 src/plugins/grass/modules/v.clean.rmdangles.qgm
  76. +2 −2 src/plugins/grass/modules/v.clean.snap.qgm
  77. +4 −4 src/plugins/grass/modules/v.db.join.qgm
  78. +4 −4 src/plugins/grass/modules/v.db.select.qgm
  79. +4 −4 src/plugins/grass/modules/v.db.select.where.qgm
  80. +4 −4 src/plugins/grass/modules/v.db.univar.qgm
  81. +2 −2 src/plugins/grass/modules/v.db.update_op.qgm
  82. +2 −2 src/plugins/grass/modules/v.db.update_op_query.qgm
  83. +2 −2 src/plugins/grass/modules/v.drape.qgm
  84. +2 −2 src/plugins/grass/modules/v.extract.list.qgm
  85. +2 −2 src/plugins/grass/modules/v.extrude.attr.qgm
  86. +1 −1 src/plugins/grass/modules/v.generalize.qgm
  87. +2 −2 src/plugins/grass/modules/v.hull.qgm
  88. +2 −2 src/plugins/grass/modules/v.in.ascii.qgm
  89. +4 −4 src/plugins/grass/modules/v.in.e00.qgm
  90. +4 −4 src/plugins/grass/modules/v.in.ogr.all.loc.qgm
  91. +4 −4 src/plugins/grass/modules/v.in.ogr.all.qgm
  92. +4 −4 src/plugins/grass/modules/v.in.ogr.loc.qgm
  93. +4 −4 src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
  94. +4 −4 src/plugins/grass/modules/v.in.ogr.qgis.qgm
  95. +4 −4 src/plugins/grass/modules/v.in.ogr.qgm
  96. +1 −1 src/plugins/grass/modules/v.info.qgm
  97. +5 −5 src/plugins/grass/modules/v.kcv.qgm
  98. +4 −4 src/plugins/grass/modules/v.kernel.qgm
  99. +6 −6 src/plugins/grass/modules/v.net.alloc.qgm
  100. +6 −6 src/plugins/grass/modules/v.net.iso.qgm
  101. +4 −4 src/plugins/grass/modules/v.net.nodes.qgm
  102. +10 −10 src/plugins/grass/modules/v.net.path.qgm
  103. +7 −7 src/plugins/grass/modules/v.net.qgm
  104. +6 −6 src/plugins/grass/modules/v.net.salesman.qgm
  105. +6 −6 src/plugins/grass/modules/v.net.steiner.qgm
  106. +4 −4 src/plugins/grass/modules/v.net.visibility.qgm
  107. +2 −2 src/plugins/grass/modules/v.out.ascii.qgm
  108. +4 −4 src/plugins/grass/modules/v.out.ogr.gml.qgm
  109. +2 −2 src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
  110. +4 −4 src/plugins/grass/modules/v.out.ogr.qgm
  111. +2 −2 src/plugins/grass/modules/v.out.vtk.qgm
  112. +9 −9 src/plugins/grass/modules/v.outlier.qgm
  113. +3 −3 src/plugins/grass/modules/v.random.3d.qgm
  114. +2 −2 src/plugins/grass/modules/v.random.qgm
  115. +4 −4 src/plugins/grass/modules/v.rast.stats.qgm
  116. +3 −3 src/plugins/grass/modules/v.sample.qgm
  117. +4 −4 src/plugins/grass/modules/v.segment.qgm
  118. +2 −2 src/plugins/grass/modules/v.support.qgm
  119. +8 −8 src/plugins/grass/modules/v.surf.bspline.qgm
  120. +18 −18 src/plugins/grass/modules/v.surf.rst.qgm
  121. +2 −2 src/plugins/grass/modules/v.to.db.qgm
  122. +4 −4 src/plugins/grass/modules/v.to.points.qgm
  123. +2 −2 src/plugins/grass/modules/v.to.rast.attr.qgm
  124. +3 −3 src/plugins/grass/modules/v.type.bl.qgm
  125. +3 −3 src/plugins/grass/modules/v.type.cp.qgm
  126. +3 −3 src/plugins/grass/modules/v.type.lb.qgm
  127. +3 −3 src/plugins/grass/modules/v.type.pc.qgm
  128. +4 −4 src/plugins/grass/modules/v.what.rast.qgm
  129. +8 −8 src/plugins/grass/modules/v.what.vect.qgm
  130. +0 −8 src/plugins/grass/qgsgrassmodule.cpp
  131. +0 −10 src/plugins/grass/qgsgrassmoduleinput.cpp
  132. +0 −4 src/plugins/grass/qgsgrassmoduleinput.h
  133. +0 −8 src/plugins/grass/qgsgrassmoduleoptions.cpp
  134. +0 −11 src/plugins/grass/qgsgrassmoduleparam.cpp
  135. +0 −4 src/plugins/grass/qgsgrassnewmapset.cpp
  136. +0 −9 src/plugins/grass/qgsgrassplugin.cpp
  137. +0 −5 src/plugins/grass/qgsgrassselect.cpp
  138. +3 −2 src/plugins/grass/qgsgrasstools.cpp
  139. +17 −43 src/providers/grass/qgis.d.rast.c
  140. +32 −97 src/providers/grass/qgis.g.info.c
  141. +16 −37 src/providers/grass/qgis.r.in.cpp
  142. +0 −9 src/providers/grass/qgis.v.in.cpp
  143. +21 −126 src/providers/grass/qgsgrass.cpp
  144. +0 −18 src/providers/grass/qgsgrass.h
  145. +1 −15 src/providers/grass/qgsgrassfeatureiterator.cpp
  146. +0 −12 src/providers/grass/qgsgrassgislib.cpp
  147. +2 −20 src/providers/grass/qgsgrassprovider.cpp
  148. +0 −4 src/providers/grass/qgsgrassprovidermodule.cpp
  149. +0 −2 src/providers/grass/qgsgrassrasterprovider.h
  150. +0 −5 src/providers/grass/qgsgrassvector.cpp
  151. +0 −16 src/providers/grass/qgsgrassvectormap.cpp
  152. +0 −5 src/providers/grass/qgsgrassvectormaplayer.cpp
  153. +0 −5 src/providers/grass/qgsgrassvectormaplayer.h
  154. +2 −6 tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -38,19 +38,16 @@ SET (WITH_CORE TRUE CACHE BOOL "Determines whether QGIS core should be built.")
MARK_AS_ADVANCED(WITH_CORE)

IF(WITH_CORE)
# try to configure and build GRASS plugin by default
FOREACH (GRASS_SEARCH_VERSION 6 7)
# For GRASS 6 are used cached variables without version suffix so that existing caches don't have to be reconfigured.
# Cached variables: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
# Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8.
# Try to configure and build GRASS plugin by default
FOREACH (GRASS_SEARCH_VERSION 7)
# Legacy note:
# For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured.
# Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
# Everywhere else each variable has version major appended.
# Normal variables: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
# Normal variables were: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
# In addition there is also GRASS_FOUND, which is TRUE if at least one version of GRASS was found
IF (GRASS_SEARCH_VERSION EQUAL 6)
SET (GRASS_CACHE_VERSION "")
ELSE (GRASS_SEARCH_VERSION EQUAL 6)
SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
ENDIF (GRASS_SEARCH_VERSION EQUAL 6)

SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
SET (WITH_GRASS${GRASS_CACHE_VERSION} TRUE CACHE BOOL "Determines whether GRASS ${GRASS_SEARCH_VERSION} plugin should be built")
IF (WITH_GRASS${GRASS_CACHE_VERSION})
FIND_PACKAGE(GRASS ${GRASS_SEARCH_VERSION})
@@ -137,12 +137,6 @@ MACRO (CHECK_GRASS G_PREFIX)
SET(GRASS_FOUND TRUE) # GRASS_FOUND is true if at least one version was found
SET(GRASS_PREFIX${GRASS_CACHE_VERSION} ${G_PREFIX})
CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
IF(GRASS_FIND_VERSION EQUAL 6)
# Set also normal variable with number
SET(GRASS_INCLUDE_DIR${GRASS_FIND_VERSION} ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}})
SET(GRASS_PREFIX${GRASS_FIND_VERSION} ${G_PREFIX})
CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
ENDIF(GRASS_FIND_VERSION EQUAL 6)
ENDIF(GRASS_LIBRARIES_FOUND${GRASS_FIND_VERSION})
ENDIF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} EQUAL GRASS_FIND_VERSION)
ENDIF(GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION} AND EXISTS ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}}/grass/version.h)
@@ -164,20 +158,13 @@ IF (WIN32)
ENDIF (WIN32)

IF (UNIX)
IF (GRASS_FIND_VERSION EQUAL 6)
LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
ELSEIF (GRASS_FIND_VERSION EQUAL 7)
IF (GRASS_FIND_VERSION EQUAL 7)
LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
ENDIF ()
ENDIF (UNIX)

IF (APPLE)
IF (GRASS_FIND_VERSION EQUAL 6)
LIST(APPEND GRASS_PATHS
/Applications/GRASS-6.3.app/Contents/MacOS
/Applications/GRASS-6.4.app/Contents/MacOS
)
ELSEIF (GRASS_FIND_VERSION EQUAL 7)
IF (GRASS_FIND_VERSION EQUAL 7)
LIST(APPEND GRASS_PATHS
/Applications/GRASS-7.0.app/Contents/MacOS
/Applications/GRASS-7.1.app/Contents/MacOS
@@ -85,11 +85,6 @@ ifeq ($(GRASSVER),7)
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=/usr/lib/$(GRASS)
else
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
-DWITH_GRASS6=TRUE \
-DGRASS_PREFIX=/usr/lib/$(GRASS)
endif

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -165,7 +165,6 @@ cmake -G Ninja ^
-D WITH_SERVER=TRUE ^
-D SERVER_SKIP_ECW=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_GRASS6=FALSE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
-D WITH_GLOBE=FALSE ^
@@ -158,7 +158,6 @@ cmake -G Ninja ^
-D WITH_SERVER=TRUE ^
-D SERVER_SKIP_ECW=TRUE ^
-D WITH_GRASS=TRUE ^
-D WITH_GRASS6=FALSE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
-D WITH_GLOBE=FALSE ^
@@ -2,7 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import attribute tables in various formats" module="db.in.ogr">
<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_max="6.4"/>
<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_min="7.0"/>
<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)"/>
<option key="output"/>
</qgisgrassmodule>
@@ -3,9 +3,7 @@

<qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
<option key="input" />
<file key="dsn" type="new" version_max="6"/>
<file key="output" type="new" version_min="7"/>
<file key="output" type="new"/>
<option key="format" />
<option key="db_table" version_max="6"/>
<option key="table" version_min="7"/>
<option key="table"/>
</qgisgrassmodule>
@@ -6,6 +6,5 @@
<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
<option key="driver" />
<option key="sql" />
<option key="fs" answer="|" hidden="yes" version_max="6"/>
<option key="separator" answer="|" hidden="yes" version_min="7"/>
<option key="separator" answer="|" hidden="yes"/>
</qgisgrassmodule>
@@ -2,6 +2,5 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
<option key="rast" version_max="6.4"/>
<option key="raster" version_min="7.0"/>
<option key="raster"/>
</qgisgrassmodule>
@@ -2,6 +2,5 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
<option key="vect" version_max="6.4"/>
<option key="vector" version_min="7.0"/>
<option key="vector"/>
</qgisgrassmodule>
@@ -2,11 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Fast fourier transform for image processing" module="i.fft">
<option key="input_image" version_max="6"/>
<option key="input" version_min="7"/>
<option key="real_image" version_max="6"/>
<option key="real" version_min="7"/>
<option key="imaginary_image" version_max="6"/>
<option key="imaginary" version_min="7"/>
<option key="range" version_max="6"/>
<option key="input"/>
<option key="real"/>
<option key="imaginary"/>
</qgisgrassmodule>
@@ -2,16 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function" module="i.his.rgb">
<option key="hue_input" version_max="6"/>
<option key="hue" version_min="7"/>
<option key="intensity_input" version_max="6"/>
<option key="intensity" version_min="7"/>
<option key="saturation_input" version_max="6"/>
<option key="saturation" version_min="7"/>
<option key="red_output" version_max="6"/>
<option key="red" version_min="7"/>
<option key="green_output" version_max="6"/>
<option key="green" version_min="7"/>
<option key="blue_output" version_max="6"/>
<option key="blue" version_min="7"/>
<option key="hue"/>
<option key="intensity"/>
<option key="saturation"/>
<option key="red"/>
<option key="green"/>
<option key="blue"/>
</qgisgrassmodule>
@@ -2,10 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Inverse fast fourier transform for image processing" module="i.ifft">
<option key="real_image" version_max="6"/>
<option key="real" version_min="7"/>
<option key="imaginary_image" version_max="6"/>
<option key="imaginary" version_min="7"/>
<option key="output_image" version_max="6"/>
<option key="output" version_min="7"/>
<option key="real"/>
<option key="imaginary"/>
<option key="output"/>
</qgisgrassmodule>
@@ -2,10 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Mosaic up to 4 images" module="i.image.mosaic">
<option key="image1" version_max="6"/>
<option key="image2" version_max="6"/>
<option key="image3" version_max="6"/>
<option key="image4" version_max="6"/>
<option key="input" version_min="7"/>
<option key="output" version_min="7"/>
<option key="input"/>
<option key="output"/>
</qgisgrassmodule>
@@ -2,9 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Import SPOT VGT NDVI" module="i.in.spotvgt">
<file key="file" type="new" version_max="6.4"/>
<file key="input" version_min="7.0"/>
<file key="input"/>
<flag key="a" />
<option key="rast" version_max="6.4"/>
<option key="output" version_min="7.0"/>
<option key="output"/>
</qgisgrassmodule>
@@ -2,12 +2,6 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Calculate optimal index factor table for LANDSAT-TM raster" module="i.oif">
<option key="image1" version_max="6"/>
<option key="image2" version_max="6"/>
<option key="image3" version_max="6"/>
<option key="image4" version_max="6"/>
<option key="image5" version_max="6"/>
<option key="image7" version_max="6"/>
<option key="input" version_min="7"/>
<option key="output" version_min="7"/>
<option key="input"/>
<option key="output"/>
</qgisgrassmodule>
@@ -2,16 +2,10 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function" module="i.rgb.his">
<option key="red_input" version_max="6"/>
<option key="red" version_min="7"/>
<option key="green_input" version_max="6"/>
<option key="green" version_min="7"/>
<option key="blue_input" version_max="6"/>
<option key="blue" version_min="7"/>
<option key="hue_output" version_max="6"/>
<option key="hue" version_min="7"/>
<option key="intensity_output" version_max="6"/>
<option key="intensity" version_min="7"/>
<option key="saturation_output" version_max="6"/>
<option key="saturation" version_min="7"/>
<option key="red"/>
<option key="green"/>
<option key="blue"/>
<option key="hue"/>
<option key="intensity"/>
<option key="saturation"/>
</qgisgrassmodule>
@@ -2,15 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 4 raster" module="i.tasscap">
<flag key="4" answer="on" hidden="yes" version_max="6"/>
<option key="band1" version_max="6"/>
<option key="band2" version_max="6"/>
<option key="band3" version_max="6"/>
<option key="band4" version_max="6"/>
<option key="band5" version_max="6"/>
<option key="band7" version_max="6"/>
<option key="outprefix" version_max="6"/>
<option key="input" label="Landsat 4 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
<option key="output" version_min="7"/>
<option key="sensor" answer="landsat4_tm" hidden="yes" version_min="7"/>
<option key="input" label="Landsat 4 bands 1, 2, 3, 4, 5, 7"/>
<option key="output"/>
<option key="sensor" answer="landsat4_tm" hidden="yes"/>
</qgisgrassmodule>
@@ -2,15 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 5 raster" module="i.tasscap">
<flag key="5" answer="on" hidden="yes" version_max="6"/>
<option key="band1" version_max="6"/>
<option key="band2" version_max="6"/>
<option key="band3" version_max="6"/>
<option key="band4" version_max="6"/>
<option key="band5" version_max="6"/>
<option key="band7" version_max="6"/>
<option key="outprefix" version_max="6"/>
<option key="input" label="Landsat 5 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
<option key="output" version_min="7"/>
<option key="sensor" answer="landsat5_tm" hidden="yes" version_min="7"/>
<option key="input" label="Landsat 5 bands 1, 2, 3, 4, 5, 7"/>
<option key="output"/>
<option key="sensor" answer="landsat5_tm" hidden="yes"/>
</qgisgrassmodule>
@@ -2,15 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Tasseled Cap (Kauth Thomas) transformation for LANDSAT-ETM 7 raster" module="i.tasscap">
<flag key="7" answer="on" hidden="yes" version_max="6"/>
<option key="band1" version_max="6"/>
<option key="band2" version_max="6"/>
<option key="band3" version_max="6"/>
<option key="band4" version_max="6"/>
<option key="band5" version_max="6"/>
<option key="band7" version_max="6"/>
<option key="outprefix" version_max="6"/>
<option key="input" label="Landsat 7 bands 1, 2, 3, 4, 5, 7" version_min="7"/>
<option key="output" version_min="7"/>
<option key="sensor" answer="landsat7_etm" hidden="yes" version_min="7"/>
<option key="input" label="Landsat 7 bands 1, 2, 3, 4, 5, 7"/>
<option key="output"/>
<option key="sensor" answer="landsat7_etm" hidden="yes"/>
</qgisgrassmodule>
@@ -3,8 +3,7 @@

<qgisgrassmodule label="Convert bearing and distance measurements to coordinates and vice versa" module="m.cogo">
<file key="input" type="old" />
<option key="coord" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="coordinates"/>
<flag key="r" />
<file key="output" type="new" />
</qgisgrassmodule>
@@ -5,12 +5,10 @@
<flag key="i" />
<flag key="o" />
<flag key="d" />
<flag key="v" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="coordinates"/>
<file key="input" />
<file key="output" />
<option key="fs" version_max="6"/>
<option key="separator" version_min="7"/>
<option key="separator"/>
<option key="proj_in" />
<option key="proj_out" />
</qgisgrassmodule>
@@ -4,10 +4,7 @@
<!-- direct note: the module runs, but it was not tested with real data -->
<qgisgrassmodule label="Create watershed subbasins raster" module="r.basins.fill" direct="1">
<option key="number" />
<option key="c_map" version_max="6"/>
<option key="cnetwork" version_min="7"/>
<option key="t_map" version_max="6"/>
<option key="tnetwork" version_min="7"/>
<option key="result" version_max="6"/>
<option key="output" version_min="7"/>
<option key="cnetwork"/>
<option key="tnetwork"/>
<option key="output"/>
</qgisgrassmodule>
@@ -2,10 +2,8 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Take vector stream data, transform it to raster, and subtract depth from the output DEM" module="r.carve">
<option key="rast" version_max="6"/>
<option key="raster" version_min="7"/>
<option key="vect" version_max="6"/>
<option key="vector" version_min="7"/>
<option key="raster"/>
<option key="vector"/>
<option key="width" />
<option key="depth" />
<flag key="n" />
@@ -2,11 +2,9 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Create a map containing concentric rings" module="r.circle">
<option key="coordinate" version_max="6"/>
<option key="coordinates" version_min="7"/>
<option key="coordinates"/>
<option key="min" answer="0" />
<option key="max" />
<option key="mult" answer="1" version_max="6"/>
<option key="multiplier" answer="1" version_min="7"/>
<option key="multiplier" answer="1"/>
<option key="output" />
</qgisgrassmodule>
@@ -2,9 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Tabulate mutual occurrence (coincidence) of categories for two rasters" module="r.coin">
<option key="map1" version_max="6"/>
<option key="first" version_min="7"/>
<option key="map2" version_max="6"/>
<option key="second" version_min="7"/>
<option key="first"/>
<option key="second"/>
<option key="units" />
</qgisgrassmodule>
@@ -2,8 +2,7 @@
<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">

<qgisgrassmodule label="Set color rules based on stddev from a map's mean value" module="r.colors.stddev">
<option key="input" version_max="6.4"/>
<option key="map" version_min="7.0"/>
<option key="map"/>
<flag key="b" />
<flag key="z" />
</qgisgrassmodule>

0 comments on commit eb6301e

Please sign in to comment.
You can’t perform that action at this time.