Skip to content

Commit

Permalink
[processing] i18n support in gdal provider
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed Jan 17, 2015
1 parent ce95c59 commit f3f09fa
Show file tree
Hide file tree
Showing 39 changed files with 456 additions and 404 deletions.
11 changes: 6 additions & 5 deletions python/plugins/processing/algs/gdal/ClipByExtent.py
View file
Expand Up @@ -50,14 +50,15 @@ class ClipByExtent(GdalAlgorithm):
def defineCharacteristics(self):
self.name = 'Clip raster by extent'
self.group = '[GDAL] Extraction'
self.addParameter(ParameterRaster(self.INPUT, 'Input layer', False))
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterString(self.NO_DATA,
'Nodata value, leave as none to take the nodata value from input',
self.tr("Nodata value, leave as 'none' to take the nodata value from input"),
'none'))
self.addParameter(ParameterExtent(self.PROJWIN, 'Clipping extent'))
self.addParameter(ParameterExtent(self.PROJWIN, self.tr('Clipping extent')))
self.addParameter(ParameterString(self.EXTRA,
'Additional creation parameters', '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
self.tr('Additional creation parameters'), '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))

def processAlgorithm(self, progress):
out = self.getOutputValue(self.OUTPUT)
Expand Down
14 changes: 7 additions & 7 deletions python/plugins/processing/algs/gdal/ClipByMask.py
View file
Expand Up @@ -55,19 +55,19 @@ class ClipByMask(GdalAlgorithm):
def defineCharacteristics(self):
self.name = 'Clip raster by mask layer'
self.group = '[GDAL] Extraction'
self.addParameter(ParameterRaster(self.INPUT, 'Input layer', False))
self.addParameter(ParameterVector(self.MASK, 'Mask layer',
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'),
[ParameterVector.VECTOR_TYPE_POLYGON]))
self.addParameter(ParameterString(self.NO_DATA,
'Nodata value, leave as none to take the nodata value from input',
self.tr("Nodata value, leave as 'none' to take the nodata value from input"),
'none'))
self.addParameter(ParameterBoolean(self.ALPHA_BAND,
'Create and output alpha band', False))
self.tr('Create and output alpha band'), False))
self.addParameter(ParameterBoolean(self.KEEP_RESOLUTION,
'Keep resolution of output raster', False))
self.tr('Keep resolution of output raster'), False))
self.addParameter(ParameterString(self.EXTRA,
'Additional creation parameters', '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, 'Output layer'))
self.tr('Additional creation parameters'), '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))

def processAlgorithm(self, progress):
out = self.getOutputValue(self.OUTPUT)
Expand Down
15 changes: 8 additions & 7 deletions python/plugins/processing/algs/gdal/ColorRelief.py
View file
Expand Up @@ -57,16 +57,17 @@ class ColorRelief(GdalAlgorithm):
def defineCharacteristics(self):
self.name = 'Color relief'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterRaster(self.INPUT, 'Input layer'))
self.addParameter(ParameterNumber(self.BAND, 'Band number', 1, 99, 1))
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES, 'Compute edges',
False))
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
self.tr('Compute edges'), False))
self.addParameter(ParameterFile(self.COLOR_TABLE,
'Color configuration file', optional=False))
self.tr('Color configuration file'), optional=False))
self.addParameter(ParameterSelection(self.MATCH_MODE,
'Matching mode', self.MATCHING_MODES, 0))
self.tr('Matching mode'), self.MATCHING_MODES, 0))

self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))

def processAlgorithm(self, progress):
arguments = ['color-relief']
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
View file
Expand Up @@ -124,7 +124,8 @@ def createAlgsList(self):
ColorRelief(), GridInvDist(), GridAverage(), GridNearest(),
GridDataMetrics(),
# ----- OGR tools -----
OgrInfo(), Ogr2Ogr(), Ogr2OgrClip(), Ogr2OgrClipExtent(), Ogr2OgrToPostGis(), Ogr2OgrToPostGisList(), OgrSql(),
OgrInfo(), Ogr2Ogr(), Ogr2OgrClip(), Ogr2OgrClipExtent(),
Ogr2OgrToPostGis(), Ogr2OgrToPostGisList(), OgrSql(),
]

# And then we add those that are created as python scripts
Expand Down
40 changes: 21 additions & 19 deletions python/plugins/processing/algs/gdal/GridAverage.py
View file
Expand Up @@ -50,32 +50,34 @@ class GridAverage(GdalAlgorithm):
OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE'

TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64',
'CInt16', 'CInt32', 'CFloat32', 'CFloat64']

def commandLineName(self):
return "gdalogr:gridaverage"

def defineCharacteristics(self):
self.name = 'Grid (Moving average)'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterVector(self.INPUT, 'Input layer',
[ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD, 'Z field',
self.INPUT, ParameterTableField.DATA_TYPE_NUMBER,
True))
self.addParameter(ParameterNumber(self.RADIUS_1, 'Radius 1',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2, 'Radius 2',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS, 'Min points',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE, 'Angle',
0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA, 'Nodata',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type',
self.TYPE, 5))
self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
self.tr('Z field'), self.INPUT,
ParameterTableField.DATA_TYPE_NUMBER, True))
self.addParameter(ParameterNumber(self.RADIUS_1,
self.tr('Radius 1'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2,
self.tr('Radius 2'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS,
self.tr('Min points'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE,
self.tr('Angle'), 0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA,
self.tr('Nodata'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
44 changes: 23 additions & 21 deletions python/plugins/processing/algs/gdal/GridDataMetrics.py
View file
Expand Up @@ -51,7 +51,8 @@ class GridDataMetrics(GdalAlgorithm):
OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE'

TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32',' Int32', 'Float32', 'Float64',
'CInt16', 'CInt32', 'CFloat32', 'CFloat64']

DATA_METRICS = ['Minimum', 'Maximum', 'Range', 'Count', 'Average distance',
'Average distance between points']
Expand All @@ -62,26 +63,27 @@ def commandLineName(self):
def defineCharacteristics(self):
self.name = 'Grid (Data metrics)'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterVector(self.INPUT, 'Input layer',
[ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD, 'Z field',
self.INPUT, ParameterTableField.DATA_TYPE_NUMBER,
True))
self.addParameter(ParameterSelection(self.METRIC, 'Metrics',
self.DATA_METRICS, 0))
self.addParameter(ParameterNumber(self.RADIUS_1, 'Radius 1',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2, 'Radius 2',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS, 'Min points',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE, 'Angle',
0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA, 'Nodata',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type',
self.TYPE, 5))
self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
self.tr('Z field'), self.INPUT,
ParameterTableField.DATA_TYPE_NUMBER, True))
self.addParameter(ParameterSelection(self.METRIC,
self.tr('Metrics'), self.DATA_METRICS, 0))
self.addParameter(ParameterNumber(self.RADIUS_1,
self.tr('Radius 1'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2,
self.tr('Radius 2'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS,
self.tr('Min points'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE,
self.tr('Angle'), 0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA,
self.tr('Nodata'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
51 changes: 27 additions & 24 deletions python/plugins/processing/algs/gdal/GridInvDist.py
View file
Expand Up @@ -53,37 +53,40 @@ class GridInvDist(GdalAlgorithm):
OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE'

TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64',
'CInt16', 'CInt32', 'CFloat32', 'CFloat64']

def commandLineName(self):
return "gdalogr:gridinvdist"

def defineCharacteristics(self):
self.name = 'Grid (Inverse distance to a power)'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterVector(self.INPUT, 'Input layer',
[ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD, 'Z field',
self.INPUT, ParameterTableField.DATA_TYPE_NUMBER,
True))
self.addParameter(ParameterNumber(self.POWER, 'Power', 0, 100.0, 2.0))
self.addParameter(ParameterNumber(self.SMOTHING, 'Smothing',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_1, 'Radius 1',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2, 'Radius 2',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MAX_POINTS, 'Max points',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS, 'Min points',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE, 'Angle',
0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA, 'Nodata',
-99999999.999999, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type',
self.TYPE, 5))
self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
self.tr('Z field'), self.INPUT,
ParameterTableField.DATA_TYPE_NUMBER, True))
self.addParameter(ParameterNumber(self.POWER,
self.tr('Power'), 0, 100.0, 2.0))
self.addParameter(ParameterNumber(self.SMOTHING,
self.tr('Smothing'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_1,
self.tr('Radius 1'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2,
self.tr('Radius 2'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MAX_POINTS,
self.tr('Max points'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.MIN_POINTS,
self.tr('Min points'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE,
self.tr('Angle'), 0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA,
self.tr('Nodata'), -99999999.999999, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
36 changes: 19 additions & 17 deletions python/plugins/processing/algs/gdal/GridNearest.py
View file
Expand Up @@ -49,30 +49,32 @@ class GridNearest(GdalAlgorithm):
OUTPUT = 'OUTPUT'
RTYPE = 'RTYPE'

TYPE = ['Byte','Int16','UInt16','UInt32','Int32','Float32','Float64','CInt16','CInt32','CFloat32','CFloat64']
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64',
'CInt16', 'CInt32', 'CFloat32', 'CFloat64']

def commandLineName(self):
return "gdalogr:gridnearestneighbor"

def defineCharacteristics(self):
self.name = 'Grid (Nearest neighbor)'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterVector(self.INPUT, 'Input layer',
[ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD, 'Z field',
self.INPUT, ParameterTableField.DATA_TYPE_NUMBER,
True))
self.addParameter(ParameterNumber(self.RADIUS_1, 'Radius 1',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2, 'Radius 2',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE, 'Angle',
0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA, 'Nodata',
0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE, 'Output raster type',
self.TYPE, 5))
self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
self.tr('Z field'), self.INPUT,
ParameterTableField.DATA_TYPE_NUMBER, True))
self.addParameter(ParameterNumber(self.RADIUS_1,
self.tr('Radius 1'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.RADIUS_2,
self.tr('Radius 2'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterNumber(self.ANGLE,
self.tr('Angle'), 0.0, 359.0, 0.0))
self.addParameter(ParameterNumber(self.NODATA,
self.tr('Nodata'), 0.0, 99999999.999999, 0.0))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
19 changes: 9 additions & 10 deletions python/plugins/processing/algs/gdal/aspect.py
View file
Expand Up @@ -54,19 +54,18 @@ class aspect(GdalAlgorithm):
def defineCharacteristics(self):
self.name = 'Aspect'
self.group = '[GDAL] Analysis'
self.addParameter(ParameterRaster(self.INPUT, 'Input layer'))
self.addParameter(ParameterNumber(self.BAND, 'Band number', 1, 99, 1))
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES, 'Compute edges',
False))
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
self.addParameter(ParameterBoolean(
self.COMPUTE_EDGES, self.tr('Compute edges'), False))
self.addParameter(ParameterBoolean(self.ZEVENBERGEN,
"Use Zevenbergen&Thorne formula (instead of the Horn's one)",
False))
self.tr"Use Zevenbergen&Thorne formula (instead of the Horn's one)"),
False))
self.addParameter(ParameterBoolean(self.TRIG_ANGLE,
'Return trigonometric angle (instead of azimuth)',
False))
self.tr('Return trigonometric angle (instead of azimuth)'), False))
self.addParameter(ParameterBoolean(self.ZERO_FLAT,
'Return o for flat (instead of -9999)',
False))
self.tr('Return 0 for flat (instead of -9999)'), False))

self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))

Expand Down
14 changes: 9 additions & 5 deletions python/plugins/processing/algs/gdal/buildvrt.py
View file
Expand Up @@ -48,11 +48,15 @@ class buildvrt(GdalAlgorithm):
def defineCharacteristics(self):
self.name = 'Build Virtual Raster'
self.group = '[GDAL] Miscellaneous'
self.addParameter(ParameterMultipleInput(buildvrt.INPUT, 'Input layers', ParameterMultipleInput.TYPE_RASTER))
self.addParameter(ParameterSelection(buildvrt.RESOLUTION, 'Resolution', buildvrt.RESOLUTION_OPTIONS, 0))
self.addParameter(ParameterBoolean(buildvrt.SEPARATE, 'Layer stack', True))
self.addParameter(ParameterBoolean(buildvrt.PROJ_DIFFERENCE, 'Allow projection difference', False))
self.addOutput(OutputRaster(buildvrt.OUTPUT, 'Output layer'))
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'), ParameterMultipleInput.TYPE_RASTER))
self.addParameter(ParameterSelection(self.RESOLUTION,
self.tr('Resolution'), self.RESOLUTION_OPTIONS, 0))
self.addParameter(ParameterBoolean(self.SEPARATE,
self.tr('Layer stack'), True))
self.addParameter(ParameterBoolean(self.PROJ_DIFFERENCE,
self.tr('Allow projection difference'), False))
self.addOutput(OutputRaster(buildvrt.OUTPUT, self.tr('Output layer')))

def processAlgorithm(self, progress):
arguments = []
Expand Down

0 comments on commit f3f09fa

Please sign in to comment.