From 59749199734a9d69717e3d9939ad5c8d9a7601b1 Mon Sep 17 00:00:00 2001 From: Richard Pastrick Date: Tue, 1 May 2012 10:59:57 -0700 Subject: [PATCH] Make the rerenderprob value print a decent error since it does have to be between 0.0 and 1.0 instead of just that it is a float. Remove 0.0 and 1.0 as valid values --- overviewer_core/settingsDefinition.py | 2 +- overviewer_core/settingsValidators.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index 30c0c6e..413a285 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -75,7 +75,7 @@ renders = Setting(required=True, default=util.OrderedDict(), "nomarkers": Setting(required=False, validator=validateBool, default=None), "texturepath": Setting(required=False, validator=validateTexturePath, default=None), "renderchecks": Setting(required=False, validator=validateInt, default=None), - "rerenderprob": Setting(required=True, validator=validateFloat, default=0), + "rerenderprob": Setting(required=True, validator=validateRerenderprob, default=0), "crop": Setting(required=False, validator=validateCrop, default=None), "changelist": Setting(required=False, validator=validateStr, default=None), "markers": Setting(required=False, validator=validateMarkers, default=[]), diff --git a/overviewer_core/settingsValidators.py b/overviewer_core/settingsValidators.py index 0df90d1..aaf920e 100644 --- a/overviewer_core/settingsValidators.py +++ b/overviewer_core/settingsValidators.py @@ -111,10 +111,10 @@ def validateNorthDirection(direction): raise ValidationException("%r is not a valid north direction" % direction) return intdir -def validateStochastic(s): +def validateRerenderprob(s): val = float(s) - if val < 0 or val > 1: - raise ValidationException("%r is not a valid stochastic value. Should be between 0.0 and 1.0" % s) + if val =< 0 or val >= 1: + raise ValidationException("%r is not a valid rerender probability value. Should be between 0.0 and 1.0." % s) return val def validateImgFormat(fmt):