Skip to content

Commit 1cbbbc4

Browse files
nyalldawsonnyalldawson
committedAug 13, 2017
Port gdal tri alg to new API
·
ltr-3_40final-3_0_0
1 parent ab2886d commit 1cbbbc4

File tree

4 files changed

+49
-47
lines changed

4 files changed

+49
-47
lines changed
 

‎python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
from .AssignProjection import AssignProjection
3737
from .aspect import aspect
38+
from .tri import tri
3839
from .warp import warp
3940
# from .nearblack import nearblack
4041
# from .information import information
@@ -56,8 +57,6 @@
5657
# from .gdal2xyz import gdal2xyz
5758
# from .hillshade import hillshade
5859
# from .slope import slope
59-
60-
# from .tri import tri
6160
# from .tpi import tpi
6261
# from .roughness import roughness
6362
# from .ColorRelief import ColorRelief
@@ -145,6 +144,7 @@ def loadAlgorithms(self):
145144
# information(),
146145
AssignProjection(),
147146
aspect(),
147+
tri(),
148148
warp(),
149149
# translate(),
150150
# rgb2pct(),
@@ -164,7 +164,7 @@ def loadAlgorithms(self):
164164
# gdal2xyz(),
165165
# hillshade(),
166166
# slope(),
167-
# tri(),
167+
#
168168
# tpi(),
169169
# roughness(),
170170
# ColorRelief(),

‎python/plugins/processing/algs/gdal/aspect.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import os
3030

3131
from qgis.core import (QgsProcessingParameterRasterLayer,
32-
QgsProcessingParameterNumber,
32+
QgsProcessingParameterBand,
3333
QgsProcessingParameterBoolean,
3434
QgsProcessingParameterRasterDestination)
3535
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
@@ -53,8 +53,8 @@ def __init__(self):
5353

5454
def initAlgorithm(self, config=None):
5555
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT, self.tr('Input layer')))
56-
self.addParameter(QgsProcessingParameterNumber(
57-
self.BAND, self.tr('Band number'), minValue=1, maxValue=99, defaultValue=1))
56+
self.addParameter(QgsProcessingParameterBand(
57+
self.BAND, self.tr('Band number'), parentLayerParameterName=self.INPUT))
5858
self.addParameter(QgsProcessingParameterBoolean(
5959
self.COMPUTE_EDGES, self.tr('Compute edges'), defaultValue=False))
6060
self.addParameter(QgsProcessingParameterBoolean(self.ZEVENBERGEN,

‎python/plugins/processing/algs/gdal/tri.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
import os
3131

32+
from qgis.core import (QgsProcessingParameterRasterLayer,
33+
QgsProcessingParameterBand,
34+
QgsProcessingParameterBoolean,
35+
QgsProcessingParameterRasterDestination)
3236
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
33-
from processing.core.parameters import ParameterRaster
34-
from processing.core.parameters import ParameterBoolean
35-
from processing.core.parameters import ParameterNumber
36-
from processing.core.outputs import OutputRaster
3737
from processing.algs.gdal.GdalUtils import GdalUtils
3838

3939
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -50,13 +50,13 @@ def __init__(self):
5050
super().__init__()
5151

5252
def initAlgorithm(self, config=None):
53-
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
54-
self.addParameter(ParameterNumber(self.BAND,
55-
self.tr('Band number'), 1, 99, 1))
56-
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
57-
self.tr('Compute edges'), False))
53+
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT, self.tr('Input layer')))
54+
self.addParameter(QgsProcessingParameterBand(self.BAND,
55+
self.tr('Band number'), parentLayerParameterName=self.INPUT))
56+
self.addParameter(QgsProcessingParameterBoolean(self.COMPUTE_EDGES,
57+
self.tr('Compute edges'), defaultValue=False))
5858

59-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Terrain Ruggedness Index')))
59+
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT, self.tr('Terrain Ruggedness Index')))
6060

6161
def name(self):
6262
return 'triterrainruggednessindex'
@@ -69,13 +69,15 @@ def group(self):
6969

7070
def getConsoleCommands(self, parameters, context, feedback):
7171
arguments = ['TRI']
72-
arguments.append(str(self.getParameterValue(self.INPUT)))
73-
arguments.append(str(self.getOutputValue(self.OUTPUT)))
72+
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
73+
arguments.append(inLayer.source())
74+
out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
75+
arguments.append(out)
7476

7577
arguments.append('-b')
76-
arguments.append(str(self.getParameterValue(self.BAND)))
78+
arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))
7779

78-
if self.getParameterValue(self.COMPUTE_EDGES):
80+
if self.parameterAsBool(parameters, self.COMPUTE_EDGES, context):
7981
arguments.append('-compute_edges')
8082

8183
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

‎python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -482,33 +482,33 @@ tests:
482482
# OUTPUT:
483483
# hash: aba5167b8a2e97a93b22d406e0363f91c151fd353c0fc56ce24ac5fc
484484
# type: rasterhash
485-
#
486-
# - algorithm: gdal:triterrainruggednessindex
487-
# name: standard TRI
488-
# params:
489-
# BAND: 1
490-
# COMPUTE_EDGES: false
491-
# INPUT:
492-
# name: dem.tif
493-
# type: raster
494-
# results:
495-
# OUTPUT:
496-
# hash: c888764a08fae72a129dfff4947149c3185532373d33d4537ecf409c
497-
# type: rasterhash
498-
#
499-
# - algorithm: gdal:triterrainruggednessindex
500-
# name: TRI with edges
501-
# params:
502-
# BAND: 1
503-
# COMPUTE_EDGES: true
504-
# INPUT:
505-
# name: dem.tif
506-
# type: raster
507-
# results:
508-
# OUTPUT:
509-
# hash: 07376c74de869323125ceacbb5e34438655ff73f63d4b3ff3e268f7f
510-
# type: rasterhash
511-
#
485+
486+
- algorithm: gdal:triterrainruggednessindex
487+
name: standard TRI
488+
params:
489+
BAND: 1
490+
COMPUTE_EDGES: false
491+
INPUT:
492+
name: dem.tif
493+
type: raster
494+
results:
495+
OUTPUT:
496+
hash: c888764a08fae72a129dfff4947149c3185532373d33d4537ecf409c
497+
type: rasterhash
498+
499+
- algorithm: gdal:triterrainruggednessindex
500+
name: TRI with edges
501+
params:
502+
BAND: 1
503+
COMPUTE_EDGES: true
504+
INPUT:
505+
name: dem.tif
506+
type: raster
507+
results:
508+
OUTPUT:
509+
hash: 07376c74de869323125ceacbb5e34438655ff73f63d4b3ff3e268f7f
510+
type: rasterhash
511+
512512
# - algorithm: gdal:nearblack
513513
# name: standard near black
514514
# params:

0 commit comments

Comments
 (0)
Please sign in to comment.