From 2004f22ac5c39839913157b067baeed6cb207882 Mon Sep 17 00:00:00 2001 From: pcav Date: Fri, 22 May 2015 16:39:20 +0200 Subject: [PATCH] Uniform and informative output names for Processing (QGIS, final) --- python/plugins/processing/algs/qgis/AddTableField.py | 2 +- .../plugins/processing/algs/qgis/AutoincrementalField.py | 2 +- .../processing/algs/qgis/BasicStatisticsNumbers.py | 2 +- .../processing/algs/qgis/BasicStatisticsStrings.py | 2 +- python/plugins/processing/algs/qgis/DeleteColumn.py | 2 +- python/plugins/processing/algs/qgis/EquivalentNumField.py | 2 +- python/plugins/processing/algs/qgis/ExportGeometryInfo.py | 2 +- python/plugins/processing/algs/qgis/FieldPyculator.py | 2 +- python/plugins/processing/algs/qgis/FieldsCalculator.py | 2 +- python/plugins/processing/algs/qgis/FieldsMapper.py | 2 +- .../processing/algs/qgis/StatisticsByCategories.py | 2 +- python/plugins/processing/algs/qgis/TextToFloat.py | 2 +- .../qgis/scripts/Number_of_unique_values_in_classes.py | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/plugins/processing/algs/qgis/AddTableField.py b/python/plugins/processing/algs/qgis/AddTableField.py index dd5c03a20f1..4124c42abb6 100644 --- a/python/plugins/processing/algs/qgis/AddTableField.py +++ b/python/plugins/processing/algs/qgis/AddTableField.py @@ -63,7 +63,7 @@ class AddTableField(GeoAlgorithm): self.addParameter(ParameterNumber(self.FIELD_PRECISION, self.tr('Field precision'), 0, 10, 0)) self.addOutput(OutputVector( - self.OUTPUT_LAYER, self.tr('Output layer'))) + self.OUTPUT_LAYER, self.tr('Added'))) def processAlgorithm(self, progress): fieldType = self.getParameterValue(self.FIELD_TYPE) diff --git a/python/plugins/processing/algs/qgis/AutoincrementalField.py b/python/plugins/processing/algs/qgis/AutoincrementalField.py index 351d59e6918..1b81e6e1317 100644 --- a/python/plugins/processing/algs/qgis/AutoincrementalField.py +++ b/python/plugins/processing/algs/qgis/AutoincrementalField.py @@ -69,4 +69,4 @@ class AutoincrementalField(GeoAlgorithm): self.group = 'Vector table tools' self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY])) - self.addOutput(OutputVector(self.OUTPUT, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT, self.tr('Incremented'))) diff --git a/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py b/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py index 6d3575dcd88..acd6e78a8f9 100644 --- a/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py +++ b/python/plugins/processing/algs/qgis/BasicStatisticsNumbers.py @@ -63,7 +63,7 @@ class BasicStatisticsNumbers(GeoAlgorithm): self.INPUT_LAYER, ParameterTableField.DATA_TYPE_NUMBER)) self.addOutput(OutputHTML(self.OUTPUT_HTML_FILE, - self.tr('Statistics for numeric field'))) + self.tr('Statistics'))) self.addOutput(OutputNumber(self.CV, self.tr('Coefficient of Variation'))) self.addOutput(OutputNumber(self.MIN, self.tr('Minimum value'))) diff --git a/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py b/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py index 4a4a4b33edc..97beb44e2c1 100644 --- a/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py +++ b/python/plugins/processing/algs/qgis/BasicStatisticsStrings.py @@ -61,7 +61,7 @@ class BasicStatisticsStrings(GeoAlgorithm): self.INPUT_LAYER, ParameterTableField.DATA_TYPE_STRING)) self.addOutput(OutputHTML(self.OUTPUT_HTML_FILE, - self.tr('Statistics for text field'))) + self.tr('Statistics for text'))) self.addOutput(OutputNumber(self.MIN_LEN, self.tr('Minimum length'))) self.addOutput(OutputNumber(self.MAX_LEN, self.tr('Maximum length'))) diff --git a/python/plugins/processing/algs/qgis/DeleteColumn.py b/python/plugins/processing/algs/qgis/DeleteColumn.py index f25411467e9..66166bbe5a3 100644 --- a/python/plugins/processing/algs/qgis/DeleteColumn.py +++ b/python/plugins/processing/algs/qgis/DeleteColumn.py @@ -46,7 +46,7 @@ class DeleteColumn(GeoAlgorithm): self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY])) self.addParameter(ParameterTableField(self.COLUMN, self.tr('Field to delete'), self.INPUT)) - self.addOutput(OutputVector(self.OUTPUT, self.tr('Output'))) + self.addOutput(OutputVector(self.OUTPUT, self.tr('Deleted column'))) def processAlgorithm(self, progress): layer = dataobjects.getObjectFromUri( diff --git a/python/plugins/processing/algs/qgis/EquivalentNumField.py b/python/plugins/processing/algs/qgis/EquivalentNumField.py index faf6ebe69ab..193b33fd905 100644 --- a/python/plugins/processing/algs/qgis/EquivalentNumField.py +++ b/python/plugins/processing/algs/qgis/EquivalentNumField.py @@ -78,4 +78,4 @@ class EquivalentNumField(GeoAlgorithm): self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY])) self.addParameter(ParameterTableField(self.FIELD, self.tr('Class field'), self.INPUT)) - self.addOutput(OutputVector(self.OUTPUT, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT, self.tr('Numeric field'))) diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py index 1b9cad946b4..52a51029332 100644 --- a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py +++ b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py @@ -51,7 +51,7 @@ class ExportGeometryInfo(GeoAlgorithm): self.addParameter(ParameterSelection(self.METHOD, self.tr('Calculate using'), self.CALC_METHODS, 0)) - self.addOutput(OutputVector(self.OUTPUT, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT, self.tr('Added geom info'))) def processAlgorithm(self, progress): layer = dataobjects.getObjectFromUri( diff --git a/python/plugins/processing/algs/qgis/FieldPyculator.py b/python/plugins/processing/algs/qgis/FieldPyculator.py index 62683f05823..7c607db8e4c 100644 --- a/python/plugins/processing/algs/qgis/FieldPyculator.py +++ b/python/plugins/processing/algs/qgis/FieldPyculator.py @@ -71,7 +71,7 @@ class FieldsPyculator(GeoAlgorithm): self.tr('Global expression'), multiline=True, optional=True)) self.addParameter(ParameterString(self.FORMULA, self.tr('Formula'), 'value = ', multiline=True)) - self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Calculated'))) def processAlgorithm(self, progress): fieldName = self.getParameterValue(self.FIELD_NAME) diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py index 2c4b5f48c1a..f6caf8c83e8 100644 --- a/python/plugins/processing/algs/qgis/FieldsCalculator.py +++ b/python/plugins/processing/algs/qgis/FieldsCalculator.py @@ -70,7 +70,7 @@ class FieldsCalculator(GeoAlgorithm): self.addParameter(ParameterBoolean(self.NEW_FIELD, self.tr('Create new field'), True)) self.addParameter(ParameterString(self.FORMULA, self.tr('Formula'))) - self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer'))) + self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Calculated'))) def processAlgorithm(self, progress): layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT_LAYER)) diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py index 6f1a32fcfca..ae5fd4a658b 100644 --- a/python/plugins/processing/algs/qgis/FieldsMapper.py +++ b/python/plugins/processing/algs/qgis/FieldsMapper.py @@ -56,7 +56,7 @@ class FieldsMapper(GeoAlgorithm): self.addParameter(ParameterFieldsMapping(self.FIELDS_MAPPING, self.tr('Fields mapping'), self.INPUT_LAYER)) self.addOutput(OutputVector(self.OUTPUT_LAYER, - self.tr('Output layer'))) + self.tr('Refactored'))) def getCustomParametersDialog(self): return FieldsMapperParametersDialog(self) diff --git a/python/plugins/processing/algs/qgis/StatisticsByCategories.py b/python/plugins/processing/algs/qgis/StatisticsByCategories.py index 88d73b4d48f..c802437f535 100644 --- a/python/plugins/processing/algs/qgis/StatisticsByCategories.py +++ b/python/plugins/processing/algs/qgis/StatisticsByCategories.py @@ -53,7 +53,7 @@ class StatisticsByCategories(GeoAlgorithm): self.tr('Field with categories'), self.INPUT_LAYER, ParameterTableField.DATA_TYPE_ANY)) - self.addOutput(OutputTable(self.OUTPUT, self.tr('Statistics'))) + self.addOutput(OutputTable(self.OUTPUT, self.tr('Statistics by category'))) def processAlgorithm(self, progress): layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT_LAYER)) diff --git a/python/plugins/processing/algs/qgis/TextToFloat.py b/python/plugins/processing/algs/qgis/TextToFloat.py index 16d54e94e3d..d31803ebe6e 100644 --- a/python/plugins/processing/algs/qgis/TextToFloat.py +++ b/python/plugins/processing/algs/qgis/TextToFloat.py @@ -48,7 +48,7 @@ class TextToFloat(GeoAlgorithm): self.addParameter(ParameterTableField(self.FIELD, self.tr('Text attribute to convert to float'), self.INPUT, ParameterTableField.DATA_TYPE_STRING)) - self.addOutput(OutputVector(self.OUTPUT, self.tr('Output'))) + self.addOutput(OutputVector(self.OUTPUT, self.tr('Float from text'))) def processAlgorithm(self, progress): layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT)) diff --git a/python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py b/python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py index b0bf8a96b93..e8ac76a06f6 100644 --- a/python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py +++ b/python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py @@ -1,8 +1,8 @@ ##Vector table tools=group -##input=vector -##class_field=field input -##value_field=field input -##output=output vector +##Input=vector +##Class_field=field input +##Value_field=field input +##N unique values=output vector from PyQt4.Qt import QVariant