Merge pull request #3091 from robertcv/fix_mergedata

[ENH] MergeData: add autocommit button

Orange/widgets/data/owmergedata.py

@@ -44,6 +44,7 @@ class Outputs:
     attr_combine_data = settings.Setting('', schema_only=True)
     attr_combine_extra = settings.Setting('', schema_only=True)
     merging = settings.Setting(0)
+    auto_apply = settings.Setting(True)
 
     want_main_area = False
     resizing_enabled = False
@@ -111,6 +112,9 @@ def add_option(label, pre_label, between_label,
                    self.model_unique_with_id, self.extra_model_unique_with_id)
         self.set_merging()
 
+        gui.auto_commit(self.controlArea, self, "auto_apply", "&Apply",
+                        box=False)
+
     def set_merging(self):
         # pylint: disable=invalid-sequence-index
         # all boxes should be hidden before one is shown, otherwise widget's

Orange/widgets/data/tests/test_owmergedata.py

@@ -450,3 +450,17 @@ def test_sparse(self):
 
         output_sparse.X = output_sparse.X.toarray()
         self.assertTablesEqual(output_dense, output_sparse)
+
+    def test_disable_auto_apply(self):
+        """Check if disable auto apply works as expected"""
+        self.widget.auto_apply = False
+        self.send_signal(self.widget.Inputs.data, self.dataA)
+        self.send_signal(self.widget.Inputs.extra_data, self.dataB)
+        self.assertIsNone(self.get_output(self.widget.Outputs.data))
+
+    def test_enable_auto_apply(self):
+        """Check if enable auto apply works as expected"""
+        self.widget.auto_apply = True
+        self.send_signal(self.widget.Inputs.data, self.dataA)
+        self.send_signal(self.widget.Inputs.extra_data, self.dataB)
+        self.assertIsNotNone(self.get_output(self.widget.Outputs.data))