Skip to content

Commit dc0f349

Browse files
committed
[processing] added gdal algs to simplified interface, replacing saga ones
1 parent 7f11ca4 commit dc0f349

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

python/plugins/processing/algs/gdal/GridAverage.py

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ class GridAverage(GdalAlgorithm):
4747
ANGLE = 'ANGLE'
4848
NODATA = 'NODATA'
4949
OUTPUT = 'OUTPUT'
50+
51+
def commandLineName(self):
52+
return "gdalogr:gridaverage"
5053

5154
def defineCharacteristics(self):
5255
self.name = 'Grid (Moving average)'

python/plugins/processing/algs/gdal/GridDataMetrics.py

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ class GridDataMetrics(GdalAlgorithm):
5353
DATA_METRICS = ['Minimum', 'Maximum', 'Range', 'Count', 'Average distance',
5454
'Average distance between points']
5555

56+
def commandLineName(self):
57+
return "gdalogr:griddatametrics"
58+
5659
def defineCharacteristics(self):
5760
self.name = 'Grid (Data metrics)'
5861
self.group = '[GDAL] Analysis'

python/plugins/processing/algs/gdal/GridInvDist.py

+3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ class GridInvDist(GdalAlgorithm):
5151
NODATA = 'NODATA'
5252
OUTPUT = 'OUTPUT'
5353

54+
def commandLineName(self):
55+
return "gdalogr:gridinvdist"
56+
5457
def defineCharacteristics(self):
5558
self.name = 'Grid (Inverse distance to a power)'
5659
self.group = '[GDAL] Analysis'

python/plugins/processing/algs/gdal/GridNearest.py

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ class GridNearest(GdalAlgorithm):
4747
NODATA = 'NODATA'
4848
OUTPUT = 'OUTPUT'
4949

50+
def commandLineName(self):
51+
return "gdalogr:gridnearestneighbor"
52+
5053
def defineCharacteristics(self):
5154
self.name = 'Grid (Nearest neighbor)'
5255
self.group = '[GDAL] Analysis'

python/plugins/processing/gui/help/algclasssification.txt

+9-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ gdalogr:slope,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphome
1515
gdalogr:aspect,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
1616
gdalogr:hillshade,USE_ORIGINAL_NAME,Domain specific/Viewsheds\Lighting
1717
gdalogr:polygonize,Vectorize raster layer,Raster - vector/Raster -> Vector
18-
gdalogr:rasterize,Rasterize vector layer,Raster - vector/Vector -> Raster
18+
gdalogr:gridrasterize,Rasterize vector layer,Raster - vector/Vector -> Raster
19+
gdalogr:gridnearestneighbor, Interpolate (Nearest Neighbor),Raster - vector/Vector -> Raster
20+
gdalogr:griddatametrics, Interpolate (Data metrics),Raster - vector/Vector -> Raster
21+
gdalogr:gridinvdist, Interpolate (Inverse distance weighting),Raster - vector/Vector -> Raster
22+
gdalogr:gridaverage, Interpolate (Average),Raster - vector/Vector -> Raster
23+
gdalogr:contour, Contour lines,Raster - vector/Raster -> Vector
1924
otb:bandmath,USE_ORIGINAL_NAME,Images/Miscellaneous
2025
otb:binarymorphologicaloperation,USE_ORIGINAL_NAME,Images/Image Filtering
2126
otb:bundletoperfectsensor,USE_ORIGINAL_NAME,Images/Geometry
@@ -185,7 +190,6 @@ saga:closeonecellgaps,USE_ORIGINAL_NAME,Raster/General tools
185190
saga:clusteranalysis,USE_ORIGINAL_NAME,Vector/General tools
186191
saga:clusteranalysisforgrids,USE_ORIGINAL_NAME,Raster/Analysis
187192
saga:combinegrids,USE_ORIGINAL_NAME,Raster/General tools
188-
saga:contourlinesfromgrid,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
189193
saga:convergenceindex,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
190194
saga:convergenceindexsearchradius,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
191195
saga:convertdatastoragetype,USE_ORIGINAL_NAME,Raster/General tools
@@ -205,7 +209,7 @@ saga:creategraticule,Create graticule from extent,Vector/Creation
205209
saga:croptodata,USE_ORIGINAL_NAME,Raster/General tools
206210
saga:crossclassificationandtabulation,USE_ORIGINAL_NAME,Raster/General tools
207211
saga:crossprofiles,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
208-
saga:cubicsplineapproximation,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
212+
saga:cubicsplineapproximation, Interpolate (Cubic spline),Raster - vector/Vector -> Raster
209213
saga:curvatureclassification,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
210214
saga:cutshapeslayer,USE_ORIGINAL_NAME,Vector/Overlay
211215
saga:dailytohourlypet,USE_ORIGINAL_NAME,Domain specific/Miscellaneous
@@ -267,7 +271,6 @@ saga:gridvaluestopoints,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
267271
saga:gridvaluestopointsrandomly,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
268272
saga:gridvolume,USE_ORIGINAL_NAME,Raster/Miscellaneous
269273
saga:hypsometry,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
270-
saga:inversedistanceweighted,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
271274
saga:invertdatanodata,USE_ORIGINAL_NAME,Raster/General tools
272275
saga:kerneldensityestimation,USE_ORIGINAL_NAME,Raster/Statistics
273276
saga:lakeflood,USE_ORIGINAL_NAME,Raster/Miscellaneous
@@ -287,7 +290,7 @@ saga:mergeshapeslayers,USE_ORIGINAL_NAME,Vector/General tools
287290
saga:mergerasterlayers,USE_ORIGINAL_NAME,Raster/General tools
288291
saga:metricconversions,USE_ORIGINAL_NAME,Raster/Edition
289292
saga:minimumdistanceanalysis,USE_ORIGINAL_NAME,Vector/Points
290-
saga:modifedquadraticshepard,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
293+
saga:modifedquadraticshepard,Interpolate (Modified quadratic shepard),Raster - vector/Vector -> Raster
291294
saga:morphologicalfilter,USE_ORIGINAL_NAME,Raster/Filters
292295
saga:morphometricprotectionindex,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
293296
saga:multibandvariation,USE_ORIGINAL_NAME,Raster/Analysis
@@ -297,8 +300,7 @@ saga:multilevelbsplineinterpolationfromgrid,USE_ORIGINAL_NAME,Raster - vector/Ve
297300
saga:multipleregressionanalysisgridgrids,USE_ORIGINAL_NAME,Raster/Statistics
298301
saga:multipleregressionanalysispointsgrid,USE_ORIGINAL_NAME,Raster - vector/Raster - vector statistics
299302
saga:multiresolutionindexofvalleybottomflatnessmrvbf,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
300-
saga:naturalneighbour,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
301-
saga:nearestneighbour,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
303+
saga:naturalneighbour, Interpolate (Natural neighbor),Raster - vector/Vector -> Raster
302304
saga:orderedweightedaveragingowa,USE_ORIGINAL_NAME,Raster/Analysis
303305
saga:ordinarykriging,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster
304306
saga:ordinarykrigingglobal,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster

0 commit comments

Comments
 (0)