Merge pull request #2774 from medspx/processing_fix_parameternumber

alexbruy · alexbruy · commit 0d652b2fe0df · 2016-02-11T13:47:48.000+02:00
[processing] fix ParameterNumber float detection
diff --git a/python/plugins/processing/core/parameters.py b/python/plugins/processing/core/parameters.py
@@ -446,9 +446,9 @@ def __init__(self, name='', description='', minValue=None, maxValue=None,
 
         if default is not None:
             try:
-                self.default = int(float(default))
+                self.default = int(unicode(default))
                 self.isInteger = True
-            except:
+            except ValueError:
                 self.default = float(default)
                 self.isInteger = False
         else:
diff --git a/python/plugins/processing/tests/ParametersTest.py b/python/plugins/processing/tests/ParametersTest.py
@@ -308,6 +308,16 @@ def testSetValueOnlyValidNumbers(self):
         self.assertFalse(parameter.setValue('not a number'))
         self.assertEqual(parameter.value, None)
 
+    def testIsInteger(self):
+        floatParameter = ParameterNumber('myname', 'myDescription', default=1.0)
+        self.assertFalse(floatParameter.isInteger)
+        intParameter = ParameterNumber('myname', 'myDescription', default=10)
+        self.assertTrue(intParameter.isInteger)
+        strFloatParameter = ParameterNumber('myname', 'myDescription', default="1.0")
+        self.assertFalse(strFloatParameter.isInteger)
+        strIntParameter = ParameterNumber('myname', 'myDescription', default="10")
+        self.assertTrue(strIntParameter.isInteger)
+
     def testMaxValue(self):
         parameter = ParameterNumber('myName', 'myDescription', maxValue=10)
         self.assertFalse(parameter.setValue(11))
