Skip to content

Commit

Permalink
unify algorithm name and source file name, formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed Feb 24, 2015
1 parent 31aed14 commit 5260ef3
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 39 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
View file
Expand Up @@ -65,7 +65,7 @@
from GridNearest import GridNearest
from GridDataMetrics import GridDataMetrics
from gdaltindex import gdaltindex
from GdalRasterCalc import GdalRasterCalc
from gdalcalc import gdalcalc

from ogr2ogr import Ogr2Ogr
from ogr2ogrclip import Ogr2OgrClip
Expand Down Expand Up @@ -123,7 +123,7 @@ def createAlgsList(self):
sieve(), fillnodata(), ExtractProjection(), gdal2xyz(),
hillshade(), slope(), aspect(), tri(), tpi(), roughness(),
ColorRelief(), GridInvDist(), GridAverage(), GridNearest(),
GridDataMetrics(), gdaltindex(), GdalRasterCalc(),
GridDataMetrics(), gdaltindex(), gdalcalc(),
# ----- OGR tools -----
OgrInfo(), Ogr2Ogr(), Ogr2OgrClip(), Ogr2OgrClipExtent(),
Ogr2OgrToPostGis(), Ogr2OgrToPostGisList(), OgrSql(),
Expand Down
70 changes: 33 additions & 37 deletions ...ns/processing/algs/gdal/GdalRasterCalc.py → .../plugins/processing/algs/gdal/gdalcalc.py
View file
Expand Up @@ -2,7 +2,7 @@

"""
***************************************************************************
GdalRasterCalc.py
gdalcalc.py
---------------------
Date : Janaury 2015
Copyright : (C) 2015 by Giovanni Manghi
Expand Down Expand Up @@ -39,14 +39,14 @@

from processing.algs.gdal.GdalUtils import GdalUtils

class GdalRasterCalc(GdalAlgorithm):
class gdalcalc(GdalAlgorithm):

INPUT_A = 'INPUT_A'
INPUT_B = 'INPUT_B'
INPUT_C = 'INPUT_C'
INPUT_D = 'INPUT_D'
INPUT_E = 'INPUT_E'
INPUT_F = 'INPUT_F'
INPUT_F = 'INPUT_F'
BAND_A = 'BAND_A'
BAND_B = 'BAND_B'
BAND_C = 'BAND_C'
Expand All @@ -62,42 +62,40 @@ class GdalRasterCalc(GdalAlgorithm):
#DEBUG = 'DEBUG'

def defineCharacteristics(self):
self.name = 'GDAL Raster Calculator'
self.name = 'Raster calculator'
self.group = '[GDAL] Miscellaneous'
self.addParameter(ParameterRaster(self.INPUT_A, self.tr('Input layer A'),
False))
self.addParameter(ParameterRaster(
self.INPUT_A, self.tr('Input layer A'), False))
self.addParameter(ParameterString(self.BAND_A,
self.tr('Number of raster band for raster A'), '1', optional=True))
self.addParameter(ParameterRaster(self.INPUT_B, self.tr('Input layer B'),
True))
self.addParameter(ParameterRaster(
self.INPUT_B, self.tr('Input layer B'), True))
self.addParameter(ParameterString(self.BAND_B,
self.tr('Number of raster band for raster B'), '1', optional=True))
self.addParameter(ParameterRaster(self.INPUT_C, self.tr('Input layer C'),
True))
self.addParameter(ParameterRaster(
self.INPUT_C, self.tr('Input layer C'), True))
self.addParameter(ParameterString(self.BAND_C,
self.tr('Number of raster band for raster C'), '1', optional=True))
self.addParameter(ParameterRaster(self.INPUT_D, self.tr('Input layer D'),
True))
self.addParameter(ParameterRaster(
self.INPUT_D, self.tr('Input layer D'), True))
self.addParameter(ParameterString(self.BAND_D,
self.tr('Number of raster band for raster D'), '1', optional=True))
self.addParameter(ParameterRaster(self.INPUT_E, self.tr('Input layer E'),
True))
self.addParameter(ParameterRaster(
self.INPUT_E, self.tr('Input layer E'), True))
self.addParameter(ParameterString(self.BAND_E,
self.tr('Number of raster band for raster E'), '1', optional=True))
self.addParameter(ParameterRaster(self.INPUT_F, self.tr('Input layer F'),
True))
self.addParameter(ParameterRaster(
self.INPUT_F, self.tr('Input layer F'), True))
self.addParameter(ParameterString(self.BAND_F,
self.tr('Number of raster band for raster F'), '1', optional=True))
self.addParameter(ParameterString(self.FORMULA,
self.tr('Calculation in gdalnumeric syntax using +-/* or any numpy array functions (i.e. logical_and())'), 'A*2', optional=False))
self.addParameter(ParameterString(self.NO_DATA,
self.tr("Set output nodata value"),
'-9999'))
self.tr('Set output nodata value'), '-9999'))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))
#self.addParameter(ParameterBoolean(self.DEBUG,
#self.tr('Print debugging information'),
#False))
#self.addParameter(ParameterBoolean(
# self.DEBUG, self.tr('Print debugging information'), False))
self.addParameter(ParameterString(self.EXTRA,
self.tr('Additional creation parameters'), '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
Expand All @@ -108,56 +106,54 @@ def processAlgorithm(self, progress):
#debug = self.getParameterValue(self.DEBUG)
formula = self.getParameterValue(self.FORMULA)
noData = str(self.getParameterValue(self.NO_DATA))

arguments = []
arguments.append('--calc')
arguments.append('"'+formula+'"')
arguments.append('--format')
arguments.append('"' + formula + '"')
arguments.append('--format')
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
arguments.append('--type')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
if len(noData) > 0:
arguments.append('--NoDataValue')
arguments.append(noData)
if len(extra) > 0:
arguments.append(extra)
#if debug is True:
#arguments.append('--debug')
arguments.append(extra)
#if debug:
# arguments.append('--debug')
arguments.append('-A')
arguments.append(self.getParameterValue(self.INPUT_A))
if self.getParameterValue(self.BAND_A):
arguments.append('--A_band '+self.getParameterValue(self.BAND_A))
arguments.append('--A_band ' + self.getParameterValue(self.BAND_A))
if self.getParameterValue(self.INPUT_B):
arguments.append('-B')
arguments.append(self.getParameterValue(self.INPUT_B))
if self.getParameterValue(self.BAND_B):
arguments.append('--B_band '+self.getParameterValue(self.BAND_B))
arguments.append('--B_band ' + self.getParameterValue(self.BAND_B))
if self.getParameterValue(self.INPUT_C):
arguments.append('-C')
arguments.append(self.getParameterValue(self.INPUT_C))
if self.getParameterValue(self.BAND_C):
arguments.append('--C_band '+self.getParameterValue(self.BAND_C))
arguments.append('--C_band ' + self.getParameterValue(self.BAND_C))
if self.getParameterValue(self.INPUT_D):
arguments.append('-D')
arguments.append(self.getParameterValue(self.INPUT_D))
if self.getParameterValue(self.BAND_D):
arguments.append('--D_band '+self.getParameterValue(self.BAND_D))
arguments.append('--D_band ' + self.getParameterValue(self.BAND_D))
if self.getParameterValue(self.INPUT_E):
arguments.append('-E')
arguments.append(self.getParameterValue(self.INPUT_E))
if self.getParameterValue(self.BAND_E):
arguments.append('--E_band '+self.getParameterValue(self.BAND_E))
arguments.append('--E_band ' + self.getParameterValue(self.BAND_E))
if self.getParameterValue(self.INPUT_F):
arguments.append('-F')
arguments.append(self.getParameterValue(self.INPUT_F))
if self.getParameterValue(self.BAND_F):
arguments.append('--F_band '+self.getParameterValue(self.BAND_F))
arguments.append('--F_band ' + self.getParameterValue(self.BAND_F))
arguments.append('--outfile')
arguments.append(out)

if isWindows():
GdalUtils.runGdal(['gdal_calc',
GdalUtils.escapeAndJoin(arguments)], progress)
GdalUtils.runGdal(['gdal_calc', GdalUtils.escapeAndJoin(arguments)], progress)
else:
GdalUtils.runGdal(['gdal_calc.py',
GdalUtils.escapeAndJoin(arguments)], progress)
GdalUtils.runGdal(['gdal_calc.py', GdalUtils.escapeAndJoin(arguments)], progress)

0 comments on commit 5260ef3

Please sign in to comment.