Added support for comma in numbers instead of a dot.

diff --git a/Cura/gui/validators.py b/Cura/gui/validators.py
index e37ea946f5f3555d0980b70c66281c4ea1c7434a..db775eff3e242762db9acaea1ae3ec97ca6ac182 100644 (file)
--- 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 3925bdf0d2e0efb689b2c077fac3c1dc7042f4f2..e3ef0717d9b978f95a98ba3114672d0989700b16 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -274,7 +274,8 @@ def getProfileSetting(name):
 \r
 def getProfileSettingFloat(name):\r
        try:\r
-               return float(eval(getProfileSetting(name), {}, {}))\r
+               setting = getProfileSetting(name).replace(',', '.')\r
+               return float(eval(setting, {}, {}))\r
        except (ValueError, SyntaxError, TypeError):\r
                return 0.0\r
 \r
@@ -304,7 +305,8 @@ def getPreferencePath():
 \r
 def getPreferenceFloat(name):\r
        try:\r
-               return float(eval(getPreference(name), {}, {}))\r
+               setting = getPreference(name).replace(',', '.')\r
+               return float(eval(setting, {}, {}))\r
        except (ValueError, SyntaxError, TypeError):\r
                return 0.0\r
 \r