Skip to content

Commit 96c7e6e

Browse files
nyalldawsonnyalldawson
committed
[processing][gdal] Cleanup some code, add method to customise
generated command based on whether the algorithm is actually executing or just being displayed in the UI as a command
1 parent 7584bf1 commit 96c7e6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+56
-62
lines changed

‎python/plugins/processing/algs/gdal/AssignProjection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def icon(self):
7070
def group(self):
7171
return self.tr('Raster projections')
7272

73-
def getConsoleCommands(self, parameters, context, feedback):
73+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7474
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
7575
fileName = inLayer.source()
7676

‎python/plugins/processing/algs/gdal/Buffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def group(self):
9898
def commandName(self):
9999
return 'ogr2ogr'
100100

101-
def getConsoleCommands(self, parameters, context, feedback):
101+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
102102
fields = self.parameterAsSource(parameters, self.INPUT, context).fields()
103103
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
104104
geometry = self.parameterAsString(parameters, self.GEOMETRY, context)

‎python/plugins/processing/algs/gdal/ClipRasterByExtent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def icon(self):
105105
def commandName(self):
106106
return "gdal_translate"
107107

108-
def getConsoleCommands(self, parameters, context, feedback):
108+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
109109
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
110110
bbox = self.parameterAsExtent(parameters, self.EXTENT, context, inLayer.crs())
111111
nodata = self.parameterAsDouble(parameters, self.NODATA, context)

‎python/plugins/processing/algs/gdal/ClipRasterByMask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def icon(self):
116116
def group(self):
117117
return self.tr('Raster extraction')
118118

119-
def getConsoleCommands(self, parameters, context, feedback):
119+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
120120
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
121121

122122
maskLayer, maskLayerName = self.getOgrCompatibleSource(self.MASK, parameters, context, feedback)

‎python/plugins/processing/algs/gdal/ClipVectorByExtent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def group(self):
7474
def commandName(self):
7575
return 'ogr2ogr'
7676

77-
def getConsoleCommands(self, parameters, context, feedback):
77+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7878
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
7979
source = self.parameterAsSource(parameters, self.INPUT, context)
8080
extent = self.parameterAsExtent(parameters, self.EXTENT, context, source.sourceCrs())

‎python/plugins/processing/algs/gdal/ClipVectorByMask.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def group(self):
7373
def commandName(self):
7474
return 'ogr2ogr'
7575

76-
def getConsoleCommands(self, parameters, context, feedback):
76+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7777
inLayer, inLayerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
7878
maskLayer, maskLayerName = self.getOgrCompatibleSource(self.MASK, parameters, context, feedback)
7979
options = self.parameterAsString(parameters, self.OPTIONS, context)

‎python/plugins/processing/algs/gdal/ColorRelief.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def displayName(self):
9292
def group(self):
9393
return self.tr('Raster analysis')
9494

95-
def getConsoleCommands(self, parameters, context, feedback):
95+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
9696
arguments = ['color-relief']
9797
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
9898
arguments.append(inLayer.source())

‎python/plugins/processing/algs/gdal/Dissolve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def group(self):
109109
def commandName(self):
110110
return 'ogr2ogr'
111111

112-
def getConsoleCommands(self, parameters, context, feedback):
112+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
113113
fields = self.parameterAsSource(parameters, self.INPUT, context).fields()
114114
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
115115
geometry = self.parameterAsString(parameters, self.GEOMETRY, context)

‎python/plugins/processing/algs/gdal/ExecuteSql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def displayName(self):
8282
def group(self):
8383
return self.tr('Vector miscellaneous')
8484

85-
def getConsoleCommands(self, parameters, context, feedback):
85+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
8686
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
8787
sql = self.parameterAsString(parameters, self.SQL, context)
8888
options = self.parameterAsString(parameters, self.OPTIONS, context)

‎python/plugins/processing/algs/gdal/GdalAlgorithm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def createInstance(self, config={}):
5959
def createCustomParametersWidget(self, parent):
6060
return GdalAlgorithmDialog(self)
6161

62-
def getConsoleCommands(self, parameters, context, feedback):
62+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
6363
return None
6464

6565
def getOgrCompatibleSource(self, parameter_name, parameters, context, feedback):
@@ -94,7 +94,7 @@ def setOutputValue(self, name, value):
9494
self.output_values[name] = value
9595

9696
def processAlgorithm(self, parameters, context, feedback):
97-
commands = self.getConsoleCommands(parameters, context, feedback)
97+
commands = self.getConsoleCommands(parameters, context, feedback, executing=True)
9898
GdalUtils.runGdal(commands, feedback)
9999

100100
# auto generate outputs

‎python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def parametersHaveChanged(self):
118118
self.text.setPlainText('')
119119
return
120120

121-
commands = self.alg.getConsoleCommands(parameters, context, feedback)
121+
commands = self.alg.getConsoleCommands(parameters, context, feedback, executing=False)
122122
commands = [c for c in commands if c not in ['cmd.exe', '/C ']]
123123
self.text.setPlainText(" ".join(commands))
124124
except AlgorithmDialogBase.InvalidParameterValue as e:

‎python/plugins/processing/algs/gdal/GridAverage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def group(self):
135135
def icon(self):
136136
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
137137

138-
def getConsoleCommands(self, parameters, context, feedback):
138+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
139139
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
140140

141141
arguments = ['-l']

‎python/plugins/processing/algs/gdal/GridDataMetrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def icon(self):
149149
def group(self):
150150
return self.tr('Raster analysis')
151151

152-
def getConsoleCommands(self, parameters, context, feedback):
152+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
153153
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
154154

155155
arguments = ['-l']

‎python/plugins/processing/algs/gdal/GridInverseDistance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def group(self):
155155
def icon(self):
156156
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
157157

158-
def getConsoleCommands(self, parameters, context, feedback):
158+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
159159
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
160160

161161
arguments = ['-l']

‎python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def group(self):
142142
def icon(self):
143143
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
144144

145-
def getConsoleCommands(self, parameters, context, feedback):
145+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
146146
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
147147

148148
arguments = ['-l']

‎python/plugins/processing/algs/gdal/GridLinear.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def group(self):
117117
def icon(self):
118118
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
119119

120-
def getConsoleCommands(self, parameters, context, feedback):
120+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
121121
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
122122

123123
arguments = ['-l']

‎python/plugins/processing/algs/gdal/GridNearestNeighbor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def group(self):
130130
def icon(self):
131131
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
132132

133-
def getConsoleCommands(self, parameters, context, feedback):
133+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
134134
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
135135

136136
arguments = ['-l']

‎python/plugins/processing/algs/gdal/OffsetCurve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def group(self):
8181
def commandName(self):
8282
return 'ogr2ogr'
8383

84-
def getConsoleCommands(self, parameters, context, feedback):
84+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
8585
fields = self.parameterAsSource(parameters, self.INPUT, context).fields()
8686
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
8787
geometry = self.parameterAsString(parameters, self.GEOMETRY, context)

‎python/plugins/processing/algs/gdal/OgrToPostGis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def getConnectionString(self, parameters, context):
184184
arguments.append('user=' + user)
185185
return GdalUtils.escapeAndJoin(arguments)
186186

187-
def getConsoleCommands(self, parameters, context, feedback):
187+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
188188
inLayer = self.parameterAsSource(parameters, self.INPUT, context)
189189
ogrLayer, layername = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
190190
shapeEncoding = self.parameterAsString(parameters, self.SHAPE_ENCODING, context)

‎python/plugins/processing/algs/gdal/OneSideBuffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def group(self):
107107
def commandName(self):
108108
return 'ogr2ogr'
109109

110-
def getConsoleCommands(self, parameters, context, feedback):
110+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
111111
fields = self.parameterAsSource(parameters, self.INPUT, context).fields()
112112
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
113113
geometry = self.parameterAsString(parameters, self.GEOMETRY, context)

‎python/plugins/processing/algs/gdal/PointsAlongLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def group(self):
8686
def commandName(self):
8787
return 'ogr2ogr'
8888

89-
def getConsoleCommands(self, parameters, context, feedback):
89+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
9090
fields = self.parameterAsSource(parameters, self.INPUT, context).fields()
9191
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
9292
distance = self.parameterAsDouble(parameters, self.DISTANCE, context)

‎python/plugins/processing/algs/gdal/aspect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def displayName(self):
9393
def group(self):
9494
return self.tr('Raster analysis')
9595

96-
def getConsoleCommands(self, parameters, context, feedback):
96+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
9797
arguments = ['aspect']
9898
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
9999
arguments.append(inLayer.source())

‎python/plugins/processing/algs/gdal/buildvrt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def icon(self):
100100
def group(self):
101101
return self.tr('Raster miscellaneous')
102102

103-
def getConsoleCommands(self, parameters, context, feedback):
103+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
104104
arguments = []
105105
arguments.append('-resolution')
106106
arguments.append(self.RESOLUTION_OPTIONS[self.parameterAsEnum(parameters, self.RESOLUTION, context)])

‎python/plugins/processing/algs/gdal/contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def icon(self):
118118
def group(self):
119119
return self.tr('Raster extraction')
120120

121-
def getConsoleCommands(self, parameters, context, feedback):
121+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
122122
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
123123
fieldName = self.parameterAsString(parameters, self.FIELD_NAME, context)
124124
nodata = self.parameterAsDouble(parameters, self.NODATA, context)

‎python/plugins/processing/algs/gdal/extractprojection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def icon(self):
6363
def group(self):
6464
return self.tr('Raster projections')
6565

66-
def getConsoleCommands(self, parameters, context, feedback):
66+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
6767
return ["extractprojection"]
6868

6969
def processAlgorithm(self, parameters, context, feedback):

‎python/plugins/processing/algs/gdal/fillnodata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def displayName(self):
8686
def group(self):
8787
return self.tr('Raster analysis')
8888

89-
def getConsoleCommands(self, parameters, context, feedback):
89+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
9090
arguments = []
9191
arguments.append('-md')
9292
arguments.append(str(self.parameterAsInt(parameters, self.DISTANCE, context)))

‎python/plugins/processing/algs/gdal/gdal2tiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def displayName(self):
153153
def group(self):
154154
return self.tr('Raster miscellaneous')
155155

156-
def getConsoleCommands(self, parameters, context, feedback):
156+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
157157
arguments = []
158158

159159
arguments.append('-p')

‎python/plugins/processing/algs/gdal/gdal2xyz.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def displayName(self):
6969
def group(self):
7070
return self.tr('Raster conversion')
7171

72-
def getConsoleCommands(self, parameters, context, feedback):
72+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7373
arguments = []
7474
arguments = []
7575
arguments.append('-band')

‎python/plugins/processing/algs/gdal/gdaladdo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def group(self):
102102
def icon(self):
103103
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-overview.png'))
104104

105-
def getConsoleCommands(self, parameters, context, feedback):
105+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
106106
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
107107
fileName = inLayer.source()
108108

‎python/plugins/processing/algs/gdal/gdalcalc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def displayName(self):
102102
def group(self):
103103
return self.tr('Raster miscellaneous')
104104

105-
def getConsoleCommands(self, parameters, context, feedback):
105+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
106106
out = self.getOutputValue(self.OUTPUT)
107107
extra = self.getParameterValue(self.EXTRA)
108108
if extra is not None:

‎python/plugins/processing/algs/gdal/gdalinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def group(self):
8383
def icon(self):
8484
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'raster-info.png'))
8585

86-
def getConsoleCommands(self, parameters, context, feedback):
86+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
8787
arguments = []
8888
if self.parameterAsBool(parameters, self.MIN_MAX, context):
8989
arguments.append('-mm')

‎python/plugins/processing/algs/gdal/gdaltindex.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def group(self):
114114
def icon(self):
115115
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'tiles.png'))
116116

117-
def getConsoleCommands(self, parameters, context, feedback):
117+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
118118
input_layers = self.parameterAsLayerList(parameters, self.LAYERS, context)
119119
crs_field = self.parameterAsString(parameters, self.CRS_FIELD_NAME, context)
120120
crs_format = self.parameterAsEnum(parameters, self.CRS_FORMAT, context)

‎python/plugins/processing/algs/gdal/hillshade.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def displayName(self):
120120
def group(self):
121121
return self.tr('Raster analysis')
122122

123-
def getConsoleCommands(self, parameters, context, feedback):
123+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
124124
arguments = ['hillshade']
125125
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
126126
arguments.append(inLayer.source())

‎python/plugins/processing/algs/gdal/merge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def group(self):
101101
def icon(self):
102102
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'merge.png'))
103103

104-
def getConsoleCommands(self, parameters, context, feedback):
104+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
105105
layers = self.parameterAsLayerList(parameters, self.INPUT, context)
106106
out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
107107

‎python/plugins/processing/algs/gdal/nearblack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def group(self):
8989
def icon(self):
9090
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'nearblack.png'))
9191

92-
def getConsoleCommands(self, parameters, context, feedback):
92+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
9393
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
9494

9595
arguments = []

‎python/plugins/processing/algs/gdal/ogr2ogr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def group(self):
7171
def commandName(self):
7272
return 'ogr2ogr'
7373

74-
def getConsoleCommands(self, parameters, context, feedback):
74+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7575
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
7676
options = self.parameterAsString(parameters, self.OPTIONS, context)
7777
outFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)

‎python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class Ogr2OgrTableToPostGisList(GdalAlgorithm):
6060

6161
def __init__(self):
6262
GdalAlgorithm.__init__(self)
63-
self.processing = False
6463

6564
def dbConnectionNames(self):
6665
settings = QgsSettings()
@@ -120,15 +119,10 @@ def displayName(self):
120119
def group(self):
121120
return self.tr('Vector miscellaneous')
122121

123-
def processAlgorithm(self, parameters, context, feedback):
124-
self.processing = True
125-
GdalAlgorithm.processAlgorithm(parameters, self, context)
126-
self.processing = False
127-
128-
def getConsoleCommands(self, parameters, context, feedback):
122+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
129123
connection = self.DB_CONNECTIONS[self.getParameterValue(self.DATABASE)]
130124
uri = uri_from_name(connection)
131-
if self.processing:
125+
if executing:
132126
# to get credentials input when needed
133127
uri = GeoDB(uri=uri).uri
134128

@@ -162,7 +156,7 @@ def getConsoleCommands(self, parameters, context, feedback):
162156
arguments.append('-f')
163157
arguments.append('PostgreSQL')
164158
arguments.append('PG:"')
165-
for token in uri.connectionInfo(self.processing).split(' '):
159+
for token in uri.connectionInfo(executing).split(' '):
166160
arguments.append(token)
167161
arguments.append('active_schema={}'.format(schema or 'public'))
168162
arguments.append('"')

‎python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def processAlgorithm(self, parameters, context, feedback):
172172
GdalAlgorithm.processAlgorithm(parameters, None, self)
173173
self.processing = False
174174

175-
def getConsoleCommands(self, parameters, context, feedback):
175+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
176176
connection = self.getParameterValue(self.DATABASE)
177177
uri = uri_from_name(connection)
178178
if self.processing:

‎python/plugins/processing/algs/gdal/ogrinfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def displayName(self):
6868
def group(self):
6969
return self.tr('Vector miscellaneous')
7070

71-
def getConsoleCommands(self, parameters, context, feedback):
71+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7272
arguments = ['ogrinfo']
7373
arguments.append('-al')
7474

‎python/plugins/processing/algs/gdal/pct2rgb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def group(self):
7474
def icon(self):
7575
return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', '8-to-24-bits.png'))
7676

77-
def getConsoleCommands(self, parameters, context, feedback):
77+
def getConsoleCommands(self, parameters, context, feedback, executing=True):
7878
arguments = []
7979
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
8080
arguments.append(inLayer.source())

0 commit comments

Comments
 (0)