sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix overridden function signatures

Browse Source
This commit is contained in:
Nyall Dawson 2017-06-27 17:20:57 +10:00
parent 5c888c5830
commit ce8e18da10
49 changed files with 145 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/gdal/AssignProjection.py
View File

@ -48,6 +48,8 @@ class AssignProjection(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterCrs(self.CRS,
self.tr('Desired CRS'), ''))
@ -66,7 +68,7 @@ class AssignProjection(GdalAlgorithm):
def group(self):
return self.tr('Raster projections')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
fileName = self.getParameterValue(self.INPUT)
crs = self.getParameterValue(self.CRS)
output = self.getOutputValue(self.OUTPUT) # NOQA

4
python/plugins/processing/algs/gdal/ClipByExtent.py
View File

@ -55,6 +55,8 @@ class ClipByExtent(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterString(self.NO_DATA,
self.tr("Nodata value, leave blank to take the nodata value from input"),
@ -83,7 +85,7 @@ class ClipByExtent(GdalAlgorithm):
def group(self):
return self.tr('Raster extraction')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
out = self.getOutputValue(self.OUTPUT)
noData = self.getParameterValue(self.NO_DATA)
opts = self.getParameterValue(self.OPTIONS)

4
python/plugins/processing/algs/gdal/ClipByMask.py
View File

@ -65,6 +65,8 @@ class ClipByMask(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'),
[dataobjects.TYPE_VECTOR_POLYGON]))
@ -102,7 +104,7 @@ class ClipByMask(GdalAlgorithm):
def group(self):
return self.tr('Raster extraction')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
out = self.getOutputValue(self.OUTPUT)
mask = self.getParameterValue(self.MASK)
context = dataobjects.createContext()

4
python/plugins/processing/algs/gdal/ColorRelief.py
View File

@ -49,6 +49,8 @@ class ColorRelief(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
@ -70,7 +72,7 @@ class ColorRelief(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['color-relief']
arguments.append(str(self.getParameterValue(self.INPUT)))
arguments.append(str(self.getParameterValue(self.COLOR_TABLE)))

2
python/plugins/processing/algs/gdal/GdalAlgorithm.py
View File

@ -62,7 +62,7 @@ class GdalAlgorithm(QgsProcessingAlgorithm):
def createCustomParametersWidget(self, parent):
return GdalAlgorithmDialog(self)
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
return None
def processAlgorithm(self, parameters, context, feedback):

4
python/plugins/processing/algs/gdal/GridAverage.py
View File

@ -58,6 +58,8 @@ class GridAverage(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
@ -90,7 +92,7 @@ class GridAverage(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['-l']
arguments.append(
os.path.basename(os.path.splitext(

4
python/plugins/processing/algs/gdal/GridDataMetrics.py
View File

@ -63,6 +63,8 @@ class GridDataMetrics(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
@ -97,7 +99,7 @@ class GridDataMetrics(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['-l']
arguments.append(
os.path.basename(os.path.splitext(

4
python/plugins/processing/algs/gdal/GridInvDist.py
View File

@ -65,6 +65,8 @@ class GridInvDist(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
@ -100,7 +102,7 @@ class GridInvDist(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['-l']
arguments.append(
os.path.basename(os.path.splitext(

4
python/plugins/processing/algs/gdal/GridNearest.py
View File

@ -61,6 +61,8 @@ class GridNearest(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POINT]))
self.addParameter(ParameterTableField(self.Z_FIELD,
@ -88,7 +90,7 @@ class GridNearest(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['-l']
arguments.append(
os.path.basename(os.path.splitext(

4
python/plugins/processing/algs/gdal/aspect.py
View File

@ -50,6 +50,8 @@ class aspect(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(
self.BAND, self.tr('Band number'), 1, 99, 1))
@ -74,7 +76,7 @@ class aspect(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['aspect']
arguments.append(str(self.getParameterValue(self.INPUT)))
output = str(self.getOutputValue(self.OUTPUT))

4
python/plugins/processing/algs/gdal/buildvrt.py
View File

@ -53,6 +53,8 @@ class buildvrt(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'), dataobjects.TYPE_RASTER))
self.addParameter(ParameterSelection(self.RESOLUTION,
@ -75,7 +77,7 @@ class buildvrt(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-resolution')
arguments.append(self.RESOLUTION_OPTIONS[self.getParameterValue(self.RESOLUTION)])

4
python/plugins/processing/algs/gdal/contour.py
View File

@ -53,6 +53,8 @@ class contour(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT_RASTER,
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.INTERVAL,
@ -79,7 +81,7 @@ class contour(GdalAlgorithm):
def group(self):
return self.tr('Raster extraction')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
output = self.getOutputValue(self.OUTPUT_VECTOR)
interval = str(self.getParameterValue(self.INTERVAL))
fieldName = str(self.getParameterValue(self.FIELD_NAME))

4
python/plugins/processing/algs/gdal/extractprojection.py
View File

@ -46,6 +46,8 @@ class ExtractProjection(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input file')))
self.addParameter(ParameterBoolean(self.PRJ_FILE,
self.tr('Create also .prj file'), False))
@ -62,7 +64,7 @@ class ExtractProjection(GdalAlgorithm):
def group(self):
return self.tr('Raster projections')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
return ["extractprojection"]
def processAlgorithm(self, parameters, context, feedback):

4
python/plugins/processing/algs/gdal/fillnodata.py
View File

@ -54,6 +54,8 @@ class fillnodata(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.DISTANCE,
@ -78,7 +80,7 @@ class fillnodata(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
output = self.getOutputValue(self.OUTPUT)
arguments = []

4
python/plugins/processing/algs/gdal/gdal2tiles.py
View File

@ -64,6 +64,8 @@ class gdal2tiles(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
# Required parameters
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
@ -128,7 +130,7 @@ class gdal2tiles(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []

4
python/plugins/processing/algs/gdal/gdal2xyz.py
View File

@ -45,6 +45,8 @@ class gdal2xyz(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.BAND,
@ -61,7 +63,7 @@ class gdal2xyz(GdalAlgorithm):
def group(self):
return self.tr('Raster conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-band')
arguments.append(str(self.getParameterValue(self.BAND)))

4
python/plugins/processing/algs/gdal/gdaladdo.py
View File

@ -68,6 +68,8 @@ class gdaladdo(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(
self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterString(self.LEVELS,
@ -89,7 +91,7 @@ class gdaladdo(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inFile = self.getParameterValue(self.INPUT)
clearOverviews = self.getParameterValue(self.CLEAN)
ovrFormat = self.getParameterValue(self.FORMAT)

4
python/plugins/processing/algs/gdal/gdalcalc.py
View File

@ -61,6 +61,8 @@ class gdalcalc(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(
self.INPUT_A, self.tr('Input layer A'), False))
self.addParameter(ParameterString(self.BAND_A,
@ -106,7 +108,7 @@ class gdalcalc(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
out = self.getOutputValue(self.OUTPUT)
extra = self.getParameterValue(self.EXTRA)
if extra is not None:

4
python/plugins/processing/algs/gdal/gdaltindex.py
View File

@ -50,6 +50,8 @@ class gdaltindex(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'), dataobjects.TYPE_RASTER))
self.addParameter(ParameterString(self.FIELD_NAME,
@ -71,7 +73,7 @@ class gdaltindex(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
fieldName = str(self.getParameterValue(self.FIELD_NAME))
arguments = []

4
python/plugins/processing/algs/gdal/hillshade.py
View File

@ -53,6 +53,8 @@ class hillshade(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
@ -83,7 +85,7 @@ class hillshade(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['hillshade']
arguments.append(str(self.getParameterValue(self.INPUT)))
arguments.append(str(self.getOutputValue(self.OUTPUT)))

4
python/plugins/processing/algs/gdal/information.py
View File

@ -51,6 +51,8 @@ class information(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(information.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterBoolean(information.NOGCP,
@ -69,7 +71,7 @@ class information(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
if self.getParameterValue(information.NOGCP):
arguments.append('-nogcp')

4
python/plugins/processing/algs/gdal/merge.py
View File

@ -59,6 +59,8 @@ class merge(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'),
dataobjects.TYPE_RASTER))
@ -87,7 +89,7 @@ class merge(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])

4
python/plugins/processing/algs/gdal/nearblack.py
View File

@ -52,6 +52,8 @@ class nearblack(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.NEAR,
@ -70,7 +72,7 @@ class nearblack(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-o')
output = str(self.getOutputValue(self.OUTPUT))

4
python/plugins/processing/algs/gdal/offsetcurve.py
View File

@ -48,6 +48,8 @@ class OffsetCurve(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
self.addParameter(ParameterString(self.GEOMETRY,
@ -72,7 +74,7 @@ class OffsetCurve(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
geometry = self.getParameterValue(self.GEOMETRY)
distance = self.getParameterValue(self.RADIUS)

4
python/plugins/processing/algs/gdal/ogr2ogr.py
View File

@ -102,6 +102,8 @@ class Ogr2Ogr(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterSelection(self.FORMAT,
@ -120,7 +122,7 @@ class Ogr2Ogr(GdalAlgorithm):
def group(self):
return self.tr('Vector conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = ogrConnectionString(inLayer)[1:-1]

4
python/plugins/processing/algs/gdal/ogr2ogrbuffer.py
View File

@ -53,6 +53,8 @@ class Ogr2OgrBuffer(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterString(self.GEOMETRY,
@ -83,7 +85,7 @@ class Ogr2OgrBuffer(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
geometry = self.getParameterValue(self.GEOMETRY)
distance = self.getParameterValue(self.DISTANCE)

4
python/plugins/processing/algs/gdal/ogr2ogrclip.py
View File

@ -47,6 +47,8 @@ class Ogr2OgrClip(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterVector(self.CLIP_LAYER,
@ -65,7 +67,7 @@ class Ogr2OgrClip(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = ogrConnectionString(inLayer)[1:-1]
clipLayer = self.getParameterValue(self.CLIP_LAYER)

4
python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
View File

@ -47,6 +47,8 @@ class Ogr2OgrClipExtent(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterExtent(self.CLIP_EXTENT,
@ -65,7 +67,7 @@ class Ogr2OgrClipExtent(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = ogrConnectionString(inLayer)[1:-1]
clipExtent = self.getParameterValue(self.CLIP_EXTENT)

4
python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
View File

@ -55,6 +55,8 @@ class Ogr2OgrDissolve(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_POLYGON]))
self.addParameter(ParameterString(self.GEOMETRY,
@ -89,7 +91,7 @@ class Ogr2OgrDissolve(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
geometry = self.getParameterValue(self.GEOMETRY)
field = self.getParameterValue(self.FIELD)

4
python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py
View File

@ -49,6 +49,8 @@ class Ogr2OgrPointsOnLines(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
self.addParameter(ParameterString(self.GEOMETRY,
@ -71,7 +73,7 @@ class Ogr2OgrPointsOnLines(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = ogrConnectionString(inLayer)[1:-1]
layername = "'" + ogrLayerName(inLayer) + "'"

4
python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
View File

@ -77,6 +77,8 @@ class Ogr2OgrTableToPostGisList(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.DB_CONNECTIONS = self.dbConnectionNames()
self.addParameter(ParameterSelection(self.DATABASE,
self.tr('Database (connection name)'), self.DB_CONNECTIONS))
@ -131,7 +133,7 @@ class Ogr2OgrTableToPostGisList(GdalAlgorithm):
GdalAlgorithm.processAlgorithm(parameters, self, context)
self.processing = False
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
connection = self.DB_CONNECTIONS[self.getParameterValue(self.DATABASE)]
uri = uri_from_name(connection)
if self.processing:

4
python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
View File

@ -80,6 +80,8 @@ class Ogr2OgrToPostGis(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer')))
self.addParameter(ParameterString(self.SHAPE_ENCODING,
@ -184,7 +186,7 @@ class Ogr2OgrToPostGis(GdalAlgorithm):
arguments.append('user=' + user)
return GdalUtils.escapeAndJoin(arguments)
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = ogrConnectionString(inLayer)[1:-1]
shapeEncoding = self.getParameterValue(self.SHAPE_ENCODING)

4
python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View File

@ -86,6 +86,8 @@ class Ogr2OgrToPostGisList(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterString(
self.DATABASE,
self.tr('Database (connection name)'),
@ -183,7 +185,7 @@ class Ogr2OgrToPostGisList(GdalAlgorithm):
GdalAlgorithm.processAlgorithm(parameters, None, self)
self.processing = False
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
connection = self.getParameterValue(self.DATABASE)
uri = uri_from_name(connection)
if self.processing:

4
python/plugins/processing/algs/gdal/ogrinfo.py
View File

@ -45,6 +45,8 @@ class OgrInfo(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterBoolean(self.SUMMARY_ONLY,
self.tr('Summary output only'),
@ -61,7 +63,7 @@ class OgrInfo(GdalAlgorithm):
def group(self):
return self.tr('Vector miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ["ogrinfo"]
arguments.append('-al')
if self.getParameterValue(self.SUMMARY_ONLY):

4
python/plugins/processing/algs/gdal/ogrsql.py
View File

@ -49,6 +49,8 @@ class OgrSql(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterTable(self.INPUT, self.tr('Input layer or table')))
self.addParameter(ParameterString(self.SQL, self.tr('SQL'), ''))
@ -69,7 +71,7 @@ class OgrSql(GdalAlgorithm):
def group(self):
return self.tr('Vector miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
sql = self.getParameterValue(self.SQL)
if sql == '':
raise GeoAlgorithmExecutionException(

4
python/plugins/processing/algs/gdal/onesidebuffer.py
View File

@ -56,6 +56,8 @@ class OneSideBuffer(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT_LAYER,
self.tr('Input layer'), [dataobjects.TYPE_VECTOR_LINE], False))
self.addParameter(ParameterString(self.GEOMETRY,
@ -88,7 +90,7 @@ class OneSideBuffer(GdalAlgorithm):
def group(self):
return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT_LAYER)
geometry = self.getParameterValue(self.GEOMETRY)
distance = self.getParameterValue(self.RADIUS)

4
python/plugins/processing/algs/gdal/pct2rgb.py
View File

@ -52,6 +52,8 @@ class pct2rgb(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(pct2rgb.INPUT,
self.tr('Input layer'), False))
options = []
@ -70,7 +72,7 @@ class pct2rgb(GdalAlgorithm):
def group(self):
return self.tr('Raster conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-b')
arguments.append(str(self.getParameterValue(pct2rgb.NBAND) + 1))

4
python/plugins/processing/algs/gdal/polygonize.py
View File

@ -51,6 +51,8 @@ class polygonize(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(polygonize.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterString(polygonize.FIELD,
@ -66,7 +68,7 @@ class polygonize(GdalAlgorithm):
def group(self):
return self.tr('Raster conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
output = self.getOutputValue(polygonize.OUTPUT)
arguments = []

4
python/plugins/processing/algs/gdal/proximity.py
View File

@ -62,6 +62,8 @@ class proximity(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterString(self.VALUES,
@ -88,7 +90,7 @@ class proximity(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
output = self.getOutputValue(self.OUTPUT)
arguments = []

4
python/plugins/processing/algs/gdal/rasterize.py
View File

@ -67,6 +67,8 @@ class rasterize(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterTableField(self.FIELD,
self.tr('Attribute field'), self.INPUT))
@ -102,7 +104,7 @@ class rasterize(GdalAlgorithm):
def group(self):
return self.tr('Vector conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT)
noData = self.getParameterValue(self.NO_DATA)
rastext = str(self.getParameterValue(self.RAST_EXT))

4
python/plugins/processing/algs/gdal/rasterize_over.py
View File

@ -56,6 +56,8 @@ class rasterize_over(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterTableField(self.FIELD,
self.tr('Attribute field'), self.INPUT))
@ -71,7 +73,7 @@ class rasterize_over(GdalAlgorithm):
def group(self):
return self.tr('Vector conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
context = dataobjects.createContext()
inLayer = QgsProcessingUtils.mapLayerFromString(self.getParameterValue(self.INPUT), context)
inRasterLayer = QgsProcessingUtils.mapLayerFromString(self.getParameterValue(self.INPUT_RASTER), context)

4
python/plugins/processing/algs/gdal/retile.py
View File

@ -67,6 +67,8 @@ class retile(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
# Required parameters
self.addParameter(ParameterMultipleInput(self.INPUT,
self.tr('Input layers'),
@ -124,7 +126,7 @@ class retile(GdalAlgorithm):
def group(self):
return self.tr('Raster miscellaneous')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []

4
python/plugins/processing/algs/gdal/rgb2pct.py
View File

@ -55,6 +55,8 @@ class rgb2pct(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(rgb2pct.INPUT,
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(rgb2pct.NCOLORS,
@ -67,7 +69,7 @@ class rgb2pct(GdalAlgorithm):
def displayName(self):
return self.tr('RGB to PCT')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments.append('-n')
arguments.append(str(self.getParameterValue(rgb2pct.NCOLORS)))

4
python/plugins/processing/algs/gdal/roughness.py
View File

@ -50,6 +50,8 @@ class roughness(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
@ -64,7 +66,7 @@ class roughness(GdalAlgorithm):
def displayName(self):
return self.tr('Roughness')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['roughness']
arguments.append(str(self.getParameterValue(self.INPUT)))
output = str(self.getOutputValue(self.OUTPUT))

4
python/plugins/processing/algs/gdal/sieve.py
View File

@ -58,6 +58,8 @@ class sieve(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterNumber(self.THRESHOLD,
self.tr('Threshold'), 0, 9999, 2))
@ -75,7 +77,7 @@ class sieve(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
output = self.getOutputValue(self.OUTPUT)
arguments = []

4
python/plugins/processing/algs/gdal/slope.py
View File

@ -54,6 +54,8 @@ class slope(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
@ -76,7 +78,7 @@ class slope(GdalAlgorithm):
def displayName(self):
return self.tr('Slope')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['slope']
arguments.append(str(self.getParameterValue(self.INPUT)))
output = str(self.getOutputValue(self.OUTPUT))

4
python/plugins/processing/algs/gdal/tpi.py
View File

@ -51,6 +51,8 @@ class tpi(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
@ -65,7 +67,7 @@ class tpi(GdalAlgorithm):
def displayName(self):
return self.tr('TPI (Topographic Position Index)')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['TPI']
arguments.append(str(self.getParameterValue(self.INPUT)))
arguments.append(str(self.getOutputValue(self.OUTPUT)))

4
python/plugins/processing/algs/gdal/translate.py
View File

@ -65,6 +65,8 @@ class translate(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.OUTSIZE,
self.tr('Set the size of the output file (In pixels or %)'),
@ -103,7 +105,7 @@ class translate(GdalAlgorithm):
def group(self):
return self.tr('Raster conversion')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT)
out = self.getOutputValue(translate.OUTPUT)
outsize = str(self.getParameterValue(self.OUTSIZE))

4
python/plugins/processing/algs/gdal/tri.py
View File

@ -48,6 +48,8 @@ class tri(GdalAlgorithm):
def __init__(self):
super().__init__()
def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 99, 1))
@ -65,7 +67,7 @@ class tri(GdalAlgorithm):
def group(self):
return self.tr('Raster analysis')
def getConsoleCommands(self, parameters):
def getConsoleCommands(self, parameters, context, feedback):
arguments = ['TRI']
arguments.append(str(self.getParameterValue(self.INPUT)))
arguments.append(str(self.getOutputValue(self.OUTPUT)))