Various fixes to Processing algs; fix for http://hub.qgis.org/issues/12537

2025-02-25 00:58:06 -05:00 · 2015-04-10 09:19:21 +02:00 · 2015-04-10 09:19:21 +02:00 · a911e6e81a
commit a911e6e81a
parent 3a55abd147
12 changed files with 14 additions and 14 deletions
--- 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)
--- 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)
--- 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))
--- 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)
--- 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))
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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