OWMergeData: data info displayed in the status bar

Author: aturanjanin

Orange/widgets/data/owmergedata.py

@@ -16,6 +16,8 @@
 from Orange.widgets.utils.itemmodels import DomainModel
 from Orange.widgets.utils.sql import check_sql_input
 from Orange.widgets.utils.widgetpreview import WidgetPreview
+from Orange.widgets.utils.state_summary import format_multiple_summaries, \
+    format_summary_details
 from Orange.widgets.widget import Input, Output, Msg
 
 INSTANCEID = "Instance id"
@@ -315,10 +317,8 @@ def __init__(self):
         self.model = DomainModelWithTooltips(content)
         self.extra_model = DomainModelWithTooltips(content)
 
-        box = gui.hBox(self.controlArea, box=None)
-        no_info = self.data_info(None)
-        self.info_box_data = gui.label(box, self, no_info, box="Data")
-        self.info_box_extra_data = gui.label(box, self, no_info, box="Extra Data")
+        self.info.set_input_summary(self.info.NoInput)
+        self.info.set_output_summary(self.info.NoOutput)
 
         grp = gui.radioButtons(
             self.controlArea, self, "merging", box="Merging",
@@ -346,14 +346,12 @@ def change_merging(self):
     def set_data(self, data):
         self.data = data
         self.model.set_domain(data and data.domain)
-        self.info_box_data.setText(self.data_info(data))
 
     @Inputs.extra_data
     @check_sql_input
     def set_extra_data(self, data):
         self.extra_data = data
         self.extra_model.set_domain(data and data.domain)
-        self.info_box_extra_data.setText(self.data_info(data))
 
     def store_combo_state(self):
         self.attr_pairs = self.attr_boxes.current_state()
@@ -364,6 +362,20 @@ def handleNewSignals(self):
         self.openContext(self.data and self.data.domain,
                          self.extra_data and self.extra_data.domain)
         self.attr_boxes.set_state(self.attr_pairs)
+
+        summary, details, kwargs = self.info.NoInput, "", {}
+        if self.data or self.extra_data:
+            n_data = len(self.data) if self.data else 0
+            n_extra_data = len(self.extra_data) if self.extra_data else 0
+            summary = f"{self.info.format_number(n_data)}, " \
+                      f"{self.info.format_number(n_extra_data)}"
+            kwargs = {"format": Qt.RichText}
+            details = format_multiple_summaries([
+                ("Data", self.data),
+                ("Extra data", self.extra_data)
+            ])
+        self.info.set_input_summary(summary, details, **kwargs)
+
         self.unconditional_commit()
 
     def _find_best_match(self):
@@ -384,20 +396,13 @@ def get_unique_str_metas_names(model_):
                     n_max_intersect, attr, extra_attr = n_inter, m_a, m_b
         return attr, extra_attr
 
-    @staticmethod
-    def data_info(data):
-        if data is None:
-            return "No data."
-        else:
-            return \
-                f"{data.name}\n" \
-                f"{len(data)} instances\n" \
-                f"{len(data.domain) + len(data.domain.metas)} variables"
-
     def commit(self):
         self.clear_messages()
         merged = self.merge() if self.data and self.extra_data else None
         self.Outputs.data.send(merged)
+        details = format_summary_details(merged) if merged else ""
+        summary = len(merged) if merged else self.info.NoOutput
+        self.info.set_output_summary(summary, details)
 
     def send_report(self):
         # pylint: disable=invalid-sequence-index

Orange/widgets/data/tests/test_owmergedata.py

@@ -1,7 +1,7 @@
 # Test methods with long descriptive names can omit docstrings
 # pylint: disable=missing-docstring
 # There are never too many tests, so:
-# pylint: disable=too-many-lines,too-many-public-methods
+# pylint: disable=too-many-lines,too-many-public-methods, protected-access
 from itertools import chain
 import unittest
 from unittest.mock import Mock
@@ -16,6 +16,8 @@
 from Orange.widgets.data.owmergedata import OWMergeData, INSTANCEID, INDEX, \
     MergeDataContextHandler
 from Orange.widgets.tests.base import WidgetTest
+from Orange.widgets.utils.state_summary import format_multiple_summaries, \
+    format_summary_details
 from Orange.tests import test_filename
 
 
@@ -1019,6 +1021,44 @@ def test_keep_non_duplicate_variables_missing_rows(self):
         self.assertListEqual([m.name for m in merged_data.domain.variables],
                              ["A", "B", "C"])
 
+    def test_summary(self):
+        """Check if the status bar is updated when data is received"""
+        data = self.dataA
+        info = self.widget.info
+        no_input, no_output = "No data on input", "No data on output"
+
+        self.send_signal(self.widget.Inputs.data, data)
+        data_list = [("Data", data), ("Extra data", None)]
+        summary, details = f"{len(data)}, 0", format_multiple_summaries(data_list)
+        self.assertEqual(info._StateInfo__input_summary.brief, summary)
+        self.assertEqual(info._StateInfo__input_summary.details, details)
+        self.assertEqual(info._StateInfo__output_summary.brief, "")
+        self.assertEqual(info._StateInfo__output_summary.details, no_output)
+
+        self.send_signal(self.widget.Inputs.extra_data, data)
+        data_list = [("Data", data), ("Extra data", data)]
+        summary = f"{len(data)}, {len(data)}"
+        details = format_multiple_summaries(data_list)
+        self.assertEqual(info._StateInfo__input_summary.brief, summary)
+        self.assertEqual(info._StateInfo__input_summary.details, details)
+        output = self.get_output(self.widget.Outputs.data)
+        summary, details = f"{len(output)}", format_summary_details(output)
+        self.assertEqual(info._StateInfo__output_summary.brief, summary)
+        self.assertEqual(info._StateInfo__output_summary.details, details)
+
+        self.send_signal(self.widget.Inputs.data, None)
+        data_list = [("Data", None), ("Extra data", data)]
+        summary, details = f"0, {len(data)}", format_multiple_summaries(data_list)
+        self.assertEqual(info._StateInfo__input_summary.brief, summary)
+        self.assertEqual(info._StateInfo__input_summary.details, details)
+        self.assertEqual(info._StateInfo__output_summary.brief, "")
+        self.assertEqual(info._StateInfo__output_summary.details, no_output)
+
+        self.send_signal(self.widget.Inputs.extra_data, None)
+        self.assertEqual(info._StateInfo__input_summary.brief, "")
+        self.assertEqual(info._StateInfo__input_summary.details, no_input)
+        self.assertEqual(info._StateInfo__output_summary.brief, "")
+        self.assertEqual(info._StateInfo__output_summary.details, no_output)
 
 class MergeDataContextHandlerTest(unittest.TestCase):
     # These units are too small to test individually, so they are tested