Merge pull request #4235 from PrimozGodec/enable-var-name-change

[FIX] File widget: fix name change
biolab · Nov 29, 2019 · bc08b7f · bc08b7f
2 parents 65f4dfa + 82f1032
commit bc08b7f
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/Orange/widgets/data/tests/test_owfile.py b/Orange/widgets/data/tests/test_owfile.py
@@ -141,6 +141,52 @@ def test_domain_changes_are_stored(self):
         data = self.get_output(self.widget.Outputs.data)
         self.assertIsInstance(data.domain["iris"], StringVariable)
 
+    def test_variable_name_change(self):
+        """
+        Test whether the name of the variable is changed correctly by
+        the domaineditor.
+        """
+        self.open_dataset("iris")
+
+        # just rename
+        idx = self.widget.domain_editor.model().createIndex(4, 0)
+        self.widget.domain_editor.model().setData(idx, "a", Qt.EditRole)
+        self.widget.apply_button.click()
+        data = self.get_output(self.widget.Outputs.data)
+        self.assertIn("a", data.domain)
+
+        # rename and change to text
+        idx = self.widget.domain_editor.model().createIndex(4, 0)
+        self.widget.domain_editor.model().setData(idx, "b", Qt.EditRole)
+        idx = self.widget.domain_editor.model().createIndex(4, 1)
+        self.widget.domain_editor.model().setData(idx, "text", Qt.EditRole)
+        self.widget.apply_button.click()
+        data = self.get_output(self.widget.Outputs.data)
+        self.assertIn("b", data.domain)
+        self.assertIsInstance(data.domain["b"], StringVariable)
+
+        # rename and change to discrete
+        idx = self.widget.domain_editor.model().createIndex(4, 0)
+        self.widget.domain_editor.model().setData(idx, "c", Qt.EditRole)
+        idx = self.widget.domain_editor.model().createIndex(4, 1)
+        self.widget.domain_editor.model().setData(
+            idx, "categorical", Qt.EditRole)
+        self.widget.apply_button.click()
+        data = self.get_output(self.widget.Outputs.data)
+        self.assertIn("c", data.domain)
+        self.assertIsInstance(data.domain["c"], DiscreteVariable)
+
+        # rename and change to continuous
+        self.open_dataset("zoo")
+        idx = self.widget.domain_editor.model().createIndex(0, 0)
+        self.widget.domain_editor.model().setData(idx, "c", Qt.EditRole)
+        idx = self.widget.domain_editor.model().createIndex(0, 1)
+        self.widget.domain_editor.model().setData(idx, "numeric", Qt.EditRole)
+        self.widget.apply_button.click()
+        data = self.get_output(self.widget.Outputs.data)
+        self.assertIn("c", data.domain)
+        self.assertIsInstance(data.domain["c"], ContinuousVariable)
+
     def open_dataset(self, name):
         filename = FileFormat.locate(name, dataset_dirs)
         self.widget.add_path(filename)

diff --git a/Orange/widgets/utils/domaineditor.py b/Orange/widgets/utils/domaineditor.py
@@ -299,9 +299,7 @@ def numbers_are_round(var, col_data):
             if name == orig_var.name and tpe == type(orig_var):
                 var = orig_var
             elif tpe == type(orig_var):
-                # change the name so that all_vars will get the correct name
-                orig_var.name = name
-                var = orig_var
+                var = orig_var.copy(name=name)
             elif tpe == DiscreteVariable:
                 values = list(str(i) for i in unique(col_data) if not self._is_missing(i))
                 round_numbers = numbers_are_round(orig_var, col_data)