From a911e6e81ac552496ef12a0a6a379c3e5f5e3e3b Mon Sep 17 00:00:00 2001 From: pcav Date: Fri, 10 Apr 2015 09:19:21 +0200 Subject: [PATCH] Various fixes to Processing algs; fix for http://hub.qgis.org/issues/12537 --- python/plugins/processing/algs/gdal/ogr2ogrbuffer.py | 2 +- python/plugins/processing/algs/gdal/ogr2ogrdissolve.py | 2 +- python/plugins/processing/algs/gdal/rasterize.py | 2 +- python/plugins/processing/algs/gdal/translate.py | 4 ++-- python/plugins/processing/algs/gdal/warp.py | 4 ++-- .../processing/algs/grass/description/v.buffer.column.txt | 2 +- .../processing/algs/grass/description/v.buffer.distance.txt | 2 +- .../processing/algs/grass7/description/v.buffer.column.txt | 2 +- .../processing/algs/grass7/description/v.buffer.distance.txt | 2 +- .../algs/saga/description/2.1.3/ClipGridwithPolygon.txt | 2 +- .../processing/algs/saga/description/2.1.3/ShapestoGrid.txt | 2 +- .../algs/saga/description/2.1.3/VectorisingGridClasses.txt | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py b/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py index e2d057d520d..26a1cab2f14 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrbuffer.py @@ -69,7 +69,7 @@ class Ogr2OgrBuffer(OgrAlgorithm): self.tr('Additional creation options (see ogr2ogr manual)'), '', optional=True)) - self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Buffer'))) def processAlgorithm(self, progress): inLayer = self.getParameterValue(self.INPUT_LAYER) diff --git a/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py b/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py index c1fc18105b6..053da8aa07b 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py @@ -78,7 +78,7 @@ class Ogr2OgrDissolve(OgrAlgorithm): self.tr('Additional creation options (see ogr2ogr manual)'), '', optional=True)) - self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Dissolved'))) def processAlgorithm(self, progress): inLayer = self.getParameterValue(self.INPUT_LAYER) diff --git a/python/plugins/processing/algs/gdal/rasterize.py b/python/plugins/processing/algs/gdal/rasterize.py index 9af256d7909..e17c23a40ed 100644 --- a/python/plugins/processing/algs/gdal/rasterize.py +++ b/python/plugins/processing/algs/gdal/rasterize.py @@ -86,7 +86,7 @@ class rasterize(OgrAlgorithm): self.tr("Nodata value"), '-9999')) self.addParameter(ParameterSelection(self.COMPRESS, - self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0)) + self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5)) self.addParameter(ParameterNumber(self.JPEGCOMPRESSION, self.tr('Set the JPEG compression level'), 1, 100, 75)) diff --git a/python/plugins/processing/algs/gdal/translate.py b/python/plugins/processing/algs/gdal/translate.py index c2dc66475b4..a331ffd15ac 100644 --- a/python/plugins/processing/algs/gdal/translate.py +++ b/python/plugins/processing/algs/gdal/translate.py @@ -90,7 +90,7 @@ class translate(GdalAlgorithm): self.addParameter(ParameterSelection(self.RTYPE, self.tr('Output raster type'), self.TYPE, 5)) self.addParameter(ParameterSelection(self.COMPRESS, - self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0)) + self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5)) self.addParameter(ParameterNumber(self.JPEGCOMPRESSION, self.tr('Set the JPEG compression level'), 1, 100, 75)) @@ -108,7 +108,7 @@ class translate(GdalAlgorithm): self.tr('Force the generation of an associated ESRI world file (.tfw))'), 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('Translated'))) def processAlgorithm(self, progress): out = self.getOutputValue(translate.OUTPUT) diff --git a/python/plugins/processing/algs/gdal/warp.py b/python/plugins/processing/algs/gdal/warp.py index b016459c42b..943fe46db20 100644 --- a/python/plugins/processing/algs/gdal/warp.py +++ b/python/plugins/processing/algs/gdal/warp.py @@ -78,7 +78,7 @@ class warp(GdalAlgorithm): self.addParameter(ParameterSelection(self.RTYPE, self.tr('Output raster type'), self.TYPE, 5)) self.addParameter(ParameterSelection(self.COMPRESS, - self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 0)) + self.tr('GeoTIFF options. Compression type:'), self.COMPRESSTYPE, 5)) self.addParameter(ParameterNumber(self.JPEGCOMPRESSION, self.tr('Set the JPEG compression level'), 1, 100, 75)) @@ -96,7 +96,7 @@ class warp(GdalAlgorithm): self.tr('Force the generation of an associated ESRI world file (.tfw))'), 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('Warped'))) def processAlgorithm(self, progress): noData = str(self.getParameterValue(self.NO_DATA)) diff --git a/python/plugins/processing/algs/grass/description/v.buffer.column.txt b/python/plugins/processing/algs/grass/description/v.buffer.column.txt index 013a5323213..66b656495f4 100644 --- a/python/plugins/processing/algs/grass/description/v.buffer.column.txt +++ b/python/plugins/processing/algs/grass/description/v.buffer.column.txt @@ -7,5 +7,5 @@ ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0 ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Don't make caps at the ends of polylines|False -OutputVector|output|Output buffer +OutputVector|output|Buffer diff --git a/python/plugins/processing/algs/grass/description/v.buffer.distance.txt b/python/plugins/processing/algs/grass/description/v.buffer.distance.txt index aaeb4914920..e3554323b31 100644 --- a/python/plugins/processing/algs/grass/description/v.buffer.distance.txt +++ b/python/plugins/processing/algs/grass/description/v.buffer.distance.txt @@ -6,5 +6,5 @@ ParameterString|distance|Buffer distance in map units| ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Don't make caps at the ends of polylines|False -OutputVector|output|Output buffer +OutputVector|output|Buffer diff --git a/python/plugins/processing/algs/grass7/description/v.buffer.column.txt b/python/plugins/processing/algs/grass7/description/v.buffer.column.txt index d6029b6832b..346cb4a1b0a 100644 --- a/python/plugins/processing/algs/grass7/description/v.buffer.column.txt +++ b/python/plugins/processing/algs/grass7/description/v.buffer.column.txt @@ -7,4 +7,4 @@ ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0 ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Do not make caps at the ends of polylines|False -OutputVector|output|Output buffer +OutputVector|output|Buffer diff --git a/python/plugins/processing/algs/grass7/description/v.buffer.distance.txt b/python/plugins/processing/algs/grass7/description/v.buffer.distance.txt index f9ae03be8c6..2a46a2afbbd 100644 --- a/python/plugins/processing/algs/grass7/description/v.buffer.distance.txt +++ b/python/plugins/processing/algs/grass7/description/v.buffer.distance.txt @@ -6,4 +6,4 @@ ParameterString|distance|Buffer distance in map units| ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Do not make caps at the ends of polylines|False -OutputVector|output|Output buffer +OutputVector|output|Buffer diff --git a/python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt b/python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt index f4bf0002f51..b76d1a2f7da 100644 --- a/python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt +++ b/python/plugins/processing/algs/saga/description/2.1.3/ClipGridwithPolygon.txt @@ -2,4 +2,4 @@ Clip Grid with Polygon shapes_grid ParameterRaster|INPUT|Input|False ParameterVector|POLYGONS|Polygons|2|False -OutputRaster|OUTPUT|Output +OutputRaster|OUTPUT|Clipped diff --git a/python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt b/python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt index 9f050ea1d5a..c5e4da37803 100644 --- a/python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt +++ b/python/plugins/processing/algs/saga/description/2.1.3/ShapestoGrid.txt @@ -11,5 +11,5 @@ ParameterSelection|TARGET_DEFINITION|Target Grid System|[0] user defined;[1] gri Extent TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX ParameterNumber|TARGET_USER_SIZE|Cellsize|None|None|100.0 ParameterSelection|TARGET_USER_FITS|Fit|[0] nodes;[1] cells -OutputRaster|TARGET_OUT_GRID|Target Grid +OutputRaster|TARGET_OUT_GRID|Rasterized OutputRaster|TARGET_COUNT|Number of Values diff --git a/python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt b/python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt index f6b9bc69d58..0057f58f504 100644 --- a/python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt +++ b/python/plugins/processing/algs/saga/description/2.1.3/VectorisingGridClasses.txt @@ -4,4 +4,4 @@ ParameterRaster|GRID|Grid|False ParameterSelection|CLASS_ALL|Class Selection|[0] one single class specified by class identifier;[1] all classes|1 ParameterNumber|CLASS_ID|Class Identifier|None|None|0 ParameterSelection|SPLIT|Vectorised class as...|[0] one single (multi-)polygon object;[1] each island as separated polygon|1 -OutputVector|POLYGONS|Polygons +OutputVector|POLYGONS|Vectorized