Merge pull request #6000 from ajdapretnar/heat-map-hide

OWHeatMap: don't show hidden attributes

Author: janezd

Orange/widgets/visualize/owheatmap.py

@@ -229,8 +229,8 @@ def __init__(self):
         #: The original data with all features (retained to
         #: preserve the domain on the output)
         self.input_data = None
-        #: The effective data striped of discrete features, and often
-        #: merged using k-means
+        #: The effective data stripped of discrete features and hidden
+        #: attributes, and often merged using k-means
         self.data = None
         self.effective_data = None
         #: Source of column annotations (derived from self.data)
@@ -602,13 +602,16 @@ def set_dataset(self, data=None):
             self.Error.no_continuous()
             input_data = data = None
 
-        # Data contains some discrete attributes which must be filtered
+        # Data contains some discrete or hidden attributes which must be
+        # filtered
         if data is not None and \
-                any(var.is_discrete for var in data.domain.attributes):
+                any(var.is_discrete or var.attributes.get('hidden', False)
+                    for var in data.domain.attributes):
             ndisc = sum(var.is_discrete for var in data.domain.attributes)
             data = data.transform(
                 Domain([var for var in data.domain.attributes
-                        if var.is_continuous],
+                        if var.is_continuous and
+                        not var.attributes.get('hidden', False)],
                        data.domain.class_vars,
                        data.domain.metas))
             if not data.domain.attributes:
@@ -689,7 +692,11 @@ def set_column_split_var(self, var: Optional[Variable]):
     def update_heatmaps(self):
         if self.data is not None:
             self.clear_scene()
-            self.clear_messages()
+            self.Error.clear()
+            self.Warning.clear()
+            self.Information.row_clust.clear()
+            self.Information.col_clust.clear()
+            self.Information.sampled.clear()
             if self.col_clustering != Clustering.None_ and \
                     len(self.data.domain.attributes) < 2:
                 self.Error.not_enough_features()

Orange/widgets/visualize/tests/test_owheatmap.py

@@ -29,16 +29,16 @@ def setUpClass(cls):
         super().setUpClass()
         WidgetOutputsTestMixin.init(cls)
 
-        cls.housing = Table("housing")
-        cls.titanic = Table("titanic")
-        cls.brown_selected = Table("brown-selected")
-
         cls.signal_name = "Data"
         cls.signal_data = cls.data
 
     def setUp(self):
         self.widget = self.create_widget(OWHeatMap)  # type: OWHeatMap
 
+        self.housing = Table("housing")
+        self.titanic = Table("titanic")
+        self.brown_selected = Table("brown-selected")
+
     def test_input_data(self):
         """Check widget's data with data on the input"""
         for data in (self.data, self.housing):
@@ -72,6 +72,9 @@ def test_information_message(self):
         self.assertFalse(self.widget.Information.active)
         self.send_signal(self.widget.Inputs.data, data[:21])
         self.assertTrue(self.widget.Information.active)
+        data = Table("heart_disease.tab")[:10]
+        self.send_signal(self.widget.Inputs.data, data)
+        self.assertTrue(self.widget.Information.discrete_ignored.is_shown())
 
     def test_settings_changed(self):
         self.send_signal(self.widget.Inputs.data, self.data)
@@ -396,6 +399,14 @@ def test_col_color_annotations_with_na(self):
         widget.set_column_annotation_color_var(None)
         self.assertFalse(widget.scene.widget.top_side_colors[0].isVisible())
 
+    def test_data_with_hidden(self):
+        w = self.widget
+        housing = self.housing.copy()
+        housing.domain.attributes[0].attributes["hidden"] = True
+        self.send_signal(self.widget.Inputs.data, housing)
+        self.assertEqual(len(w.effective_data.domain.attributes),
+                         len(housing.domain.attributes) - 1)
+
 
 if __name__ == "__main__":
     unittest.main()