owtable: Slight refactor

Author: ales-erjavec

Orange/widgets/data/owtable.py

@@ -173,14 +173,18 @@ class DataTableView(gui.HScrollStepMixin, TableView):
     input_slot: TableSlot
 
 
-class TableBarItemDelegate(BarItemDataDelegate):
+class TableDataDelegate(DataDelegate):
+    # Roles supplied by TableModel we want DataDelegate to use.
+    TableModelRoles = (Qt.DisplayRole, Qt.TextAlignmentRole, Qt.BackgroundRole)
 
+    def __init__(self, *args, roles=TableModelRoles, **kwargs):
+        super().__init__(*args, roles=roles, **kwargs)
+
+
+class TableBarItemDelegate(BarItemDataDelegate, TableDataDelegate):
     __slots__ = ("color_schema",)
 
     def __init__(self, *args, color_schema=None, **kwargs):
-        kwargs.setdefault(
-            "roles",  (Qt.DisplayRole, Qt.TextAlignmentRole, Qt.BackgroundRole)
-        )
         super().__init__(*args, **kwargs)
         self.color_schema = color_schema
 
@@ -291,9 +295,7 @@ def set_dataset(self, data, tid=None):
             else:
                 view = DataTableView()
                 view.setSortingEnabled(True)
-                view.setItemDelegate(
-                    DataDelegate(view, roles=(Qt.DisplayRole, Qt.BackgroundRole, Qt.TextAlignmentRole))
-                )
+                view.setItemDelegate(TableDataDelegate(view))
 
                 if self.select_rows:
                     view.setSelectionBehavior(QTableView.SelectRows)
@@ -382,10 +384,10 @@ def _setup_table_view(self, view, data):
         if self.show_distributions:
             view.setItemDelegate(
                 TableBarItemDelegate(
-                    self, color=self.dist_color, color_schema=color_schema)
+                    view, color=self.dist_color, color_schema=color_schema)
             )
         else:
-            view.setItemDelegate(DataDelegate(self, roles=(Qt.DisplayRole, Qt.BackgroundRole, Qt.TextAlignmentRole)))
+            view.setItemDelegate(TableDataDelegate(view))
 
         # Enable/disable view sorting based on data's type
         view.setSortingEnabled(is_sortable(data))
@@ -629,10 +631,10 @@ def _on_distribution_color_changed(self):
             else:
                 color_schema = None
             if self.show_distributions:
-                delegate = TableBarItemDelegate(self, color=self.dist_color,
+                delegate = TableBarItemDelegate(widget, color=self.dist_color,
                                                 color_schema=color_schema)
             else:
-                delegate = QStyledItemDelegate(self)
+                delegate = TableDataDelegate(widget)
             widget.setItemDelegate(delegate)
         tab = self.tabs.currentWidget()
         if tab:

benchmark/bench_datadelegate.py

@@ -4,10 +4,10 @@
 
 import Orange
 from Orange.data import Table
-from Orange.widgets.data.owtable import RichTableModel, TableBarItemDelegate
+from Orange.widgets.data.owtable import RichTableModel, TableBarItemDelegate, \
+    TableDataDelegate
 from Orange.widgets.unsupervised.owdistancematrix import DistanceMatrixModel, \
     TableBorderItem
-from Orange.widgets.utils.itemdelegates import DataDelegate
 from Orange.widgets.utils.tableview import TableView
 
 from .base import benchmark, Benchmark
@@ -37,7 +37,7 @@ class BenchTableView(BaseBenchTableView):
     def setUp(self) -> None:
         super().setUp()
         data = Table("brown-selected")
-        self.delegate = DataDelegate(
+        self.delegate = TableDataDelegate(
             self.view, roles=(
                 Qt.DisplayRole, Qt.BackgroundRole, Qt.TextAlignmentRole
             )