[processing] Add r.geomorphon grass command and module in grass core …

…plugin (#9625) * Create r.geomorphon.qgm * Add files via upload * Update default.qgc * Create r.geomorphon.txt Adding the description file to add the `r.geomorphon` command into `QGIS.Processing.GRASS` * Update grass7_algorithms_raster_tests.yaml Adding test for `r.geomorphon` * fixing wrong spelling thanks trevis * Update grass7_algorithms_raster_tests.yaml adding corrected unit test * Create r.geomorphon.qgm * Add files via upload * Update default.qgc * Create r.geomorphon.txt Adding the description file to add the `r.geomorphon` command into `QGIS.Processing.GRASS` * Update grass7_algorithms_raster_tests.yaml Adding test for `r.geomorphon` * fixing wrong spelling thanks trevis * Delete CTestCostData.txt * Delete CTestCostData.txt * Delete CTestCostData.txt * Delete CTestCostData.txt
qgis · Apr 27, 2019 · 841b191 · 841b191
1 parent f26ca36
commit 841b191
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 0 deletions.
diff --git a/python/plugins/processing/algs/grass7/description/r.geomorphon.txt b/python/plugins/processing/algs/grass7/description/r.geomorphon.txt
@@ -0,0 +1,11 @@
+r.geomorphon
+Calculates geomorphons (terrain forms) and associated geometry using machine vision approach.
+Raster (r.*)
+QgsProcessingParameterRasterLayer|elevation|Name of input elevation raster map|None|False
+QgsProcessingParameterNumber|search|Outer search radius|QgsProcessingParameterNumber.Integer|3|True|3|499
+QgsProcessingParameterNumber|skip|Inner search radius|QgsProcessingParameterNumber.Integer|0|True|0|499
+QgsProcessingParameterNumber|flat|Flatenss threshold (degrees)|QgsProcessingParameterNumber.Double|1.0|True|None|None
+QgsProcessingParameterNumber|dist|Flatenss distance, zero for none|QgsProcessingParameterNumber.Double|0.0|True|None|None
+QgsProcessingParameterRasterDestination|forms|Most common geomorphic forms
+*QgsProcessingParameterBoolean|-m|Use meters to define search units (default is cells)|False
+*QgsProcessingParameterBoolean|-e|Use extended form correction|False
diff --git a/python/plugins/processing/tests/testdata/grass7_algorithms_raster_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithms_raster_tests.yaml
@@ -1772,3 +1772,24 @@ tests:
       stream_raster:
         hash: 916672ce0c35295100bcdc56bc60e26841b9cbb384924ae4f54648a8
         type: rasterhash
+
+  - algorithm: grass7:r.geomorphon
+    name: Test (grass7:r.geomorphon)
+    params:
+      -e: false
+      -m: false
+      GRASS_RASTER_FORMAT_META: ''
+      GRASS_RASTER_FORMAT_OPT: ''
+      GRASS_REGION_CELLSIZE_PARAMETER: 0.0
+      dist: 0.0
+      elevation:
+        name: custom/grass7/float_raster.tif
+        type: raster
+      flat: 1.0
+      search: 3
+      skip: 0
+    results:
+      forms:
+        hash: e1a1fc36d53e2ac801632f9e2271922d2b1340869f2db82d5edaeb0e
+        type: rasterhash
+
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
@@ -230,6 +230,7 @@
                 <grass name="r.grow.distance" version_min="6.4"/>
                 <grass name="r.walk.coord"/>
                 <grass name="r.walk.vect"/>
+                <grass name="r.geomorphon"/>
             </section>
             <section label="Transform features">
                 <grass name="r.clump"/>

diff --git a/src/plugins/grass/modules/r.geomorphon.1.png b/src/plugins/grass/modules/r.geomorphon.1.png
diff --git a/src/plugins/grass/modules/r.geomorphon.2.png b/src/plugins/grass/modules/r.geomorphon.2.png
diff --git a/src/plugins/grass/modules/r.geomorphon.qgm b/src/plugins/grass/modules/r.geomorphon.qgm
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Calculates geomorphons (terrain forms) and associated geometry using machine vision approach" module="r.geomorphon">
+	<option key="elevation" answer="" hidden="no"/>
+	<option key="forms" answer="" hidden="no"/>
+	<option key="search" answer="" hidden="no"/>
+  <option key="skip" answer="" hidden="no"/>
+  <option key="flat" answer="" hidden="no"/>
+  <option key="dist" answer="" hidden="no"/>
+</qgisgrassmodule>