Merge pull request #4617 from aturanjanin/owconcatenate

[ENH] Concatenate: data info displayed in the status bar

Author: VesnaT

Orange/widgets/data/owconcatenate.py

@@ -23,6 +23,8 @@
 from Orange.widgets.utils.annotated_data import add_columns
 from Orange.widgets.utils.sql import check_sql_input
 from Orange.widgets.utils.widgetpreview import WidgetPreview
+from Orange.widgets.utils.state_summary import format_summary_details, \
+    format_multiple_summaries
 from Orange.widgets.widget import Input, Output, Msg
 
 
@@ -135,6 +137,9 @@ def __init__(self):
             gui.comboBox(ibox, self, "source_column_role", items=self.id_roles,
                          callback=self._source_changed))
 
+        self.info.set_input_summary(self.info.NoInput)
+        self.info.set_output_summary(self.info.NoOutput)
+
         ibox.layout().addLayout(form)
         mleft, mtop, mright, _ = ibox.layout().getContentsMargins()
         ibox.layout().setContentsMargins(mleft, mtop, mright, 4)
@@ -159,8 +164,25 @@ def set_more_data(self, data=None, sig_id=None):
         elif sig_id in self.more_data:
             del self.more_data[sig_id]
 
+    def _set_input_summary(self):
+        more_data = list(self.more_data.values()) if self.more_data else [None]
+        n_primary = len(self.primary_data) if self.primary_data else 0
+        n_more_data = [len(data) if data else 0 for data in more_data]
+
+        summary, details, kwargs = self.info.NoInput, "", {}
+        if self.primary_data or self.more_data:
+            summary = f"{self.info.format_number(n_primary)}, " \
+                    + ", ".join(self.info.format_number(i) for i in n_more_data)
+            details = format_multiple_summaries(
+                [("Primary data", self.primary_data)]
+                + [("", data) for data in more_data]
+            )
+            kwargs = {"format": Qt.RichText}
+        self.info.set_input_summary(summary, details, **kwargs)
+
     def handleNewSignals(self):
         self.mergebox.setDisabled(self.primary_data is not None)
+        self._set_input_summary()
         if self.incompatible_types():
             self.Error.bow_concatenation()
         else:
@@ -211,9 +233,10 @@ def apply(self):
                 source_ids = np.array(list(flatten(
                     [i] * len(table) for i, table in enumerate(tables)))).reshape((-1, 1))
                 data[:, source_var] = source_ids
-
+            self.info.set_output_summary(len(data), format_summary_details(data))
         else:
             data = None
+            self.info.set_output_summary(self.info.NoOutput)
 
         self.Outputs.data.send(data)
 

Orange/widgets/data/tests/test_owconcatenate.py

@@ -1,6 +1,5 @@
 # Test methods with long descriptive names can omit docstrings
-# pylint: disable=missing-docstring
-# pylint: disable=abstract-method
+# pylint: disable=missing-docstring, abstract-method, protected-access
 import unittest
 from unittest.mock import patch
 
@@ -11,7 +10,8 @@
 )
 from Orange.preprocess.transformation import Identity
 from Orange.widgets.data.owconcatenate import OWConcatenate
-
+from Orange.widgets.utils.state_summary import format_summary_details, \
+    format_multiple_summaries
 from Orange.widgets.tests.base import WidgetTest
 
 
@@ -378,6 +378,49 @@ def test_different_number_decimals(self):
             x = out_dom.attributes[0]
             self.assertEqual(x.number_of_decimals, 4)
 
+    def test_summary(self):
+        """Check if the status bar is updated when data is received"""
+        info = self.widget.info
+        no_input, no_output = "No data on input", "No data on output"
+
+        self.send_signal(self.widget.Inputs.primary_data, self.iris)
+        data_list = [("Primary data", self.iris), ("", None)]
+        summary, details = "150, 0", 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.additional_data, self.titanic, 0)
+        data_list = [("Primary data", self.iris), ("", self.titanic)]
+        summary, details = "150, 2201", 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.primary_data, None)
+        self.send_signal(self.widget.Inputs.additional_data, self.iris, 1)
+        data_list = [("Primary data", None), ("", self.titanic), ("", self.iris)]
+        summary, details = "0, 2201, 150", 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.additional_data, None, 0)
+        self.send_signal(self.widget.Inputs.additional_data, None, 1)
+        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)
+
 
 if __name__ == "__main__":
     unittest.main()