q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for comma in numbers instead of a dot.

master
daid 2012-07-24 13:27:30 +02:00
parent aad4fd8769
commit f9b1be5c70
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cura/gui/validators.py
View File

@ -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())

6
Cura/util/profile.py
View File

@ -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