chiark / gitweb /
Also check for TypeErrors, which seem to happen when you use a comma instead of a...
authordaid <daid303@gmail.com>
Mon, 2 Jul 2012 10:25:40 +0000 (12:25 +0200)
committerdaid <daid303@gmail.com>
Mon, 2 Jul 2012 10:25:40 +0000 (12:25 +0200)
Cura/gui/validators.py
Cura/util/profile.py

index f29e8d1eb9cfb8e065415dc5374577f5b60a2340..e37ea946f5f3555d0980b70c66281c4ea1c7434a 100644 (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, ''
 
index 122b7e9024856b9f03695f614eb1954c5af7e658..4c4165345af3c847cc0d27a987599da9b02f4e98 100644 (file)
@@ -267,7 +267,7 @@ def getProfileSetting(name):
 def getProfileSettingFloat(name):\r
        try:\r
                return float(eval(getProfileSetting(name), {}, {}))\r
-       except (ValueError, SyntaxError):\r
+       except (ValueError, SyntaxError, TypeError):\r
                return 0.0\r
 \r
 def putProfileSetting(name, value):\r
@@ -297,7 +297,7 @@ def getPreferencePath():
 def getPreferenceFloat(name):\r
        try:\r
                return float(eval(getPreference(name), {}, {}))\r
-       except (ValueError, SyntaxError):\r
+       except (ValueError, SyntaxError, TypeError):\r
                return 0.0\r
 \r
 def getPreference(name):\r