de-plenk exclamation marks

This commit is contained in:
Juergen E. Fischer 2016-03-25 22:50:50 +01:00
parent e1d3dd5ff6
commit 962726cf66
10 changed files with 14 additions and 14 deletions

View File

@ -36,9 +36,9 @@ def checkParameterValuesBeforeExecuting(alg):
raster = alg.getParameterValue(u'raster')
if rules and txtrules:
return alg.tr("You need to set either a rules file or write directly the rules !")
return alg.tr("You need to set either a rules file or write directly the rules!")
elif (rules and raster) or (txtrules and raster):
return alg.tr("You need to set either rules or a raster from which to copy categories !")
return alg.tr("You need to set either rules or a raster from which to copy categories!")
return None

View File

@ -31,7 +31,7 @@ import os
def checkParameterValuesBeforeExecuting(alg):
""" Verify if we have the right parameters """
if alg.getParameterValue('rules_txt') and alg.getParameterValue('rules'):
return alg.tr("You need to set either inline rules or a rules file !")
return alg.tr("You need to set either inline rules or a rules file!")
return None

View File

@ -31,7 +31,7 @@ import os
def checkParameterValuesBeforeExecuting(alg):
""" Verify if we have the right parameters """
if alg.getParameterValue('start_coordinates') and alg.getParameterValue('start_points'):
return alg.tr("You need to set either start coordinates OR a start points vector layer !")
return alg.tr("You need to set either start coordinates OR a start points vector layer!")
parameters = [alg.getParameterValue(f) for f in ['-c', '-a', '-n']]
paramscore = [f for f in parameters if f]

View File

@ -59,7 +59,7 @@ def checkMovingWindow(alg, outputTxt=False):
configTxt = alg.getParameterValue('config_txt')
config = alg.getParameterValue('config')
if configTxt and config:
return alg.tr("You need to set either inline configuration or a configuration file !")
return alg.tr("You need to set either inline configuration or a configuration file!")
# Verify that configuration is in moving window
movingWindow = False

View File

@ -53,7 +53,7 @@ def checkMovingWindow(alg):
configTxt = alg.getParameterValue('config_txt')
config = alg.getParameterValue('config')
if configTxt and config:
return alg.tr("You need to set either inline configuration or a configuration file !")
return alg.tr("You need to set either inline configuration or a configuration file!")
# Verify that configuration is in moving window
movingWindow = False

View File

@ -31,7 +31,7 @@ from os import path
def checkParameterValuesBeforeExecuting(alg):
""" Verify if we have the right parameters """
if alg.getParameterValue('expression') and alg.getParameterValue('file'):
return alg.tr("You need to set either inline expression or a rules file !")
return alg.tr("You need to set either inline expression or a rules file!")
return None

View File

@ -33,7 +33,7 @@ def checkParameterValuesBeforeExecuting(alg):
y_radius = alg.getParameterValue(u'y_radius')
if (not radius and not x_radius and not y_radius) or (radius and (x_radius or y_radius)):
return alg.tr("You need to set either radius or x_radius and y_radius !")
return alg.tr("You need to set either radius or x_radius and y_radius!")
elif (x_radius and not y_radius) or (y_radius and not x_radius):
return alg.tr("You need to set x_radius and y_radius !")
return alg.tr("You need to set x_radius and y_radius!")
return None

View File

@ -38,11 +38,11 @@ def checkParameterValuesBeforeExecuting(alg):
outfile = alg.getParameterValue(u'outfile')
if datapos and infile:
return alg.tr("You need to set either inline data positions or an input data positions file !")
return alg.tr("You need to set either inline data positions or an input data positions file!")
if output and outfile:
return alg.tr("You need to set either sampling data positions or an output sampling data positions file !")
return alg.tr("You need to set either sampling data positions or an output sampling data positions file!")
if not (datapos or infile or output or outfile):
return alg.tr("You need to set input and output data positions parameters !")
return alg.tr("You need to set input and output data positions parameters!")
return None

View File

@ -29,7 +29,7 @@ __revision__ = '$Format:%H$'
def checkParameterValuesBeforeExecuting(alg):
""" Verify if we have the right parameters """
if alg.getParameterValue('brighten') and alg.getParameterValue('bgcolor'):
return alg.tr("You need to set either a brighten percentage or a NULL color !")
return alg.tr("You need to set either a brighten percentage or a NULL color!")
return None

View File

@ -35,7 +35,7 @@ methodRef = {'asm': 'ASM', 'contrast': 'Contr', 'corr': 'Corr',
def checkParameterValuesBeforeExecuting(alg):
methodList = alg.getParameterValue('method').split(",")
if len([f for f in methodList if f not in methodRef.keys()]) > 0 and not alg.getParameterValue('-a'):
return alg.tr("You need to set the method list with the following values only: asm, contrast, corr, var, idm, sa, se, sv, entr, dv, de, moc1, moc2 !")
return alg.tr("You need to set the method list with the following values only: asm, contrast, corr, var, idm, sa, se, sv, entr, dv, de, moc1, moc2!")
return None