Skip to content

Commit

Permalink
Merge pull request #4200 from alexbruy/processing-reorganize-gdal
Browse files Browse the repository at this point in the history
[processing] rename algorithm groups in GDAL provider
  • Loading branch information
alexbruy authored Mar 1, 2017
2 parents 26557c9 + dbca030 commit aeaa5fc
Show file tree
Hide file tree
Showing 49 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/AssignProjection.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Assign projection')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Projections')
self.group, self.i18n_group = self.trAlgorithm('Raster projections')

self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterCrs(self.CRS,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ClipByExtent.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Clip raster by extent')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction')
self.group, self.i18n_group = self.trAlgorithm('Raster extraction')

self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterString(self.NO_DATA,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ClipByMask.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Clip raster by mask layer')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction')
self.group, self.i18n_group = self.trAlgorithm('Raster extraction')

self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'),
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ColorRelief.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ColorRelief(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Color relief')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridAverage.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Moving average)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridDataMetrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Data metrics)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridInvDist.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Inverse distance to a power)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridNearest.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Grid (Nearest neighbor)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/aspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class aspect(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Aspect')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/buildvrt.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Build Virtual Raster')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'), dataobjects.TYPE_RASTER))
self.addParameter(ParameterSelection(self.RESOLUTION,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/contour.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Contour')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction')
self.group, self.i18n_group = self.trAlgorithm('Raster extraction')
self.addParameter(ParameterRaster(self.INPUT_RASTER,
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.INTERVAL,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/extractprojection.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Extract projection')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Projections')
self.group, self.i18n_group = self.trAlgorithm('Raster projections')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input file')))
self.addParameter(ParameterBoolean(self.PRJ_FILE,
self.tr('Create also .prj file'), False))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/fillnodata.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class fillnodata(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Fill nodata')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.DISTANCE,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdal2tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('gdal2tiles')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')

# Required parameters
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdal2xyz.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class gdal2xyz(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('gdal2xyz')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Conversion')
self.group, self.i18n_group = self.trAlgorithm('Raster conversion')
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.BAND,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaladdo.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Build overviews (pyramids)')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterString(self.LEVELS,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdalcalc.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class gdalcalc(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Raster calculator')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterRaster(
self.INPUT_A, self.tr('Input layer A'), False))
self.addParameter(ParameterString(self.BAND_A,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaltindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Tile Index')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'), dataobjects.TYPE_RASTER))
self.addParameter(ParameterString(self.FIELD_NAME,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/hillshade.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class hillshade(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Hillshade')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/information.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Information')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterRaster(information.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterBoolean(information.NOGCP,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Merge')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Raster miscellaneous')
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'),
dataobjects.TYPE_RASTER))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/nearblack.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def getIcon(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Near black')
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Analysis')
self.group, self.i18n_group = self.trAlgorithm('Raster analysis')
self.addParameter(ParameterRaster(self.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.NEAR,
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/offsetcurve.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class OffsetCurve(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Offset lines for lines')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogr.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class Ogr2Ogr(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Convert format')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Conversion')
self.group, self.i18n_group = self.trAlgorithm('Vector conversion')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Ogr2OgrBuffer(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Buffer vectors')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclip.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Ogr2OgrClip(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Clip vectors by polygon')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Ogr2OgrClipExtent(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Clip vectors by extent')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Ogr2OgrDissolve(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Dissolve polygons')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON]))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Ogr2OgrPointsOnLines(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Create points along lines')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Geoprocessing')
self.group, self.i18n_group = self.trAlgorithm('Vector geoprocessing')

self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def dbConnectionNames(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Import layer/table as geometryless table into PostgreSQL database')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Vector miscellaneous')
self.DB_CONNECTIONS = self.dbConnectionNames()
self.addParameter(ParameterSelection(self.DATABASE,
self.tr('Database (connection name)'), self.DB_CONNECTIONS))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class Ogr2OgrToPostGis(GdalAlgorithm):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Import Vector into PostGIS database (new connection)')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Vector miscellaneous')
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterString(self.SHAPE_ENCODING,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def __init__(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Import Vector into PostGIS database (available connections)')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Vector miscellaneous')
self.addParameter(ParameterString(
self.DATABASE,
self.tr('Database (connection name)'),
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogrinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def commandLineName(self):

def defineCharacteristics(self):
self.name, self.i18n_name = self.trAlgorithm('Information')
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.group, self.i18n_group = self.trAlgorithm('Vector miscellaneous')

self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))