Skip to content

Commit ea0dc6e

Browse files
arnaud-morvanarnaud-morvan
committedSep 17, 2015
Include parameterselection dropdown contents in processing translations
·
ltr-3_40archive/master_2
1 parent 5ac5217 commit ea0dc6e

23 files changed

+140
-95
lines changed
 

‎python/plugins/processing/algs/qgis/AddTableField.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,22 @@ class AddTableField(GeoAlgorithm):
4545
FIELD_LENGTH = 'FIELD_LENGTH'
4646
FIELD_PRECISION = 'FIELD_PRECISION'
4747

48-
TYPE_NAMES = ['Integer', 'Float', 'String']
4948
TYPES = [QVariant.Int, QVariant.Double, QVariant.String]
5049

5150
def defineCharacteristics(self):
5251
self.name, self.i18n_name = self.trAlgorithm('Add field to attributes table')
5352
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
5453

54+
self.type_names = [self.tr('Integer'),
55+
self.tr('Float'),
56+
self.tr('String')]
57+
5558
self.addParameter(ParameterVector(self.INPUT_LAYER,
5659
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
5760
self.addParameter(ParameterString(self.FIELD_NAME,
5861
self.tr('Field name')))
5962
self.addParameter(ParameterSelection(self.FIELD_TYPE,
60-
self.tr('Field type'), self.TYPE_NAMES))
63+
self.tr('Field type'), self.type_names))
6164
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6265
self.tr('Field length'), 1, 255, 10))
6366
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/CheckValidity.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ class CheckValidity(GeoAlgorithm):
4444
INVALID_OUTPUT = 'INVALID_OUTPUT'
4545
ERROR_OUTPUT = 'ERROR_OUTPUT'
4646

47-
METHODS = ['The one selected in digitizing settings',
48-
'QGIS',
49-
'GEOS']
50-
5147
def defineCharacteristics(self):
5248
self.name, self.i18n_name = self.trAlgorithm('Check validity')
5349
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
5450

51+
self.methods = [self.tr('The one selected in digitizing settings'),
52+
'QGIS',
53+
'GEOS']
54+
5555
self.addParameter(ParameterVector(
5656
self.INPUT_LAYER,
5757
self.tr('Input layer'),
@@ -60,7 +60,7 @@ def defineCharacteristics(self):
6060
self.addParameter(ParameterSelection(
6161
self.METHOD,
6262
self.tr('Method'),
63-
self.METHODS))
63+
self.methods))
6464

6565
self.addOutput(OutputVector(
6666
self.VALID_OUTPUT,

‎python/plugins/processing/algs/qgis/ConvexHull.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,21 @@ class ConvexHull(GeoAlgorithm):
4343
OUTPUT = 'OUTPUT'
4444
FIELD = 'FIELD'
4545
METHOD = 'METHOD'
46-
METHODS = ['Create single minimum convex hull',
47-
'Create convex hulls based on field']
4846

4947
def defineCharacteristics(self):
5048
self.name, self.i18n_name = self.trAlgorithm('Convex hull')
5149
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
50+
51+
self.methods = [self.tr('Create single minimum convex hull'),
52+
self.tr('Create convex hulls based on field')]
53+
5254
self.addParameter(ParameterVector(self.INPUT,
5355
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5456
self.addParameter(ParameterTableField(self.FIELD,
5557
self.tr('Field (optional, only used if creating convex hulls by classes)'),
5658
self.INPUT, optional=True))
5759
self.addParameter(ParameterSelection(self.METHOD,
58-
self.tr('Method'), self.METHODS))
60+
self.tr('Method'), self.methods))
5961
self.addOutput(OutputVector(self.OUTPUT, self.tr('Convex hull')))
6062

6163
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/Eliminate.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,18 @@ class Eliminate(GeoAlgorithm):
4949
COMPARISONVALUE = 'COMPARISONVALUE'
5050
COMPARISON = 'COMPARISON'
5151

52-
MODES = ['Largest area', 'Smallest Area', 'Largest common boundary']
5352
MODE_LARGEST_AREA = 0
5453
MODE_SMALLEST_AREA = 1
5554
MODE_BOUNDARY = 2
5655

5756
def defineCharacteristics(self):
5857
self.name, self.i18n_name = self.trAlgorithm('Eliminate sliver polygons')
5958
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
59+
60+
self.modes = [self.tr('Largest area'),
61+
self.tr('Smallest Area'),
62+
self.tr('Largest common boundary')]
63+
6064
self.addParameter(ParameterVector(self.INPUT,
6165
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON]))
6266
self.addParameter(ParameterBoolean(self.KEEPSELECTION,
@@ -79,7 +83,7 @@ def defineCharacteristics(self):
7983
self.tr('Value'), default='0'))
8084
self.addParameter(ParameterSelection(self.MODE,
8185
self.tr('Merge selection with the neighbouring polygon with the'),
82-
self.MODES))
86+
self.modes))
8387
self.addOutput(OutputVector(self.OUTPUT, self.tr('Cleaned')))
8488

8589
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/ExportGeometryInfo.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ class ExportGeometryInfo(GeoAlgorithm):
4141
METHOD = 'CALC_METHOD'
4242
OUTPUT = 'OUTPUT'
4343

44-
CALC_METHODS = ['Layer CRS', 'Project CRS', 'Ellipsoidal']
45-
4644
def defineCharacteristics(self):
4745
self.name, self.i18n_name = self.trAlgorithm('Export/Add geometry columns')
4846
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
4947

48+
self.calc_methods = [self.tr('Layer CRS'),
49+
self.tr('Project CRS'),
50+
self.tr('Ellipsoidal')]
51+
5052
self.addParameter(ParameterVector(self.INPUT,
5153
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5254
self.addParameter(ParameterSelection(self.METHOD,
53-
self.tr('Calculate using'), self.CALC_METHODS, 0))
55+
self.tr('Calculate using'), self.calc_methods, 0))
5456

5557
self.addOutput(OutputVector(self.OUTPUT, self.tr('Added geom info')))
5658

‎python/plugins/processing/algs/qgis/ExtractByAttribute.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,21 @@ def defineCharacteristics(self):
5858
self.name, self.i18n_name = self.trAlgorithm('Extract by attribute')
5959
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
6060

61+
self.i18n_operators = ['=',
62+
'!=',
63+
'>',
64+
'>=',
65+
'<',
66+
'<=',
67+
self.tr('begins with'),
68+
self.tr('contains')]
69+
6170
self.addParameter(ParameterVector(self.INPUT,
6271
self.tr('Input Layer'), [ParameterVector.VECTOR_TYPE_ANY]))
6372
self.addParameter(ParameterTableField(self.FIELD,
6473
self.tr('Selection attribute'), self.INPUT))
6574
self.addParameter(ParameterSelection(self.OPERATOR,
66-
self.tr('Operator'), self.OPERATORS))
75+
self.tr('Operator'), self.i18n_operators))
6776
self.addParameter(ParameterString(self.VALUE, self.tr('Value')))
6877

6978
self.addOutput(OutputVector(self.OUTPUT, self.tr('Extracted (attribute)')))

‎python/plugins/processing/algs/qgis/FieldPyculator.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,22 @@ class FieldsPyculator(GeoAlgorithm):
5151
OUTPUT_LAYER = 'OUTPUT_LAYER'
5252
RESULT_VAR_NAME = 'value'
5353

54-
TYPE_NAMES = ['Integer', 'Float', 'String']
5554
TYPES = [QVariant.Int, QVariant.Double, QVariant.String]
5655

5756
def defineCharacteristics(self):
5857
self.name, self.i18n_name = self.trAlgorithm('Advanced Python field calculator')
5958
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
59+
60+
self.type_names = [self.tr('Integer'),
61+
self.tr('Float'),
62+
self.tr('String')]
63+
6064
self.addParameter(ParameterVector(self.INPUT_LAYER,
6165
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
6266
self.addParameter(ParameterString(self.FIELD_NAME,
6367
self.tr('Result field name'), 'NewField'))
6468
self.addParameter(ParameterSelection(self.FIELD_TYPE,
65-
self.tr('Field type'), self.TYPE_NAMES))
69+
self.tr('Field type'), self.type_names))
6670
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6771
self.tr('Field length'), 1, 255, 10))
6872
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/FieldsCalculator.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,23 @@ class FieldsCalculator(GeoAlgorithm):
5252
FORMULA = 'FORMULA'
5353
OUTPUT_LAYER = 'OUTPUT_LAYER'
5454

55-
TYPE_NAMES = ['Float', 'Integer', 'String', 'Date']
5655
TYPES = [QVariant.Double, QVariant.Int, QVariant.String, QVariant.Date]
5756

5857
def defineCharacteristics(self):
5958
self.name, self.i18n_name = self.trAlgorithm('Field calculator')
6059
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
60+
61+
self.type_names = [self.tr('Float'),
62+
self.tr('Integer'),
63+
self.tr('String'),
64+
self.tr('Date')]
65+
6166
self.addParameter(ParameterVector(self.INPUT_LAYER,
6267
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
6368
self.addParameter(ParameterString(self.FIELD_NAME,
6469
self.tr('Result field name')))
6570
self.addParameter(ParameterSelection(self.FIELD_TYPE,
66-
self.tr('Field type'), self.TYPE_NAMES))
71+
self.tr('Field type'), self.type_names))
6772
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6873
self.tr('Field length'), 1, 255, 10))
6974
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/GeometryConvert.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,20 @@ class GeometryConvert(GeoAlgorithm):
4040
TYPE = 'TYPE'
4141
OUTPUT = 'OUTPUT'
4242

43-
TYPES = ['Centroids',
44-
'Nodes',
45-
'Linestrings',
46-
'Multilinestrings',
47-
'Polygons'
48-
]
49-
5043
def defineCharacteristics(self):
5144
self.name, self.i18n_name = self.trAlgorithm('Convert geometry type')
5245
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
5346

47+
self.types = [self.tr('Centroids'),
48+
self.tr('Nodes'),
49+
self.tr('Linestrings'),
50+
self.tr('Multilinestrings'),
51+
self.tr('Polygons')]
52+
5453
self.addParameter(ParameterVector(self.INPUT,
5554
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5655
self.addParameter(ParameterSelection(self.TYPE,
57-
self.tr('New geometry type'), self.TYPES))
56+
self.tr('New geometry type'), self.types))
5857

5958
self.addOutput(OutputVector(self.OUTPUT, self.tr('Converted')))
6059

‎python/plugins/processing/algs/qgis/Grid.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,17 @@ class Grid(GeoAlgorithm):
4646
CRS = 'CRS'
4747
OUTPUT = 'OUTPUT'
4848

49-
TYPES = ['Rectangle (line)',
50-
'Rectangle (polygon)',
51-
'Diamond (polygon)',
52-
'Hexagon (polygon)'
53-
]
54-
5549
def defineCharacteristics(self):
5650
self.name, self.i18n_name = self.trAlgorithm('Create grid')
5751
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
5852

53+
self.types = [self.tr('Rectangle (line)'),
54+
self.tr('Rectangle (polygon)'),
55+
self.tr('Diamond (polygon)'),
56+
self.tr('Hexagon (polygon)')]
57+
5958
self.addParameter(ParameterSelection(self.TYPE,
60-
self.tr('Grid type'), self.TYPES))
59+
self.tr('Grid type'), self.types))
6160
self.addParameter(ParameterExtent(self.EXTENT,
6261
self.tr('Grid extent')))
6362
self.addParameter(ParameterNumber(self.HSPACING,

‎python/plugins/processing/algs/qgis/HubDistance.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ def defineCharacteristics(self):
6262
self.name, self.i18n_name = self.trAlgorithm('Distance to nearest hub')
6363
self.group, self.i18n_group = self.trAlgorithm('Vector analysis tools')
6464

65+
self.units = [self.tr('Meters'),
66+
self.tr('Feet'),
67+
self.tr('Miles'),
68+
self.tr('Kilometers'),
69+
self.tr('Layer units')]
70+
6571
self.addParameter(ParameterVector(self.POINTS,
6672
self.tr('Source points layer'), [ParameterVector.VECTOR_TYPE_ANY]))
6773
self.addParameter(ParameterVector(self.HUBS,
@@ -71,7 +77,7 @@ def defineCharacteristics(self):
7177
self.addParameter(ParameterSelection(self.GEOMETRY,
7278
self.tr('Output shape type'), self.GEOMETRIES))
7379
self.addParameter(ParameterSelection(self.UNIT,
74-
self.tr('Measurement unit'), self.UNITS))
80+
self.tr('Measurement unit'), self.units))
7581

7682
self.addOutput(OutputVector(self.OUTPUT, self.tr('Hub distance')))
7783

‎python/plugins/processing/algs/qgis/PointDistance.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ class PointDistance(GeoAlgorithm):
4646
NEAREST_POINTS = 'NEAREST_POINTS'
4747
DISTANCE_MATRIX = 'DISTANCE_MATRIX'
4848

49-
MAT_TYPES = ['Linear (N*k x 3) distance matrix',
50-
'Standard (N x T) distance matrix',
51-
'Summary distance matrix (mean, std. dev., min, max)']
52-
5349
def defineCharacteristics(self):
5450
self.name, self.i18n_name = self.trAlgorithm('Distance matrix')
5551
self.group, self.i18n_group = self.trAlgorithm('Vector analysis tools')
5652

53+
self.mat_types = [self.tr('Linear (N*k x 3) distance matrix'),
54+
self.tr('Standard (N x T) distance matrix'),
55+
self.tr('Summary distance matrix (mean, std. dev., min, max)')]
56+
5757
self.addParameter(ParameterVector(self.INPUT_LAYER,
5858
self.tr('Input point layer'), [ParameterVector.VECTOR_TYPE_POINT]))
5959
self.addParameter(ParameterTableField(self.INPUT_FIELD,
@@ -65,7 +65,7 @@ def defineCharacteristics(self):
6565
self.tr('Target unique ID field'), self.TARGET_LAYER,
6666
ParameterTableField.DATA_TYPE_ANY))
6767
self.addParameter(ParameterSelection(self.MATRIX_TYPE,
68-
self.tr('Output matrix type'), self.MAT_TYPES, 0))
68+
self.tr('Output matrix type'), self.mat_types, 0))
6969
self.addParameter(ParameterNumber(self.NEAREST_POINTS,
7070
self.tr('Use only the nearest (k) target points'), 0, 9999, 0))
7171

@@ -93,7 +93,7 @@ def processAlgorithm(self, progress):
9393
self.linearMatrix(inLayer, inField, targetLayer, targetField,
9494
matType, nPoints, progress)
9595
elif matType == 1:
96-
# Standard distance matrix
96+
# Standard distance matrix
9797
self.regularMatrix(inLayer, inField, targetLayer, targetField,
9898
nPoints, progress)
9999
elif matType == 2:

‎python/plugins/processing/algs/qgis/RandomExtract.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ class RandomExtract(GeoAlgorithm):
4343
METHOD = 'METHOD'
4444
NUMBER = 'NUMBER'
4545

46-
METHODS = ['Number of selected features',
47-
'Percentage of selected features']
48-
4946
def defineCharacteristics(self):
5047
self.name, self.i18n_name = self.trAlgorithm('Random extract')
5148
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
5249

50+
self.methods = [self.tr('Number of selected features'),
51+
self.tr('Percentage of selected features')]
52+
5353
self.addParameter(ParameterVector(self.INPUT,
5454
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5555
self.addParameter(ParameterSelection(self.METHOD,
56-
self.tr('Method'), self.METHODS, 0))
56+
self.tr('Method'), self.methods, 0))
5757
self.addParameter(ParameterNumber(self.NUMBER,
5858
self.tr('Number/percentage of selected features'), 0, None, 10))
5959

‎python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ class RandomExtractWithinSubsets(GeoAlgorithm):
4545
FIELD = 'FIELD'
4646
OUTPUT = 'OUTPUT'
4747

48-
METHODS = ['Number of selected features',
49-
'Percentage of selected features']
50-
5148
def defineCharacteristics(self):
5249
self.name, self.i18n_name = self.trAlgorithm('Random extract within subsets')
5350
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
5451

52+
self.methods = [self.tr('Number of selected features'),
53+
self.tr('Percentage of selected features')]
54+
5555
self.addParameter(ParameterVector(self.INPUT,
5656
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5757
self.addParameter(ParameterTableField(self.FIELD,
5858
self.tr('ID field'), self.INPUT))
5959
self.addParameter(ParameterSelection(self.METHOD,
60-
self.tr('Method'), self.METHODS, 0))
60+
self.tr('Method'), self.methods, 0))
6161
self.addParameter(ParameterNumber(self.NUMBER,
6262
self.tr('Number/percentage of selected features'), 1, None, 10))
6363

‎python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ class RandomPointsPolygonsFixed(GeoAlgorithm):
4747
STRATEGY = 'STRATEGY'
4848
OUTPUT = 'OUTPUT'
4949

50-
STRATEGIES = ['Points count',
51-
'Points density'
52-
]
53-
5450
def defineCharacteristics(self):
5551
self.name, self.i18n_name = self.trAlgorithm('Random points inside polygons (fixed)')
5652
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
53+
54+
self.strategies = [self.tr('Points count'),
55+
self.tr('Points density')]
56+
5757
self.addParameter(ParameterVector(self.VECTOR,
5858
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON]))
5959
self.addParameter(ParameterSelection(self.STRATEGY,
60-
self.tr('Sampling strategy'), self.STRATEGIES, 0))
60+
self.tr('Sampling strategy'), self.strategies, 0))
6161
self.addParameter(ParameterNumber(self.VALUE,
6262
self.tr('Number or density of points'), 0.0001, 9999999.0, 1.0))
6363
self.addParameter(ParameterNumber(self.MIN_DISTANCE,

‎python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ class RandomPointsPolygonsVariable(GeoAlgorithm):
4848
STRATEGY = 'STRATEGY'
4949
OUTPUT = 'OUTPUT'
5050

51-
STRATEGIES = ['Points count',
52-
'Points density'
53-
]
54-
5551
def defineCharacteristics(self):
5652
self.name, self.i18n_name = self.trAlgorithm('Random points inside polygons (variable)')
5753
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
54+
55+
self.strategies = [self.tr('Points count'),
56+
self.tr('Points density')]
57+
5858
self.addParameter(ParameterVector(self.VECTOR,
5959
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON]))
6060
self.addParameter(ParameterSelection(self.STRATEGY,
61-
self.tr('Sampling strategy'), self.STRATEGIES, 0))
61+
self.tr('Sampling strategy'), self.strategies, 0))
6262
self.addParameter(ParameterTableField(self.FIELD,
6363
self.tr('Number field'),
6464
self.VECTOR, ParameterTableField.DATA_TYPE_NUMBER))

‎python/plugins/processing/algs/qgis/RandomSelection.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ class RandomSelection(GeoAlgorithm):
4343
METHOD = 'METHOD'
4444
NUMBER = 'NUMBER'
4545

46-
METHODS = ['Number of selected features',
47-
'Percentage of selected features']
48-
4946
def defineCharacteristics(self):
5047
self.allowOnlyOpenedLayers = True
5148
self.name, self.i18n_name = self.trAlgorithm('Random selection')
5249
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
5350

51+
self.methods = [self.tr('Number of selected features'),
52+
self.tr('Percentage of selected features')]
53+
5454
self.addParameter(ParameterVector(self.INPUT,
5555
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5656
self.addParameter(ParameterSelection(self.METHOD,
57-
self.tr('Method'), self.METHODS, 0))
57+
self.tr('Method'), self.methods, 0))
5858
self.addParameter(ParameterNumber(self.NUMBER,
5959
self.tr('Number/percentage of selected features'), 0, None, 10))
6060
self.addOutput(OutputVector(self.OUTPUT, self.tr('Selection'), True))

‎python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ class RandomSelectionWithinSubsets(GeoAlgorithm):
4545
FIELD = 'FIELD'
4646
OUTPUT = 'OUTPUT'
4747

48-
METHODS = ['Number of selected features',
49-
'Percentage of selected features']
50-
5148
def defineCharacteristics(self):
5249
self.allowOnlyOpenedLayers = True
5350
self.name, self.i18n_name = self.trAlgorithm('Random selection within subsets')
5451
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
5552

53+
self.methods = [self.tr('Number of selected features'),
54+
self.tr('Percentage of selected features')]
55+
5656
self.addParameter(ParameterVector(self.INPUT,
5757
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5858
self.addParameter(ParameterTableField(self.FIELD,
5959
self.tr('ID Field'), self.INPUT))
6060
self.addParameter(ParameterSelection(self.METHOD,
61-
self.tr('Method'), self.METHODS, 0))
61+
self.tr('Method'), self.methods, 0))
6262
self.addParameter(ParameterNumber(self.NUMBER,
6363
self.tr('Number/percentage of selected features'), 1, None, 10))
6464

‎python/plugins/processing/algs/qgis/SelectByAttribute.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,21 @@ def defineCharacteristics(self):
5858
self.name, self.i18n_name = self.trAlgorithm('Select by attribute')
5959
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
6060

61+
self.i18n_operators = ['=',
62+
'!=',
63+
'>',
64+
'>=',
65+
'<',
66+
'<=',
67+
self.tr('begins with '),
68+
self.tr('contains')]
69+
6170
self.addParameter(ParameterVector(self.INPUT,
6271
self.tr('Input Layer'), [ParameterVector.VECTOR_TYPE_ANY]))
6372
self.addParameter(ParameterTableField(self.FIELD,
6473
self.tr('Selection attribute'), self.INPUT))
6574
self.addParameter(ParameterSelection(self.OPERATOR,
66-
self.tr('Operator'), self.OPERATORS))
75+
self.tr('Operator'), self.i18n_operators))
6776
self.addParameter(ParameterString(self.VALUE, self.tr('Value')))
6877

6978
self.addOutput(OutputVector(self.OUTPUT, self.tr('Selected (attribute)'), True))

‎python/plugins/processing/algs/qgis/SelectByExpression.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
SelectByExpression.py
66
---------------------
77
Date : July 2014
8-
Copyright : (C) 2014 by Michaël Douchin
8+
Copyright : (C) 2014 by Micha�l Douchin
99
***************************************************************************
1010
* *
1111
* This program is free software; you can redistribute it and/or modify *
@@ -40,19 +40,21 @@ class SelectByExpression(GeoAlgorithm):
4040
EXPRESSION = 'EXPRESSION'
4141
RESULT = 'RESULT'
4242
METHOD = 'METHOD'
43-
METHODS = ['creating new selection', 'adding to current selection',
44-
'removing from current selection']
4543

4644
def defineCharacteristics(self):
4745
self.name, self.i18n_name = self.trAlgorithm('Select by expression')
4846
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
4947

48+
self.methods = [self.tr('creating new selection'),
49+
self.tr('adding to current selection'),
50+
self.tr('removing from current selection')]
51+
5052
self.addParameter(ParameterVector(self.LAYERNAME,
5153
self.tr('Input Layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5254
self.addParameter(ParameterString(self.EXPRESSION,
5355
self.tr("Expression")))
5456
self.addParameter(ParameterSelection(self.METHOD,
55-
self.tr('Modify current selection by'), self.METHODS, 0))
57+
self.tr('Modify current selection by'), self.methods, 0))
5658
self.addOutput(OutputVector(self.RESULT, self.tr('Selected (expression)'), True))
5759

5860
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/SelectByLocation.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ class SelectByLocation(GeoAlgorithm):
4242
METHOD = 'METHOD'
4343
OUTPUT = 'OUTPUT'
4444

45-
METHODS = ['creating new selection',
46-
'adding to current selection',
47-
'removing from current selection']
48-
4945
def defineCharacteristics(self):
5046
self.name, self.i18n_name = self.trAlgorithm('Select by location')
5147
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
48+
49+
self.methods = [self.tr('creating new selection'),
50+
self.tr('adding to current selection'),
51+
self.tr('removing from current selection')]
52+
5253
self.addParameter(ParameterVector(self.INPUT,
5354
self.tr('Layer to select from'),
5455
[ParameterVector.VECTOR_TYPE_ANY]))
@@ -60,7 +61,7 @@ def defineCharacteristics(self):
6061
left=self.INPUT, right=self.INTERSECT))
6162
self.addParameter(ParameterSelection(self.METHOD,
6263
self.tr('Modify current selection by'),
63-
self.METHODS, 0))
64+
self.methods, 0))
6465
self.addOutput(OutputVector(self.OUTPUT, self.tr('Selected (location)'), True))
6566

6667
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/SpatialJoin.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ class SpatialJoin(GeoAlgorithm):
4444
KEEP = "KEEP"
4545
OUTPUT = "OUTPUT"
4646

47-
SUMMARYS = [
48-
'Take attributes of the first located feature',
49-
'Take summary of intersecting features'
50-
]
51-
52-
KEEPS = [
53-
'Only keep matching records',
54-
'Keep all records (including non-matching target records)'
55-
]
56-
5747
def defineCharacteristics(self):
5848
self.name, self.i18n_name = self.trAlgorithm('Join attributes by location')
5949
self.group, self.i18n_group = self.trAlgorithm('Vector general tools')
6050

51+
self.summarys = [
52+
self.tr('Take attributes of the first located feature'),
53+
self.tr('Take summary of intersecting features')
54+
]
55+
56+
self.keeps = [
57+
self.tr('Only keep matching records'),
58+
self.tr('Keep all records (including non-matching target records)')
59+
]
60+
6161
self.addParameter(ParameterVector(self.TARGET,
6262
self.tr('Target vector layer'),
6363
[ParameterVector.VECTOR_TYPE_ANY]))
@@ -71,12 +71,12 @@ def defineCharacteristics(self):
7171
left=self.TARGET, right=self.JOIN,
7272
enabledPredicates=predicates))
7373
self.addParameter(ParameterSelection(self.SUMMARY,
74-
self.tr('Attribute summary'), self.SUMMARYS))
74+
self.tr('Attribute summary'), self.summarys))
7575
self.addParameter(ParameterString(self.STATS,
7676
self.tr('Statistics for summary (comma separated)'),
7777
'sum,mean,min,max,median', optional=True))
7878
self.addParameter(ParameterSelection(self.KEEP,
79-
self.tr('Joined table'), self.KEEPS))
79+
self.tr('Joined table'), self.keeps))
8080
self.addOutput(OutputVector(self.OUTPUT, self.tr('Joined layer')))
8181

8282
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/VectorGrid.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ class VectorGrid(GeoAlgorithm):
4646
TYPE = 'TYPE'
4747
OUTPUT = 'OUTPUT'
4848

49-
TYPES = ['Output grid as polygons',
50-
'Output grid as lines'
51-
]
52-
5349
def defineCharacteristics(self):
5450
self.name, self.i18n_name = self.trAlgorithm('Vector grid')
5551
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
52+
53+
self.types = [self.tr('Output grid as polygons'),
54+
self.tr('Output grid as lines')]
55+
5656
self.addParameter(ParameterExtent(self.EXTENT,
5757
self.tr('Grid extent')))
5858
self.addParameter(ParameterNumber(self.STEP_X,
5959
self.tr('X spacing'), 0.0, 1000000000.0, 0.0001))
6060
self.addParameter(ParameterNumber(self.STEP_Y,
6161
self.tr('Y spacing'), 0.0, 1000000000.0, 0.0001))
6262
self.addParameter(ParameterSelection(self.TYPE,
63-
self.tr('Grid type'), self.TYPES))
63+
self.tr('Grid type'), self.types))
6464

6565
self.addOutput(OutputVector(self.OUTPUT, self.tr('Grid')))
6666

0 commit comments

Comments
 (0)
Please sign in to comment.