Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Better naming for GDAL outputs (partial fix for http://hub.qgis.org/i…
  • Loading branch information
pcav committed Apr 10, 2015
1 parent a911e6e commit 686ba43
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ClipByExtent.py
Expand Up @@ -54,7 +54,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterExtent(self.PROJWIN, self.tr('Clipping extent')))
self.addParameter(ParameterString(self.EXTRA,
self.tr('Additional creation parameters'), '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Clipped')))

def processAlgorithm(self, progress):
out = self.getOutputValue(self.OUTPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ColorRelief.py
Expand Up @@ -63,7 +63,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.MATCH_MODE,
self.tr('Matching mode'), self.MATCHING_MODES, 0))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Color relief')))

def processAlgorithm(self, progress):
arguments = ['color-relief']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridAverage.py
Expand Up @@ -74,7 +74,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Average')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridDataMetrics.py
Expand Up @@ -80,7 +80,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated metrics')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridInvDist.py
Expand Up @@ -84,7 +84,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated IDW')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/GridNearest.py
Expand Up @@ -72,7 +72,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated nearest neighbor')))

def processAlgorithm(self, progress):
arguments = ['-l']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/aspect.py
Expand Up @@ -64,7 +64,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterBoolean(self.ZERO_FLAT,
self.tr('Return 0 for flat (instead of -9999)'), False))

self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
self.addOutput(OutputRaster(self.OUTPUT, 'Aspect'))

def processAlgorithm(self, progress):
arguments = ['aspect']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/buildvrt.py
Expand Up @@ -57,7 +57,7 @@ def defineCharacteristics(self):
self.tr('Layer stack'), True))
self.addParameter(ParameterBoolean(self.PROJ_DIFFERENCE,
self.tr('Allow projection difference'), False))
self.addOutput(OutputRaster(buildvrt.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(buildvrt.OUTPUT, self.tr('Virtual')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/fillnodata.py
Expand Up @@ -64,7 +64,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterBoolean(self.NO_DEFAULT_MASK,
self.tr('Do not use default validity mask'), False))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Filled')))

def processAlgorithm(self, progress):
output = self.getOutputValue(self.OUTPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdal2xyz.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterNumber(self.BAND,
self.tr('Band number'), 1, 9999, 1))

self.addOutput(OutputTable(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputTable(self.OUTPUT, self.tr('xyz')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaladdo.py
Expand Up @@ -73,7 +73,7 @@ def defineCharacteristics(self):
self.tr('Resampling method'), self.METHODS, 0))
self.addParameter(ParameterSelection(self.FORMAT,
self.tr('Overview format'), self.FORMATS, 0))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer'), True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Pyramidized'), True))

def processAlgorithm(self, progress):
inFile = self.getParameterValue(self.INPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdalcalc.py
Expand Up @@ -98,7 +98,7 @@ def defineCharacteristics(self):
# self.DEBUG, self.tr('Print debugging information'), False))
self.addParameter(ParameterString(self.EXTRA,
self.tr('Additional creation parameters'), '', optional=True))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Calculated')))

def processAlgorithm(self, progress):
out = self.getOutputValue(self.OUTPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/gdaltindex.py
Expand Up @@ -52,7 +52,7 @@ def defineCharacteristics(self):
'location', optional=True))
self.addParameter(ParameterBoolean(self.PROJ_DIFFERENCE,
self.tr('Skip files with different projection reference'), False))
self.addOutput(OutputVector(gdaltindex.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputVector(gdaltindex.OUTPUT, self.tr('Tiled')))

def processAlgorithm(self, progress):
fieldName = str(self.getParameterValue(self.FIELD_NAME))
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/hillshade.py
Expand Up @@ -68,7 +68,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterNumber(self.ALTITUDE,
self.tr('Altitude of the light'), 0.0, 99999999.999999, 45.0))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Hillshade')))

def processAlgorithm(self, progress):
arguments = ['hillshade']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/merge.py
Expand Up @@ -57,7 +57,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))

self.addOutput(OutputRaster(merge.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(merge.OUTPUT, self.tr('Merged')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/nearblack.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterBoolean(nearblack.WHITE,
self.tr('Search for nearly white pixels instead of nearly black'),
False))
self.addOutput(OutputRaster(nearblack.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(nearblack.OUTPUT, self.tr('Nearblack')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/pct2rgb.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
options.append(str(i + 1))
self.addParameter(ParameterSelection(pct2rgb.NBAND,
self.tr('Band to convert'), options))
self.addOutput(OutputRaster(pct2rgb.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(pct2rgb.OUTPUT, self.tr('PCT to RGB')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/polygonize.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
self.tr('Input layer'), False))
self.addParameter(ParameterString(polygonize.FIELD,
self.tr('Output field name'), 'DN'))
self.addOutput(OutputVector(polygonize.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputVector(polygonize.OUTPUT, self.tr('Vectorized')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/proximity.py
Expand Up @@ -71,7 +71,7 @@ def defineCharacteristics(self):
-1, 9999, -1))
self.addParameter(ParameterSelection(self.RTYPE,
self.tr('Output raster type'), self.TYPE, 5))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Distance')))

def processAlgorithm(self, progress):
output = self.getOutputValue(self.OUTPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/rgb2pct.py
Expand Up @@ -48,7 +48,7 @@ def defineCharacteristics(self):
self.tr('Input layer'), False))
self.addParameter(ParameterNumber(rgb2pct.NCOLORS,
self.tr('Number of colors'), 1, None, 2))
self.addOutput(OutputRaster(rgb2pct.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(rgb2pct.OUTPUT, self.tr('RGB to PCT')))

def processAlgorithm(self, progress):
arguments = []
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/roughness.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
self.tr('Compute edges'), False))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Roughness')))

def processAlgorithm(self, progress):
arguments = ['roughness']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/sieve.py
Expand Up @@ -56,7 +56,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.CONNECTIONS,
self.tr('Pixel connection'), self.PIXEL_CONNECTIONS, 0))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Sieved')))

def processAlgorithm(self, progress):
output = self.getOutputValue(self.OUTPUT)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/slope.py
Expand Up @@ -61,7 +61,7 @@ def defineCharacteristics(self):
self.tr('Scale (ratio of vert. units to horiz.)'),
0.0, 99999999.999999, 1.0))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Slope')))

def processAlgorithm(self, progress):
arguments = ['slope']
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/tpi.py
Expand Up @@ -50,7 +50,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
self.tr('Compute edges'), False))

self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Topographic Position Index')))

def processAlgorithm(self, progress):
arguments = ['TPI']
Expand Down

0 comments on commit 686ba43

Please sign in to comment.