pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also check for TypeErrors, which seem to happen when you use a comma instead of a dot in values.

Browse source
This commit is contained in:
daid 2012-07-02 12:25:40 +02:00
parent 402c2223ca
commit 29b5d0b0eb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cura/gui/validators.py
View file

@ -26,7 +26,7 @@ class validFloat(object):
if self.maxValue != None and f > self.maxValue:
return ERROR, 'This setting should not be above ' + str(self.maxValue)
return SUCCESS, ''
except (ValueError, SyntaxError):
except (ValueError, SyntaxError, TypeError):
return ERROR, '"' + str(self.setting.GetValue()) + '" is not a valid number or expression'
class validInt(object):
@ -44,7 +44,7 @@ class validInt(object):
if self.maxValue != None and f > self.maxValue:
return ERROR, 'This setting should not be above ' + str(self.maxValue)
return SUCCESS, ''
except (ValueError, SyntaxError):
except (ValueError, SyntaxError, TypeError):
return ERROR, '"' + str(self.setting.GetValue()) + '" is not a valid whole number or expression'
class warningAbove(object):
@ -64,7 +64,7 @@ class warningAbove(object):
if f >= self.minValueForWarning:
return WARNING, self.warningMessage
return SUCCESS, ''
except (ValueError, SyntaxError):
except (ValueError, SyntaxError, TypeError):
#We already have an error by the int/float validator in this case.
return SUCCESS, ''

4
Cura/util/profile.py
View file

@ -267,7 +267,7 @@ def getProfileSetting(name):
def getProfileSettingFloat(name):
try:
return float(eval(getProfileSetting(name), {}, {}))
except (ValueError, SyntaxError):
except (ValueError, SyntaxError, TypeError):
return 0.0
def putProfileSetting(name, value):
@ -297,7 +297,7 @@ def getPreferencePath():
def getPreferenceFloat(name):
try:
return float(eval(getPreference(name), {}, {}))
except (ValueError, SyntaxError):
except (ValueError, SyntaxError, TypeError):
return 0.0
def getPreference(name):