Skip to content

Commit

Permalink
Port gdal translate alg to new api
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Aug 30, 2017
1 parent a29e378 commit d463178
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 59 deletions.
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
View file
Expand Up @@ -39,11 +39,11 @@
from .ColorRelief import ColorRelief from .ColorRelief import ColorRelief
from .information import information from .information import information
from .rgb2pct import rgb2pct from .rgb2pct import rgb2pct
from .translate import translate
from .tri import tri from .tri import tri
from .warp import warp from .warp import warp
from .nearblack import nearblack from .nearblack import nearblack


# from .translate import translate
# from .pct2rgb import pct2rgb # from .pct2rgb import pct2rgb
# from .merge import merge # from .merge import merge
# from .polygonize import polygonize # from .polygonize import polygonize
Expand Down Expand Up @@ -148,10 +148,9 @@ def loadAlgorithms(self):
information(), information(),
nearblack(), nearblack(),
rgb2pct(), rgb2pct(),
translate(),
tri(), tri(),
warp(), warp(),
# translate(),
#
# pct2rgb(), # pct2rgb(),
# merge(), # merge(),
# polygonize(), # polygonize(),
Expand Down
2 changes: 2 additions & 0 deletions python/plugins/processing/algs/gdal/GdalUtils.py
View file
Expand Up @@ -193,6 +193,8 @@ def getFormatShortNameFromFilename(filename):
def escapeAndJoin(strList): def escapeAndJoin(strList):
joined = '' joined = ''
for s in strList: for s in strList:
if not isinstance(s, str):
s = str(s)
if s and s[0] != '-' and ' ' in s: if s and s[0] != '-' and ' ' in s:
escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') \ escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') \
+ '"' + '"'
Expand Down
114 changes: 58 additions & 56 deletions python/plugins/processing/algs/gdal/translate.py
View file
Expand Up @@ -30,15 +30,16 @@


from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtGui import QIcon


from qgis.core import (QgsProcessingParameterRasterLayer,
QgsProcessingParameterNumber,
QgsProcessingParameterBoolean,
QgsProcessingParameterString,
QgsProcessingParameterEnum,
QgsProcessingParameterCrs,
QgsProcessingParameterExtent,
QgsProcessingParameterRasterDestination,
QgsProcessingUtils)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.core.parameters import (ParameterRaster,
ParameterString,
ParameterNumber,
ParameterBoolean,
ParameterSelection,
ParameterExtent,
ParameterCrs)
from processing.core.outputs import OutputRaster


from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils


Expand Down Expand Up @@ -67,34 +68,35 @@ def __init__(self):
super().__init__() super().__init__()


def initAlgorithm(self, config=None): def initAlgorithm(self, config=None):
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'))) self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterNumber(self.OUTSIZE, self.addParameter(QgsProcessingParameterNumber(self.OUTSIZE,
self.tr('Set the size of the output file (In pixels or %)'), self.tr('Set the size of the output file (In pixels or %)'),
1, None, 100)) minValue=1, defaultValue=100))
self.addParameter(ParameterBoolean(self.OUTSIZE_PERC, self.addParameter(QgsProcessingParameterBoolean(self.OUTSIZE_PERC,
self.tr('Output size is a percentage of input size'), True)) self.tr('Output size is a percentage of input size'), defaultValue=True))
self.addParameter(ParameterString(self.NO_DATA, self.addParameter(QgsProcessingParameterString(self.NO_DATA,
self.tr("Nodata value, leave blank to take the nodata value from input"), self.tr("Nodata value, leave blank to take the nodata value from input"),
'', optional=True)) defaultValue='', optional=True))
self.addParameter(ParameterSelection(self.EXPAND, self.addParameter(QgsProcessingParameterEnum(self.EXPAND,
self.tr('Expand'), ['none', 'gray', 'rgb', 'rgba'], default=0)) self.tr('Expand'), options=['none', 'gray', 'rgb', 'rgba'], defaultValue=0))
self.addParameter(ParameterCrs(self.SRS, self.addParameter(QgsProcessingParameterCrs(self.SRS,
self.tr('Output projection for output file [leave blank to use input projection]'), None, optional=True)) self.tr('Output projection for output file [leave blank to use input projection]'), defaultValue=None, optional=True))
self.addParameter(ParameterExtent(self.PROJWIN, self.addParameter(QgsProcessingParameterExtent(self.PROJWIN,
self.tr('Subset based on georeferenced coordinates'), optional=True)) self.tr('Subset based on georeferenced coordinates'), optional=True))
self.addParameter(ParameterBoolean(self.SDS, self.addParameter(QgsProcessingParameterBoolean(self.SDS,
self.tr('Copy all subdatasets of this file to individual output files'), self.tr('Copy all subdatasets of this file to individual output files'),
False)) defaultValue=False))


self.addParameter(ParameterString(self.OPTIONS, create_options_param = QgsProcessingParameterString(self.OPTIONS,
self.tr('Additional creation options'), self.tr('Additional creation options'),
optional=True, optional=True)
metadata={'widget_wrapper': 'processing.algs.gdal.ui.RasterOptionsWidget.RasterOptionsWidgetWrapper'})) create_options_param.setMetadata({'widget_wrapper': 'processing.algs.gdal.ui.RasterOptionsWidget.RasterOptionsWidgetWrapper'})
self.addParameter(ParameterSelection(self.RTYPE, self.addParameter(create_options_param)
self.tr('Output raster type'), self.addParameter(QgsProcessingParameterEnum(self.RTYPE,
self.TYPE, 5)) self.tr('Output raster type'),

options=self.TYPE, defaultValue=5))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Converted')))
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT, self.tr('Converted')))


def name(self): def name(self):
return 'translate' return 'translate'
Expand All @@ -106,18 +108,19 @@ def group(self):
return self.tr('Raster conversion') return self.tr('Raster conversion')


def getConsoleCommands(self, parameters, context, feedback): def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.getParameterValue(self.INPUT) inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
out = self.getOutputValue(translate.OUTPUT) out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
outsize = str(self.getParameterValue(self.OUTSIZE)) outsize = str(self.parameterAsInt(parameters, self.OUTSIZE, context))
outsizePerc = str(self.getParameterValue(self.OUTSIZE_PERC)) outsizePerc = self.parameterAsBool(parameters, self.OUTSIZE_PERC, context)
noData = self.getParameterValue(self.NO_DATA) noData = self.parameterAsString(parameters, self.NO_DATA, context)
expand = parameters[self.EXPAND].options[self.getParameterValue(self.EXPAND)][1] expand = self.parameterDefinition(self.EXPAND).options()[self.parameterAsEnum(parameters, self.EXPAND, context)]
projwin = str(self.getParameterValue(self.PROJWIN))
if not projwin: proj_extent = self.parameterAsExtent(parameters, self.PROJWIN, context)
projwin = QgsProcessingUtils.combineLayerExtents([inLayer]) if proj_extent.isNull():
crsId = self.getParameterValue(self.SRS) proj_extent = QgsProcessingUtils.combineLayerExtents([inLayer])
sds = self.getParameterValue(self.SDS) crsId = self.parameterAsCrs(parameters, self.SRS, context).authid()
opts = self.getParameterValue(self.OPTIONS) sds = self.parameterAsBool(parameters, self.SDS, context)
opts = self.parameterAsString(parameters, self.OPTIONS, context)


if noData is not None: if noData is not None:
noData = str(noData) noData = str(noData)
Expand All @@ -126,8 +129,8 @@ def getConsoleCommands(self, parameters, context, feedback):
arguments.append('-of') arguments.append('-of')
arguments.append(GdalUtils.getFormatShortNameFromFilename(out)) arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
arguments.append('-ot') arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)]) arguments.append(self.TYPE[self.parameterAsEnum(parameters, self.RTYPE, context)])
if outsizePerc == 'True': if outsizePerc:
arguments.append('-outsize') arguments.append('-outsize')
arguments.append(outsize + '%') arguments.append(outsize + '%')
arguments.append(outsize + '%') arguments.append(outsize + '%')
Expand All @@ -141,14 +144,13 @@ def getConsoleCommands(self, parameters, context, feedback):
if expand != 'none': if expand != 'none':
arguments.append('-expand') arguments.append('-expand')
arguments.append(expand) arguments.append(expand)
regionCoords = projwin.split(',')
try: try:
projwin = [] projwin = []
projwin.append('-projwin') projwin.append('-projwin')
projwin.append(regionCoords[0]) projwin.append(proj_extent.xMinimum())
projwin.append(regionCoords[3]) projwin.append(proj_extent.yMaximum())
projwin.append(regionCoords[1]) projwin.append(proj_extent.xMaximum())
projwin.append(regionCoords[2]) projwin.append(proj_extent.yMinimum())
except IndexError: except IndexError:
projwin = [] projwin = []
if projwin: if projwin:
Expand All @@ -163,7 +165,7 @@ def getConsoleCommands(self, parameters, context, feedback):
arguments.append('-co') arguments.append('-co')
arguments.append(opts) arguments.append(opts)


arguments.append(self.getParameterValue(self.INPUT)) arguments.append(inLayer.source())
arguments.append(out) arguments.append(out)


return ['gdal_translate', GdalUtils.escapeAndJoin(arguments)] return ['gdal_translate', GdalUtils.escapeAndJoin(arguments)]

0 comments on commit d463178

Please sign in to comment.