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

osgeo4w: fix b6293f23c8c (fixes #21210)

Browse Source
This commit is contained in:
Juergen E. Fischer 2019-02-10 21:06:56 +01:00
parent 29d4496452
commit eea4eda6a3
11 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,9 +92,13 @@ class AssignProjection(GdalAlgorithm):
arguments.append(fileName)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
self.setOutputValue(self.OUTPUT, fileName)
return commands

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

@ -130,8 +130,11 @@ class fillnodata(GdalAlgorithm):
arguments.append(raster.source())
arguments.append(out)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -229,8 +229,11 @@ class gdal2tiles(GdalAlgorithm):
arguments.append(inLayer.source())
arguments.append(self.parameterAsString(parameters, self.OUTPUT, context))
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -94,8 +94,11 @@ class gdal2xyz(GdalAlgorithm):
arguments.append(raster.source())
arguments.append(self.parameterAsFileOutput(parameters, self.OUTPUT, context))
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -166,8 +166,11 @@ class merge(GdalAlgorithm):
arguments.append('--optfile')
arguments.append(list_file)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -103,8 +103,11 @@ class pct2rgb(GdalAlgorithm):
if self.parameterAsBool(parameters, self.RGBA, context):
arguments.append('-rgba')
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -116,8 +116,11 @@ class polygonize(GdalAlgorithm):
arguments.append(layerName)
arguments.append(self.parameterAsString(parameters, self.FIELD, context))
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -187,8 +187,11 @@ class proximity(GdalAlgorithm):
arguments.append(inLayer.source())
arguments.append(out)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -209,8 +209,11 @@ class retile(GdalAlgorithm):
layers = [l.source() for l in self.parameterAsLayerList(parameters, self.INPUT, context)]
arguments.extend(layers)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -95,8 +95,11 @@ class rgb2pct(GdalAlgorithm):
arguments.append(raster.source())
arguments.append(out)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands

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

@ -120,8 +120,11 @@ class sieve(GdalAlgorithm):
arguments.append(raster.source())
arguments.append(out)
commands = [self.commandName() + '.py', GdalUtils.escapeAndJoin(arguments)]
if isWindows():
commands.insert(0, 'python3')
commands = ["python3", "-m", self.commandName()]
else:
commands = [self.commandName() + '.py']
commands.append(GdalUtils.escapeAndJoin(arguments))
return commands