Merge pull request #4225 from ales-erjavec/owtable-tab-order

[FIX] owtable: Preserve tab order of updated inputs
biolab · Nov 29, 2019 · 6795cb9 · 6795cb9
2 parents ba5fd5f + f58f61b
commit 6795cb9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Orange/widgets/data/owtable.py b/Orange/widgets/data/owtable.py
@@ -455,13 +455,16 @@ def set_dataset(self, data, tid=None):
         """Set the input dataset."""
         self.closeContext()
         if data is not None:
+            datasetname = getattr(data, "name", "Data")
             if tid in self._inputs:
                 # update existing input slot
                 slot = self._inputs[tid]
                 view = slot.view
                 # reset the (header) view state.
                 view.setModel(None)
                 view.horizontalHeader().setSortIndicator(-1, Qt.AscendingOrder)
+                assert self.tabs.indexOf(view) != -1
+                self.tabs.setTabText(self.tabs.indexOf(view), datasetname)
             else:
                 view = QTableView()
                 view.setSortingEnabled(True)
@@ -484,9 +487,10 @@ def sort_reset(index, order):
                         view.model().sort(index, order)
 
                 header.sortIndicatorChanged.connect(sort_reset)
+                self.tabs.addTab(view, datasetname)
 
             view.dataset = data
-            self.tabs.addTab(view, getattr(data, "name", "Data"))
+            self.tabs.setCurrentWidget(view)
 
             self._setup_table_view(view, data)
             slot = TableSlot(tid, data, table_summary(data), view)