util.get_unique_names: Change calls to pass domain; remove old tests

Author: janezd

Orange/projection/base.py

@@ -143,8 +143,7 @@ def proj_variable(i, name):
     def _get_var_names(self, n):
         postfixes = ["x", "y"] if n == 2 else [str(i) for i in range(1, n + 1)]
         names = [f"{self.var_prefix}-{postfix}" for postfix in postfixes]
-        domain = self.orig_domain.variables + self.orig_domain.metas
-        return get_unique_names([v.name for v in domain], names)
+        return get_unique_names(self.orig_domain, names)
 
 
 class LinearProjector(Projector):

Orange/projection/pca.py

@@ -73,8 +73,7 @@ class PCAModel(DomainProjection, metaclass=WrapperMeta):
 
     def _get_var_names(self, n):
         names = [f"{self.var_prefix}{postfix}" for postfix in range(1, n + 1)]
-        domain = self.orig_domain.variables + self.orig_domain.metas
-        return get_unique_names([v.name for v in domain], names)
+        return get_unique_names(self.orig_domain, names)
 
 
 class IncrementalPCA(SklProjector):

Orange/widgets/utils/tests/test_annotated_data.py

@@ -113,12 +113,6 @@ def test_cascade_annotated_tables_with_missing_annotated_feature(self):
         self.assertEqual(data.domain.metas[1].name,
                          "{} ({})".format(ANNOTATED_DATA_FEATURE_NAME, 4))
 
-    def test_get_unique_names(self):
-        names = ["charlie", "bravo", "charlie (2)", "charlie (3)", "bravo (2)", "charlie (4)",
-                 "bravo (3)"]
-        self.assertEqual(get_unique_names(names, ["bravo", "charlie"]),
-                         ["bravo (5)", "charlie (5)"])
-
     def test_create_groups_table_include_unselected(self):
         group_indices = random.sample(range(0, len(self.zoo)), 20)
         selection = np.zeros(len(self.zoo), dtype=np.uint8)

Orange/widgets/visualize/utils/widget.py

@@ -541,11 +541,8 @@ def _get_projection_data(self):
         return data
 
     def _get_projection_variables(self):
-        domain = self.data.domain
         names = get_unique_names(
-            [v.name for v in domain.variables + domain.metas],
-            self.embedding_variables_names
-        )
+            self.data.domain, self.embedding_variables_names)
         return ContinuousVariable(names[0]), ContinuousVariable(names[1])
 
     @staticmethod