Merge pull request #5821 from janezd/pylistmodeltooltip-arg

PyListModelTooltip: Improve handling of tooltip argument

Author: VesnaT

Orange/widgets/data/owfeatureconstructor.py

@@ -144,14 +144,12 @@ def __init__(self, *args, **kwargs):
         self.attributescb.setModel(self.attrs_model)
 
         sorted_funcs = sorted(self.FUNCTIONS)
-        self.funcs_model = itemmodels.PyListModelTooltip()
+        self.funcs_model = itemmodels.PyListModelTooltip(
+            chain(["Select Function"], sorted_funcs),
+            chain([''], [self.FUNCTIONS[func].__doc__ for func in sorted_funcs])
+        )
         self.funcs_model.setParent(self)
 
-        self.funcs_model[:] = chain(["Select Function"], sorted_funcs)
-        self.funcs_model.tooltips[:] = chain(
-            [''],
-            [self.FUNCTIONS[func].__doc__ for func in sorted_funcs])
-
         self.functionscb = ComboBoxSearch(
             minimumContentsLength=16,
             sizeAdjustPolicy=QComboBox.AdjustToMinimumContentsLengthWithIcon,

Orange/widgets/utils/itemmodels.py

@@ -358,12 +358,17 @@ def remove(self, val):
 
 
 class PyListModelTooltip(PyListModel):
-    def __init__(self, iterable=None, tooltips=[], **kwargs):
+    def __init__(self, iterable=None, tooltips=(), **kwargs):
         super().__init__(iterable, **kwargs)
+        if not isinstance(tooltips, Sequence):
+            # may be a generator; if not, fail
+            tooltips = list(tooltips)
         self.tooltips = tooltips
 
     def data(self, index, role=Qt.DisplayRole):
         if role == Qt.ToolTipRole:
+            if index.row() >= len(self.tooltips):
+                return None
             return self.tooltips[index.row()]
         else:
             return super().data(index, role)

Orange/widgets/utils/tests/test_itemmodels.py

@@ -4,8 +4,6 @@
 import unittest
 from unittest.mock import patch
 
-import numpy as np
-
 from AnyQt.QtCore import Qt, QModelIndex
 from AnyQt.QtTest import QSignalSpy
 
@@ -14,8 +12,8 @@
     ContinuousVariable, DiscreteVariable, StringVariable, TimeVariable
 from Orange.widgets.utils import colorpalettes
 from Orange.widgets.utils.itemmodels import \
-    AbstractSortTableModel, PyTableModel,\
-    PyListModel, VariableListModel, DomainModel, ContinuousPalettesModel, \
+    PyTableModel, PyListModel, PyListModelTooltip,\
+    VariableListModel, DomainModel, ContinuousPalettesModel, \
     _as_contiguous_range
 from Orange.widgets.gui import TableVariable
 from orangewidget.tests.base import GuiTest
@@ -481,5 +479,54 @@ def testIndexOf(self):
         self.assertIsNone(model.indexOf(42))
 
 
+class TestPyListModelTooltip(GuiTest):
+    def test_tooltips_size(self):
+        def data(i):
+            return model.data(model.index(i, 0))
+
+        def tip(i):
+            return model.data(model.index(i, 0), Qt.ToolTipRole)
+
+        # Not enough tooptips - return None
+        model = PyListModelTooltip(["foo", "bar", "baz"], ["footip", "bartip"])
+        self.assertEqual(data(1), "bar")
+        self.assertEqual(data(2), "baz")
+        self.assertIsNone(data(3))
+        self.assertEqual(tip(1), "bartip")
+        self.assertIsNone(tip(2))
+
+        # No tooltips
+        model = PyListModelTooltip(["foo", "bar", "baz"])
+        self.assertIsNone(tip(1))
+        self.assertIsNone(tip(2))
+
+        # Too many tooltips
+        model = PyListModelTooltip(["foo", "bar"], ["footip", "bartip", "btip"])
+        self.assertEqual(data(0), "foo")
+        self.assertEqual(data(1), "bar")
+        self.assertIsNone(data(2))
+        self.assertEqual(tip(1), "bartip")
+        self.assertEqual(tip(2), "btip")
+
+    def test_tooltip_arg(self):
+        def tip(i):
+            return model.data(model.index(i, 0), Qt.ToolTipRole)
+
+        # Allow generators
+        s = dict(a="ta", b="tb")
+        model = PyListModelTooltip(s, s.values())
+        self.assertEqual(tip(0), "ta")
+        self.assertEqual(tip(1), "tb")
+
+        # Basically backward compatibility; this behaviour diverges from
+        # behaviour of data role
+        s = []
+        model = PyListModelTooltip(["foo"], s)
+        self.assertIsNone(tip(0))
+
+        s += ["footip"]
+        self.assertEqual(tip(1), "footip")
+
+
 if __name__ == "__main__":
     unittest.main()