Skip to content

Commit 593027e

Browse files
pcavalexbruy
authored andcommitted
Various fixes to Processing algs; fix for http://hub.qgis.org/issues/12537
Conflicts: python/plugins/processing/algs/gdal/ogr2ogrbuffer.py python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
1 parent 4cf7b4f commit 593027e

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

python/plugins/processing/algs/gdal/rasterize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def defineCharacteristics(self):
8686
self.tr("Nodata value"),
8787
'-9999'))
8888
self.addParameter(ParameterSelection(self.COMPRESS,
89-
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0))
89+
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5))
9090
self.addParameter(ParameterNumber(self.JPEGCOMPRESSION,
9191
self.tr('Set the JPEG compression level'),
9292
1, 100, 75))

python/plugins/processing/algs/gdal/translate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def defineCharacteristics(self):
9090
self.addParameter(ParameterSelection(self.RTYPE,
9191
self.tr('Output raster type'), self.TYPE, 5))
9292
self.addParameter(ParameterSelection(self.COMPRESS,
93-
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0))
93+
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5))
9494
self.addParameter(ParameterNumber(self.JPEGCOMPRESSION,
9595
self.tr('Set the JPEG compression level'),
9696
1, 100, 75))
@@ -108,7 +108,7 @@ def defineCharacteristics(self):
108108
self.tr('Force the generation of an associated ESRI world file (.tfw))'), False))
109109
self.addParameter(ParameterString(self.EXTRA,
110110
self.tr('Additional creation parameters'), '', optional=True))
111-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
111+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Translated')))
112112

113113
def processAlgorithm(self, progress):
114114
out = self.getOutputValue(translate.OUTPUT)

python/plugins/processing/algs/gdal/warp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def defineCharacteristics(self):
7878
self.addParameter(ParameterSelection(self.RTYPE,
7979
self.tr('Output raster type'), self.TYPE, 5))
8080
self.addParameter(ParameterSelection(self.COMPRESS,
81-
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0))
81+
self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5))
8282
self.addParameter(ParameterNumber(self.JPEGCOMPRESSION,
8383
self.tr('Set the JPEG compression level'),
8484
1, 100, 75))
@@ -96,7 +96,7 @@ def defineCharacteristics(self):
9696
self.tr('Force the generation of an associated ESRI world file (.tfw))'), False))
9797
self.addParameter(ParameterString(self.EXTRA,
9898
self.tr('Additional creation parameters'), '', optional=True))
99-
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Output layer')))
99+
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Warped')))
100100

101101
def processAlgorithm(self, progress):
102102
noData = str(self.getParameterValue(self.NO_DATA))

python/plugins/processing/algs/grass/description/v.buffer.column.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0
77
ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01
88
ParameterBoolean|-s|Make outside corners straight|False
99
ParameterBoolean|-c|Don't make caps at the ends of polylines|False
10-
OutputVector|output|Output buffer
10+
OutputVector|output|Buffer
1111

python/plugins/processing/algs/grass/description/v.buffer.distance.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ ParameterString|distance|Buffer distance in map units|
66
ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01
77
ParameterBoolean|-s|Make outside corners straight|False
88
ParameterBoolean|-c|Don't make caps at the ends of polylines|False
9-
OutputVector|output|Output buffer
9+
OutputVector|output|Buffer
1010

python/plugins/processing/algs/grass7/description/v.buffer.column.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0
77
ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01
88
ParameterBoolean|-s|Make outside corners straight|False
99
ParameterBoolean|-c|Do not make caps at the ends of polylines|False
10-
OutputVector|output|Output buffer
10+
OutputVector|output|Buffer

python/plugins/processing/algs/grass7/description/v.buffer.distance.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ParameterString|distance|Buffer distance in map units|
66
ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01
77
ParameterBoolean|-s|Make outside corners straight|False
88
ParameterBoolean|-c|Do not make caps at the ends of polylines|False
9-
OutputVector|output|Output buffer
9+
OutputVector|output|Buffer

python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Clip Grid with Polygon
22
shapes_grid
33
ParameterRaster|INPUT|Input|False
44
ParameterVector|POLYGONS|Polygons|2|False
5-
OutputRaster|OUTPUT|Output
5+
OutputRaster|OUTPUT|Clipped

python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ ParameterSelection|TARGET_DEFINITION|Target Grid System|[0] user defined;[1] gri
1111
Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX
1212
ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0
1313
ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells
14-
OutputRaster|TARGET_OUT_GRID|Target Grid
14+
OutputRaster|TARGET_OUT_GRID|Rasterized
1515
OutputRaster|TARGET_COUNT|Number of Values

python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ ParameterRaster|GRID|Grid|False
44
ParameterSelection|CLASS_ALL|Class Selection|[0] one single class specified by class identifier;[1] all classes|1
55
ParameterNumber|CLASS_ID|Class Identifier|None|None|0
66
ParameterSelection|SPLIT|Vectorised class as...|[0] one single (multi-)polygon object;[1] each island as separated polygon|1
7-
OutputVector|POLYGONS|Polygons
7+
OutputVector|POLYGONS|Vectorized

0 commit comments

Comments
 (0)