Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use formatted name for algorithm names
Avoids conversion of names later and gives clearer separation
between visible names and internal names
  • Loading branch information
nyalldawson committed Apr 3, 2017
1 parent e506ceb commit a0bd464
Show file tree
Hide file tree
Showing 205 changed files with 219 additions and 244 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/AssignProjection.py
Expand Up @@ -47,7 +47,7 @@ class AssignProjection(GdalAlgorithm):
OUTPUT = 'OUTPUT'

def name(self):
return 'Assign projection'
return 'assignprojection'

def displayName(self):
return self.tr('Assign projection')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ClipByExtent.py
Expand Up @@ -54,7 +54,7 @@ class ClipByExtent(GdalAlgorithm):
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64']

def name(self):
return 'Clip raster by extent'
return 'cliprasterbyextent'

def displayName(self):
return self.tr('Clip raster by extent')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ClipByMask.py
Expand Up @@ -63,7 +63,7 @@ class ClipByMask(GdalAlgorithm):
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64']

def name(self):
return 'Clip raster by mask layer'
return 'cliprasterbymasklayer'

def displayName(self):
return self.tr('Clip raster by mask layer')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ColorRelief.py
Expand Up @@ -48,7 +48,7 @@ class ColorRelief(GdalAlgorithm):
MATCHING_MODES = ['"0,0,0,0" RGBA', 'Exact color', 'Nearest color']

def name(self):
return 'Color relief'
return 'colorrelief'

def displayName(self):
return self.tr('Color relief')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridAverage.py
Expand Up @@ -57,7 +57,7 @@ class GridAverage(GdalAlgorithm):
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64']

def name(self):
return 'Grid (Moving average)'
return 'gridmovingaverage'

def displayName(self):
return self.tr('Grid (Moving average)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridDataMetrics.py
Expand Up @@ -62,7 +62,7 @@ class GridDataMetrics(GdalAlgorithm):
'Average distance between points']

def name(self):
return 'Grid (Data metrics)'
return 'griddatametrics'

def displayName(self):
return self.tr('Grid (Data metrics)')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/GridInvDist.py
Expand Up @@ -63,11 +63,8 @@ class GridInvDist(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

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

def name(self):
return 'Grid (Inverse distance to a power)'
return 'gridinvdist'

def displayName(self):
return self.tr('Grid (Inverse distance to a power)')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/GridNearest.py
Expand Up @@ -59,11 +59,8 @@ class GridNearest(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))

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

def name(self):
return 'Grid (Nearest neighbor)'
return 'gridnearestneighbor'

def displayName(self):
return self.tr('Grid (Nearest neighbor)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/aspect.py
Expand Up @@ -49,7 +49,7 @@ class aspect(GdalAlgorithm):
OUTPUT = 'OUTPUT'

def name(self):
return 'Aspect'
return 'aspect'

def displayName(self):
return self.tr('Aspect')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/buildvrt.py
Expand Up @@ -52,7 +52,7 @@ class buildvrt(GdalAlgorithm):
RESOLUTION_OPTIONS = ['average', 'highest', 'lowest']

def name(self):
return 'Build Virtual Raster'
return 'buildvirtualraster'

def displayName(self):
return self.tr('Build Virtual Raster')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/contour.py
Expand Up @@ -52,7 +52,7 @@ class contour(GdalAlgorithm):
EXTRA = 'EXTRA'

def name(self):
return 'Contour'
return 'contour'

def displayName(self):
return self.tr('Contour')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/extractprojection.py
Expand Up @@ -45,7 +45,7 @@ class ExtractProjection(GdalAlgorithm):
PRJ_FILE = 'PRJ_FILE'

def name(self):
return 'Extract projection'
return 'extractprojection'

def displayName(self):
return self.tr('Extract projection')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/fillnodata.py
Expand Up @@ -53,7 +53,7 @@ class fillnodata(GdalAlgorithm):
OUTPUT = 'OUTPUT'

def name(self):
return 'Fill nodata'
return 'fillnodata'

def displayName(self):
return self.tr('Fill nodata')
Expand Down
3 changes: 0 additions & 3 deletions python/plugins/processing/algs/gdal/gdal2tiles.py
Expand Up @@ -60,9 +60,6 @@ class gdal2tiles(GdalAlgorithm):
RESAMPLINGS = ['average', 'near', 'bilinear', 'cubic', 'cubicspline', 'lanczos', 'antialias']
WEBVIEWERS = ['all', 'google', 'openlayers', 'leaflet', 'none']

def commandLineName(self):
return "gdal:gdal2tiles"

def name(self):
return 'gdal2tiles'

Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/gdaladdo.py
Expand Up @@ -66,11 +66,8 @@ class gdaladdo(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-overview.png'))

def commandLineName(self):
return "gdal:overviews"

def name(self):
return 'Build overviews (pyramids)'
return 'overviews'

def displayName(self):
return self.tr('Build overviews (pyramids)')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdalcalc.py
Expand Up @@ -60,7 +60,7 @@ class gdalcalc(GdalAlgorithm):
#DEBUG = 'DEBUG'

def name(self):
return 'Raster calculator'
return 'rastercalculator'

def displayName(self):
return self.tr('Raster calculator')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaltindex.py
Expand Up @@ -49,7 +49,7 @@ class gdaltindex(GdalAlgorithm):
PROJ_DIFFERENCE = 'PROJ_DIFFERENCE'

def name(self):
return 'Tile Index'
return 'tileindex'

def displayName(self):
return self.tr('Tile Index')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/hillshade.py
Expand Up @@ -52,7 +52,7 @@ class hillshade(GdalAlgorithm):
OUTPUT = 'OUTPUT'

def name(self):
return 'Hillshade'
return 'hillshade'

def displayName(self):
return self.tr('Hillshade')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/information.py
Expand Up @@ -49,11 +49,8 @@ class information(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-info.png'))

def commandLineName(self):
return "gdal:gdalinfo"

def name(self):
return 'Information'
return 'gdalinfo'

def displayName(self):
return self.tr('Information')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/merge.py
Expand Up @@ -58,7 +58,7 @@ def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'merge.png'))

def name(self):
return 'Merge'
return 'merge'

def displayName(self):
return self.tr('Merge')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/nearblack.py
Expand Up @@ -51,7 +51,7 @@ def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'nearblack.png'))

def name(self):
return 'Near black'
return 'nearblack'

def displayName(self):
return self.tr('Near black')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/offsetcurve.py
Expand Up @@ -47,7 +47,7 @@ class OffsetCurve(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Offset lines for lines'
return 'offsetlinesforlines'

def displayName(self):
return self.tr('Offset lines for lines')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogr.py
Expand Up @@ -101,7 +101,7 @@ class Ogr2Ogr(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Convert format'
return 'convertformat'

def displayName(self):
return self.tr('Convert format')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
Expand Up @@ -52,7 +52,7 @@ class Ogr2OgrBuffer(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Buffer vectors'
return 'buffervectors'

def displayName(self):
return self.tr('Buffer vectors')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclip.py
Expand Up @@ -46,7 +46,7 @@ class Ogr2OgrClip(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Clip vectors by polygon'
return 'clipvectorsbypolygon'

def displayName(self):
return self.tr('Clip vectors by polygon')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
Expand Up @@ -46,7 +46,7 @@ class Ogr2OgrClipExtent(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Clip vectors by extent'
return 'clipvectorsbyextent'

def displayName(self):
return self.tr('Clip vectors by extent')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
Expand Up @@ -54,7 +54,7 @@ class Ogr2OgrDissolve(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Dissolve polygons'
return 'dissolvepolygons'

def displayName(self):
return self.tr('Dissolve polygons')
Expand Down
Expand Up @@ -48,7 +48,7 @@ class Ogr2OgrPointsOnLines(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Create points along lines'
return 'createpointsalonglines'

def displayName(self):
return self.tr('Create points along lines')
Expand Down
Expand Up @@ -76,7 +76,7 @@ def dbConnectionNames(self):
return settings.childGroups()

def name(self):
return 'Import layer/table as geometryless table into PostgreSQL database'
return 'importlayertableasgeometrylesstableintopostgresqldatabase'

def displayName(self):
return self.tr('Import layer/table as geometryless table into PostgreSQL database')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
Expand Up @@ -79,7 +79,7 @@ class Ogr2OgrToPostGis(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Import Vector into PostGIS database (new connection)'
return 'importvectorintopostgisdatabasenewconnection'

def displayName(self):
return self.tr('Import Vector into PostGIS database (new connection)')
Expand Down
Expand Up @@ -85,7 +85,7 @@ def __init__(self):
self.processing = False

def name(self):
return 'Import Vector into PostGIS database (available connections)'
return 'importvectorintopostgisdatabaseavailableconnections'

def displayName(self):
return self.tr('Import Vector into PostGIS database (available connections)')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/ogrinfo.py
Expand Up @@ -43,11 +43,8 @@ class OgrInfo(GdalAlgorithm):
SUMMARY_ONLY = 'SUMMARY_ONLY'
OUTPUT = 'OUTPUT'

def commandLineName(self):
return "gdal:ogrinfo"

def name(self):
return 'Information'
return 'ogrinfo'

def displayName(self):
return self.tr('Information')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogrsql.py
Expand Up @@ -48,7 +48,7 @@ class OgrSql(GdalAlgorithm):
DIALECT = 'DIALECT'

def name(self):
return 'Execute SQL'
return 'executesql'

def displayName(self):
return self.tr('Execute SQL')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/onesidebuffer.py
Expand Up @@ -55,7 +55,7 @@ class OneSideBuffer(GdalAlgorithm):
OPTIONS = 'OPTIONS'

def name(self):
return 'Single sided buffer for lines'
return 'singlesidedbufferforlines'

def displayName(self):
return self.tr('Single sided buffer for lines')
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/pct2rgb.py
Expand Up @@ -51,7 +51,7 @@ def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', '8-to-24-bits.png'))

def name(self):
return 'PCT to RGB'
return 'pcttorgb'

def displayName(self):
return self.tr('PCT to RGB')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/polygonize.py
Expand Up @@ -50,14 +50,11 @@ def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'polygonize.png'))

def name(self):
return 'Polygonize (raster to vector)'
return 'polygonize'

def displayName(self):
return self.tr('Polygonize (raster to vector)')

def commandLineName(self):
return "gdal:polygonize"

def group(self):
return self.tr('Raster conversion')

Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/proximity.py
Expand Up @@ -60,11 +60,8 @@ class proximity(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'proximity.png'))

def commandLineName(self):
return "gdal:proximity"

def name(self):
return 'Proximity (raster distance)'
return 'proximity'

def displayName(self):
return self.tr('Proximity (raster distance)')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/rasterize.py
Expand Up @@ -65,11 +65,8 @@ class rasterize(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'rasterize.png'))

def commandLineName(self):
return "gdal:rasterize"

def name(self):
return 'Rasterize (vector to raster)'
return 'rasterize'

def displayName(self):
return self.tr('Rasterize (vector to raster)')
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/processing/algs/gdal/rasterize_over.py
Expand Up @@ -52,11 +52,8 @@ class rasterize_over(GdalAlgorithm):
def icon(self):
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'rasterize.png'))

def commandLineName(self):
return "gdal:rasterize_over"

def name(self):
return 'Rasterize (write over existing raster)'
return 'rasterize_over'

def displayName(self):
return self.tr('Rasterize (write over existing raster)')
Expand Down

0 comments on commit a0bd464

Please sign in to comment.