Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[processing] restore gdal2xyz algorithm
  • Loading branch information
alexbruy committed Oct 11, 2017
1 parent 95c91f8 commit 491a9aa
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 20 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
Expand Up @@ -42,6 +42,7 @@
from .contour import contour
from .fillnodata import fillnodata
from .gdal2tiles import gdal2tiles
from .gdal2xyz import gdal2xyz
from .gdaltindex import gdaltindex
from .GridAverage import GridAverage
from .GridDataMetrics import GridDataMetrics
Expand Down Expand Up @@ -69,7 +70,6 @@
# from .gdaladdo import gdaladdo
# from .rasterize import rasterize
# from .extractprojection import ExtractProjection
# from .gdal2xyz import gdal2xyz
# from .gdalcalc import gdalcalc
# from .rasterize_over import rasterize_over

Expand Down Expand Up @@ -145,6 +145,7 @@ def loadAlgorithms(self):
contour(),
fillnodata(),
gdal2tiles(),
gdal2xyz(),
gdaltindex(),
GridAverage(),
GridDataMetrics(),
Expand All @@ -171,7 +172,6 @@ def loadAlgorithms(self):
# gdaladdo(),
# rasterize(),
# ExtractProjection(),
# gdal2xyz(),
# gdalcalc(),
# rasterize_over(),
# ----- OGR tools -----
Expand Down
43 changes: 25 additions & 18 deletions python/plugins/processing/algs/gdal/gdal2xyz.py
Expand Up @@ -16,7 +16,6 @@
* *
***************************************************************************
"""
from builtins import str

__author__ = 'Alexander Bruy'
__date__ = 'September 2013'
Expand All @@ -26,33 +25,38 @@

__revision__ = '$Format:%H$'

from qgis.core import (QgsProcessing,
QgsProcessingParameterRasterLayer,
QgsProcessingParameterBand,
QgsProcessingParameterBoolean,
QgsProcessingParameterFileDestination)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm

from processing.core.parameters import ParameterRaster
from processing.core.parameters import ParameterNumber
from processing.core.outputs import OutputTable

from processing.tools.system import isWindows

from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.system import isWindows


class gdal2xyz(GdalAlgorithm):

INPUT = 'INPUT'
BAND = 'BAND'
CSV = 'CSV'
OUTPUT = 'OUTPUT'

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,
self.tr('Band number'), 1, 9999, 1))

self.addOutput(OutputTable(self.OUTPUT, self.tr('xyz')))
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT,
self.tr('Input layer')))
self.addParameter(QgsProcessingParameterBand(self.BAND,
self.tr('Band number'),
parentLayerParameterName=self.INPUT))
self.addParameter(QgsProcessingParameterBoolean(self.CSV,
self.tr('Output comma-separated values'),
defaultValue=False))
self.addParameter(QgsProcessingParameterFileDestination(self.OUTPUT,
self.tr('XYZ ASCII file'),
self.tr('CSV files (*.csv)')))

def name(self):
return 'gdal2xyz'
Expand All @@ -64,13 +68,16 @@ def group(self):
return self.tr('Raster conversion')

def getConsoleCommands(self, parameters, context, feedback):
arguments = []
arguments = []
arguments.append('-band')
arguments.append(str(self.getParameterValue(self.BAND)))
arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))

if self.parameterAsBool(parameters, self.CSV, context):
arguments.append('-csv')

arguments.append('-csv')
arguments.append(self.getParameterValue(self.INPUT))
arguments.append(self.getOutputValue(self.OUTPUT))
arguments.append(self.parameterAsRasterLayer(parameters, self.INPUT, context).source())
arguments.append(self.parameterAsFileOutput(parameters, self.OUTPUT, context))

commands = []
if isWindows():
Expand Down

0 comments on commit 491a9aa

Please sign in to comment.