Merge pull request #116 from janezd/random-convert-double

Random Data: Improve parsing of decimal values

orangecontrib/educational/widgets/owrandomdata.py

@@ -28,16 +28,25 @@ class pos_int(int):  # pylint: disable=invalid-name
     validator = QIntValidator()
 
 
-class any_float(float):  # pylint: disable=invalid-name
+class float_convert(float):  # pylint: disable=invalid-name
+    @staticmethod
+    def convert(s):
+        s = s.replace(",", ".")
+        if s.endswith("."):
+            s += "0"
+        return float(s)
+
+
+class any_float(float_convert):  # pylint: disable=invalid-name
     validator = QDoubleValidator()
 
 
-class pos_float(float):  # pylint: disable=invalid-name
+class pos_float(float_convert):  # pylint: disable=invalid-name
     validator = QDoubleValidator()
     validator.setBottom(0.0001)
 
 
-class prob_float(float):  # pylint: disable=invalid-name
+class prob_float(float_convert):  # pylint: disable=invalid-name
     validator = QDoubleValidator(0, 1, 5)
 
 

orangecontrib/educational/widgets/tests/test_owrandomdata.py

@@ -100,6 +100,30 @@ def test_get_parameters(self):
         e = MockEditorEmpty()
         self.assertEqual(e.get_parameters(), {})
 
+    def test_parameters_conversion(self):
+        e = MockEditor()
+        parameters = {p.arg_name: p.default for p in MockEditor.parameters}
+
+        e.edits["f"].setText("6.28")
+        parameters["f"] = 6.28
+        self.assertEqual(e.get_parameters(), parameters)
+
+        e.edits["f"].setText("5,17")
+        parameters["f"] = 5.17
+        self.assertEqual(e.get_parameters(), parameters)
+
+        e.edits["f"].setText("4,")
+        parameters["f"] = 4
+        self.assertEqual(e.get_parameters(), parameters)
+
+        e.edits["f"].setText("3.")
+        parameters["f"] = 3
+        self.assertEqual(e.get_parameters(), parameters)
+
+        e.edits["f"].setText("2")
+        parameters["f"] = 2
+        self.assertEqual(e.get_parameters(), parameters)
+
     def test_set_erorr(self):
         e = MockEditor()
         self.assertTrue(e.error.isHidden())