Skip to content

Commit 94d5795

Browse files
pcavalexbruy
pcav
authored and
alexbruy
committedApr 19, 2015
Better naming for GDAL outputs (partial fix for http://hub.qgis.org/issues/12542)
Conflicts: python/plugins/processing/algs/gdal/gdalcalc.py python/plugins/processing/algs/gdal/gdaltindex.py
·
final-2_8_9final-2_8_2
1 parent 593027e commit 94d5795

22 files changed

+22
-22
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def defineCharacteristics(self):
5454
self.addParameter(ParameterExtent(self.PROJWIN, self.tr('Clipping extent')))
5555
self.addParameter(ParameterString(self.EXTRA,
5656
self.tr('Additional creation parameters'), '', optional=True))
57-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
57+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Clipped')))
5858

5959
def processAlgorithm(self, progress):
6060
out = self.getOutputValue(self.OUTPUT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def defineCharacteristics(self):
6363
self.addParameter(ParameterSelection(self.MATCH_MODE,
6464
self.tr('Matching mode'), self.MATCHING_MODES, 0))
6565

66-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
66+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Color relief')))
6767

6868
def processAlgorithm(self, progress):
6969
arguments = ['color-relief']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def defineCharacteristics(self):
7474
self.addParameter(ParameterSelection(self.RTYPE,
7575
self.tr('Output raster type'), self.TYPE, 5))
7676

77-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
77+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Average')))
7878

7979
def processAlgorithm(self, progress):
8080
arguments = ['-l']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def defineCharacteristics(self):
8080
self.addParameter(ParameterSelection(self.RTYPE,
8181
self.tr('Output raster type'), self.TYPE, 5))
8282

83-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
83+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated metrics')))
8484

8585
def processAlgorithm(self, progress):
8686
arguments = ['-l']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def defineCharacteristics(self):
8484
self.addParameter(ParameterSelection(self.RTYPE,
8585
self.tr('Output raster type'), self.TYPE, 5))
8686

87-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
87+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated IDW')))
8888

8989
def processAlgorithm(self, progress):
9090
arguments = ['-l']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def defineCharacteristics(self):
7272
self.addParameter(ParameterSelection(self.RTYPE,
7373
self.tr('Output raster type'), self.TYPE, 5))
7474

75-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
75+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Interpolated nearest neighbor')))
7676

7777
def processAlgorithm(self, progress):
7878
arguments = ['-l']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def defineCharacteristics(self):
6464
self.addParameter(ParameterBoolean(self.ZERO_FLAT,
6565
self.tr('Return 0 for flat (instead of -9999)'), False))
6666

67-
self.addOutput(OutputRaster(self.OUTPUT, 'Output file'))
67+
self.addOutput(OutputRaster(self.OUTPUT, 'Aspect'))
6868

6969
def processAlgorithm(self, progress):
7070
arguments = ['aspect']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
5757
self.tr('Layer stack'), True))
5858
self.addParameter(ParameterBoolean(self.PROJ_DIFFERENCE,
5959
self.tr('Allow projection difference'), False))
60-
self.addOutput(OutputRaster(buildvrt.OUTPUT, self.tr('Output layer')))
60+
self.addOutput(OutputRaster(buildvrt.OUTPUT, self.tr('Virtual')))
6161

6262
def processAlgorithm(self, progress):
6363
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def defineCharacteristics(self):
6464
self.addParameter(ParameterBoolean(self.NO_DEFAULT_MASK,
6565
self.tr('Do not use default validity mask'), False))
6666

67-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
67+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Filled')))
6868

6969
def processAlgorithm(self, progress):
7070
output = self.getOutputValue(self.OUTPUT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.addParameter(ParameterNumber(self.BAND,
5151
self.tr('Band number'), 1, 9999, 1))
5252

53-
self.addOutput(OutputTable(self.OUTPUT, self.tr('Output file')))
53+
self.addOutput(OutputTable(self.OUTPUT, self.tr('xyz')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def defineCharacteristics(self):
7373
self.tr('Resampling method'), self.METHODS, 0))
7474
self.addParameter(ParameterSelection(self.FORMAT,
7575
self.tr('Overview format'), self.FORMATS, 0))
76-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer'), True))
76+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Pyramidized'), True))
7777

7878
def processAlgorithm(self, progress):
7979
inFile = self.getParameterValue(self.INPUT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def defineCharacteristics(self):
6868
self.addParameter(ParameterNumber(self.ALTITUDE,
6969
self.tr('Altitude of the light'), 0.0, 99999999.999999, 45.0))
7070

71-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
71+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Hillshade')))
7272

7373
def processAlgorithm(self, progress):
7474
arguments = ['hillshade']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
5757
self.addParameter(ParameterSelection(self.RTYPE,
5858
self.tr('Output raster type'), self.TYPE, 5))
5959

60-
self.addOutput(OutputRaster(merge.OUTPUT, self.tr('Output layer')))
60+
self.addOutput(OutputRaster(merge.OUTPUT, self.tr('Merged')))
6161

6262
def processAlgorithm(self, progress):
6363
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.addParameter(ParameterBoolean(nearblack.WHITE,
5151
self.tr('Search for nearly white pixels instead of nearly black'),
5252
False))
53-
self.addOutput(OutputRaster(nearblack.OUTPUT, self.tr('Output layer')))
53+
self.addOutput(OutputRaster(nearblack.OUTPUT, self.tr('Nearblack')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
options.append(str(i + 1))
5151
self.addParameter(ParameterSelection(pct2rgb.NBAND,
5252
self.tr('Band to convert'), options))
53-
self.addOutput(OutputRaster(pct2rgb.OUTPUT, self.tr('Output layer')))
53+
self.addOutput(OutputRaster(pct2rgb.OUTPUT, self.tr('PCT to RGB')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.tr('Input layer'), False))
5151
self.addParameter(ParameterString(polygonize.FIELD,
5252
self.tr('Output field name'), 'DN'))
53-
self.addOutput(OutputVector(polygonize.OUTPUT, self.tr('Output layer')))
53+
self.addOutput(OutputVector(polygonize.OUTPUT, self.tr('Vectorized')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def defineCharacteristics(self):
7171
-1, 9999, -1))
7272
self.addParameter(ParameterSelection(self.RTYPE,
7373
self.tr('Output raster type'), self.TYPE, 5))
74-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
74+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Distance')))
7575

7676
def processAlgorithm(self, progress):
7777
output = self.getOutputValue(self.OUTPUT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def defineCharacteristics(self):
4848
self.tr('Input layer'), False))
4949
self.addParameter(ParameterNumber(rgb2pct.NCOLORS,
5050
self.tr('Number of colors'), 1, None, 2))
51-
self.addOutput(OutputRaster(rgb2pct.OUTPUT, self.tr('Output layer')))
51+
self.addOutput(OutputRaster(rgb2pct.OUTPUT, self.tr('RGB to PCT')))
5252

5353
def processAlgorithm(self, progress):
5454
arguments = []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
5151
self.tr('Compute edges'), False))
5252

53-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
53+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Roughness')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = ['roughness']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def defineCharacteristics(self):
5656
self.addParameter(ParameterSelection(self.CONNECTIONS,
5757
self.tr('Pixel connection'), self.PIXEL_CONNECTIONS, 0))
5858

59-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
59+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Sieved')))
6060

6161
def processAlgorithm(self, progress):
6262
output = self.getOutputValue(self.OUTPUT)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def defineCharacteristics(self):
6161
self.tr('Scale (ratio of vert. units to horiz.)'),
6262
0.0, 99999999.999999, 1.0))
6363

64-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
64+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Slope')))
6565

6666
def processAlgorithm(self, progress):
6767
arguments = ['slope']

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def defineCharacteristics(self):
5050
self.addParameter(ParameterBoolean(self.COMPUTE_EDGES,
5151
self.tr('Compute edges'), False))
5252

53-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output file')))
53+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Topographic Position Index')))
5454

5555
def processAlgorithm(self, progress):
5656
arguments = ['TPI']

0 commit comments

Comments
 (0)
Please sign in to comment.