From f9b1be5c7050fc5c9a6b5bfc8fc76487dcc355b5 Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 24 Jul 2012 13:27:30 +0200 Subject: [PATCH] Added support for comma in numbers instead of a dot. --- Cura/gui/validators.py | 4 ++-- Cura/util/profile.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cura/gui/validators.py b/Cura/gui/validators.py index e37ea946..db775eff 100644 --- a/Cura/gui/validators.py +++ b/Cura/gui/validators.py @@ -20,7 +20,7 @@ class validFloat(object): def validate(self): try: - f = float(eval(self.setting.GetValue(), {}, {})) + f = float(eval(self.setting.GetValue().replace(',','.'), {}, {})) if self.minValue != None and f < self.minValue: return ERROR, 'This setting should not be below ' + str(self.minValue) if self.maxValue != None and f > self.maxValue: @@ -56,7 +56,7 @@ class warningAbove(object): def validate(self): try: - f = float(eval(self.setting.GetValue(), {}, {})) + f = float(eval(self.setting.GetValue().replace(',','.'), {}, {})) if isinstance(self.minValueForWarning, types.FunctionType): if f >= self.minValueForWarning(): return WARNING, self.warningMessage % (self.minValueForWarning()) diff --git a/Cura/util/profile.py b/Cura/util/profile.py index 3925bdf0..e3ef0717 100644 --- a/Cura/util/profile.py +++ b/Cura/util/profile.py @@ -274,7 +274,8 @@ def getProfileSetting(name): def getProfileSettingFloat(name): try: - return float(eval(getProfileSetting(name), {}, {})) + setting = getProfileSetting(name).replace(',', '.') + return float(eval(setting, {}, {})) except (ValueError, SyntaxError, TypeError): return 0.0 @@ -304,7 +305,8 @@ def getPreferencePath(): def getPreferenceFloat(name): try: - return float(eval(getPreference(name), {}, {})) + setting = getPreference(name).replace(',', '.') + return float(eval(setting, {}, {})) except (ValueError, SyntaxError, TypeError): return 0.0 -- 2.30.2