Merge pull request #1405 from janezd/listview-models

gui: Add listView

Author: astaric

Orange/widgets/gui.py

@@ -12,9 +12,9 @@
 import pkg_resources
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import Qt, pyqtSignal as Signal
+from PyQt4.QtCore import Qt, pyqtSignal as Signal, QSize
 from PyQt4.QtGui import QCursor, QApplication, QTableView, QHeaderView, \
-    QStyledItemDelegate, QSizePolicy, QColor
+    QStyledItemDelegate, QSizePolicy, QColor, QListView
 
 # Some Orange widgets might expect this here
 from Orange.widgets.webview import WebView as WebviewWidget  # pylint: disable=unused-import
@@ -1198,6 +1198,35 @@ def attributeItem(var):
     return attributeIconDict[var], var.name
 
 
+class ListViewWithSizeHint(QListView):
+    def __init__(self, *args, preferred_size=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if isinstance(preferred_size, tuple):
+            preferred_size = QSize(*preferred_size)
+        self.preferred_size = preferred_size
+
+    def sizeHint(self):
+        return self.preferred_size or super().sizeHint()
+
+
+def listView(widget, master, value=None, model=None, box=None, callback=None,
+             sizeHint=None, **misc):
+    if box:
+        bg = vBox(widget, box, addToLayout=False)
+    else:
+        bg = widget
+    view = ListViewWithSizeHint(preferred_size=sizeHint)
+    view.setModel(model)
+    if value is not None:
+        connectControl(master, value, callback,
+                       view.selectionModel().selectionChanged,
+                       CallFrontListView(view),
+                       CallBackListView(model, master, value))
+    misc.setdefault('addSpace', True)
+    miscellanea(view, bg, widget, **misc)
+    return view
+
+
 def listBox(widget, master, value=None, labels=None, box=None, callback=None,
             selectionMode=QtGui.QListWidget.SingleSelection,
             enableDragDrop=False, dragDropCallback=None,
@@ -2443,6 +2472,23 @@ def __call__(self, *value):
                 self.func(**kwds)
 
 
+class CallBackListView(ControlledCallback):
+    def __init__(self, model, widget, attribute):
+        super().__init__(widget, attribute)
+        self.model = model
+
+    # triggered by selectionModel().selectionChanged()
+    def __call__(self, newSelection, _):
+        # This must be imported locally to avoid circular imports
+        from Orange.widgets.utils.itemmodels import PyListModel
+        indexes = newSelection.indexes()
+        if indexes:
+            value = newSelection.indexes()[0].row()
+            if isinstance(self.model, PyListModel):
+                value = self.model[value]
+            self.acyclic_setattr(value)
+
+
 class CallBackListBox:
     def __init__(self, control, widget):
         self.control = control
@@ -2607,6 +2653,25 @@ def action(self, value):
         self.control.buttons[value].setChecked(1)
 
 
+class CallFrontListView(ControlledCallFront):
+    def action(self, value):
+        model = self.control.model()
+        if not isinstance(value, int):
+            if isinstance(value, str):
+                search_role = Qt.DisplayRole
+            elif isinstance(value, Variable):
+                search_role = TableVariable
+            else:
+                search_role = Qt.DisplayRole
+                value = str(value)
+            for i in range(model.rowCount()):
+                if model.data(model.index(i), search_role) == value:
+                    value = i
+                    break
+        sel_model = self.control.selectionModel()
+        sel_model.select(model.index(value), sel_model.ClearAndSelect)
+
+
 class CallFrontListBox(ControlledCallFront):
     def action(self, value):
         if value is not None:

Orange/widgets/settings.py

@@ -916,12 +916,11 @@ def filter_value(self, setting, data, domain, attrs, metas):
                 del data[setting.name]
 
     def settings_to_widget(self, widget, domain, *args):
-        super().settings_to_widget(widget, domain, *args)
-
         context = widget.current_context
         if context is None:
             return
 
+        widget.retrieveSpecificSettings()
         excluded = set()
 
         for setting, data, instance in \
@@ -930,6 +929,9 @@ def settings_to_widget(self, widget, domain, *args):
                 continue
 
             value = self.decode_setting(setting, data[setting.name], domain)
+            setattr(instance, setting.name, value)
+            if hasattr(setting, "selected") and setting.selected in data:
+                setattr(instance, setting.selected, data[setting.selected])
 
             if isinstance(value, list):
                 excluded |= set(value)

Orange/widgets/tests/test_gui.py

@@ -1,9 +1,11 @@
+from Orange.data import ContinuousVariable
 from Orange.widgets import gui
 from Orange.widgets.tests.base import GuiTest
+from Orange.widgets.utils.itemmodels import VariableListModel
 from Orange.widgets.widget import OWWidget
 
 
-class OWTestDoubleSpin(GuiTest):
+class TestDoubleSpin(GuiTest):
     some_param = 0
     some_option = False
 
@@ -13,3 +15,23 @@ def test_checked_extension(self):
         widget = OWWidget()
         gui.doubleSpin(widget=widget, master=self, value="some_param",
                        minv=1, maxv=10, checked="some_option")
+
+
+class TestListModel(GuiTest):
+    def test_select(self):
+        widget = OWWidget()
+        widget.foo = None
+        self.attrs = VariableListModel()
+        view = gui.listView(widget.controlArea, widget, "foo", model=self.attrs)
+        self.assertIsNone(widget.foo)
+        a, b, c = (ContinuousVariable(x) for x in "abc")
+        self.attrs[:] = [a, b, c]
+        view.setCurrentIndex(self.attrs.index(0, 0))
+        self.assertIs(widget.foo, a)
+        view.setCurrentIndex(self.attrs.index(2, 0))
+        self.assertIs(widget.foo, c)
+
+        widget.foo = b
+        selection = view.selectedIndexes()
+        self.assertEqual(len(selection), 1)
+        self.assertEqual(selection[0].row(), 1)

Orange/widgets/utils/itemmodels.py

@@ -586,12 +586,13 @@ def data(self, index, role=Qt.DisplayRole):
 
 
 class VariableListModel(PyListModel):
-
     MIME_TYPE = "application/x-Orange-VariableList"
 
     def data(self, index, role=Qt.DisplayRole):
         if self._is_index_valid_for(index, self):
             var = self[index.row()]
+            if var is None and role == Qt.DisplayRole:
+                return "None"
             if not isinstance(var, Variable):
                 return super().data(index, role)
             elif role == Qt.DisplayRole:
@@ -600,6 +601,8 @@ def data(self, index, role=Qt.DisplayRole):
                 return gui.attributeIconDict[var]
             elif role == Qt.ToolTipRole:
                 return self.variable_tooltip(var)
+            elif role == gui.TableVariable:
+                return var
             else:
                 return PyListModel.data(self, index, role)