Merge pull request #4365 from ales-erjavec/graphics-text-list

[FIX] Fix slow clear/delete in 'Heat Map' 'Hier. Clustering', 'Distance Map'

Author: thocevar

Orange/widgets/unsupervised/owdistancemap.py

@@ -5,11 +5,12 @@
 import numpy
 
 from AnyQt.QtWidgets import (
-    QFormLayout, QGraphicsRectItem, QGraphicsGridLayout, QApplication
+    QFormLayout, QGraphicsRectItem, QGraphicsGridLayout, QApplication,
+    QSizePolicy
 )
 from AnyQt.QtGui import (
     QFontMetrics, QPen, QIcon, QPixmap, QLinearGradient, QPainter, QColor,
-    QBrush, QTransform
+    QBrush, QTransform, QFont
 )
 from AnyQt.QtCore import Qt, QRect, QRectF, QSize, QPointF
 from AnyQt.QtCore import pyqtSignal as Signal
@@ -25,10 +26,12 @@
 from Orange.widgets.utils import itemmodels, colorbrewer
 from Orange.widgets.utils.annotated_data import (create_annotated_table,
                                                  ANNOTATED_DATA_SIGNAL_NAME)
+from Orange.widgets.utils.graphicstextlist import TextListWidget
 from Orange.widgets.utils.widgetpreview import WidgetPreview
 from Orange.widgets.widget import Input, Output
 from Orange.widgets.unsupervised.owhierarchicalclustering import (
-    DendrogramWidget, GraphicsSimpleTextList)
+    DendrogramWidget
+)
 
 def _remove_item(item):
     item.setParentItem(None)
@@ -379,10 +382,14 @@ def __init__(self):
         self.grid.addItem(self.top_dendrogram, 0, 1)
 
         self.right_labels = TextList(
-            alignment=Qt.AlignLeft)
-
+            alignment=Qt.AlignLeft | Qt.AlignVCenter,
+            sizePolicy=QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
+        )
         self.bottom_labels = TextList(
-            orientation=Qt.Horizontal, alignment=Qt.AlignRight)
+            orientation=Qt.Horizontal,
+            alignment=Qt.AlignRight | Qt.AlignVCenter,
+            sizePolicy=QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        )
 
         self.grid.addItem(self.right_labels, 1, 2)
         self.grid.addItem(self.bottom_labels, 2, 1)
@@ -606,7 +613,7 @@ def _set_labels(self, labels):
             labels = [labels[i] for i in sortind]
 
         for textlist in [self.right_labels, self.bottom_labels]:
-            textlist.set_labels(labels or [])
+            textlist.setItems(labels or [])
             textlist.setVisible(bool(labels))
 
         constraint = -1 if labels else 0
@@ -678,18 +685,18 @@ def send_report(self):
             self.report_plot()
 
 
-class TextList(GraphicsSimpleTextList):
+class TextList(TextListWidget):
     def resizeEvent(self, event):
         super().resizeEvent(event)
         self._updateFontSize()
 
     def _updateFontSize(self):
         crect = self.contentsRect()
-        if self.orientation == Qt.Vertical:
+        if self.orientation() == Qt.Vertical:
             h = crect.height()
         else:
             h = crect.width()
-        n = len(getattr(self, "label_items", []))
+        n = self.count()
         if n == 0:
             return
 
@@ -698,15 +705,12 @@ def _updateFontSize(self):
         else:
             maxfontsize = QApplication.instance().font().pointSize()
 
-        lineheight = max(1, h / n)
+        lineheight = max(1., h / n)
         fontsize = min(self._point_size(lineheight), maxfontsize)
 
-        font = self.font()
-        font.setPointSize(fontsize)
-
-        self.setFont(font)
-        self.layout().invalidate()
-        self.layout().activate()
+        font_ = QFont()
+        font_.setPointSize(fontsize)
+        self.setFont(font_)
 
     def _point_size(self, height):
         font = self.font()
@@ -717,7 +721,6 @@ def _point_size(self, height):
             font.setPointSize(height - fix)
         return height - fix
 
-
 ##########################
 # Color palette management
 ##########################

Orange/widgets/unsupervised/owhierarchicalclustering.py

@@ -10,7 +10,7 @@
 import numpy as np
 
 from AnyQt.QtWidgets import (
-    QGraphicsWidget, QGraphicsObject, QGraphicsLinearLayout, QGraphicsPathItem,
+    QGraphicsWidget, QGraphicsObject, QGraphicsPathItem,
     QGraphicsScene, QGridLayout, QSizePolicy,
     QGraphicsSimpleTextItem, QGraphicsLayoutItem, QAction, QComboBox,
     QGraphicsItemGroup, QGraphicsGridLayout, QGraphicsSceneMouseEvent
@@ -41,6 +41,7 @@
 from Orange.widgets.widget import Input, Output, Msg
 
 from Orange.widgets.utils.stickygraphicsview import StickyGraphicsView
+from Orange.widgets.utils.graphicstextlist import TextListWidget
 
 __all__ = ["OWHierarchicalClustering"]
 
@@ -287,6 +288,8 @@ def __init__(self, parent=None, root=None, orientation=Left,
                  **kwargs):
 
         super().__init__(None, **kwargs)
+        # Filter all events from children (`ClusterGraphicsItem`s)
+        self.setFiltersChildEvents(True)
         self.orientation = orientation
         self._root = None
         #: A tree with dendrogram geometry
@@ -311,12 +314,6 @@ def __init__(self, parent=None, root=None, orientation=Left,
             self.setParentItem(parent)
 
     def clear(self):
-        # Remove event filter from all items before removal.
-        # Each removeItem is linear in number of installed filters in the whole
-        # scene -> so this would be quadratic for us (not accounting any other
-        # filters not part of DendrogramWidget).
-        for item in self._items.values():
-            item.removeSceneEventFilter(self)
         scene = self.scene()
         if scene is not None:
             scene.removeItem(self._itemgroup)
@@ -354,7 +351,6 @@ def set_root(self, root):
                 item.setAcceptHoverEvents(True)
                 item.setPen(pen)
                 item.node = node
-                item.installSceneEventFilter(self)
                 for branch in node.branches:
                     assert branch in self._items
                     self._cluster_parent[branch] = node
@@ -1062,11 +1058,10 @@ def axis_view(orientation):
         self.dendrogram.selectionChanged.connect(self._invalidate_output)
         self.dendrogram.selectionEdited.connect(self._selection_edited)
 
-        self.labels = GraphicsSimpleTextList()
+        self.labels = TextListWidget()
         self.labels.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
         self.labels.setAlignment(Qt.AlignLeft)
         self.labels.setMaximumWidth(200)
-        self.labels.layout().setSpacing(0)
 
         scenelayout.addItem(self.top_axis, 0, 0,
                             alignment=Qt.AlignLeft | Qt.AlignVCenter)
@@ -1156,8 +1151,8 @@ def _set_items(self, items, axis=1):
                 else self.annotation_if_enumerate
 
     def _clear_plot(self):
-        self.labels.set_labels([])
         self.dendrogram.set_root(None)
+        self.labels.setItems([])
 
     def _set_displayed_root(self, root):
         self._clear_plot()
@@ -1223,7 +1218,7 @@ def _update_labels(self):
                 labels = [", ".join(labels[leaf.value.first: leaf.value.last])
                           for leaf in joined]
 
-        self.labels.set_labels(labels)
+        self.labels.setItems(labels)
         self.labels.setMinimumWidth(1 if labels else -1)
 
     def _restore_selection(self, state):
@@ -1614,83 +1609,6 @@ def qfont_scaled(font, factor):
     return scaled
 
 
-class GraphicsSimpleTextList(QGraphicsWidget):
-    """A simple text list widget."""
-
-    def __init__(self, labels=[], orientation=Qt.Vertical,
-                 alignment=Qt.AlignCenter, parent=None):
-        QGraphicsWidget.__init__(self, parent)
-        layout = QGraphicsLinearLayout(orientation)
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setSpacing(0)
-        self.setLayout(layout)
-        self.orientation = orientation
-        self.alignment = alignment
-        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        self.label_items = []
-        self.set_labels(labels)
-
-    def clear(self):
-        """Remove all text items."""
-        layout = self.layout()
-        for i in reversed(range(layout.count())):
-            witem = layout.itemAt(i)
-            witem.item.setParentItem(None)
-            if self.scene():
-                self.scene().removeItem(witem.item)
-            layout.removeAt(i)
-
-        self.label_items = []
-        self.updateGeometry()
-
-    def set_labels(self, labels):
-        """Set the text labels."""
-        self.clear()
-        orientation = Qt.Horizontal if self.orientation == Qt.Vertical else Qt.Vertical
-        for text in labels:
-            item = QGraphicsSimpleTextItem(text, self)
-            item.setFont(self.font())
-            item.setToolTip(text)
-            witem = WrapperLayoutItem(item, orientation, parent=self)
-            self.layout().addItem(witem)
-            self.layout().setAlignment(witem, self.alignment)
-            self.label_items.append(item)
-
-        self.layout().activate()
-        self.updateGeometry()
-
-    def setAlignment(self, alignment):
-        """Set alignment of text items in the widget
-        """
-        self.alignment = alignment
-        layout = self.layout()
-        for i in range(layout.count()):
-            layout.setAlignment(layout.itemAt(i), alignment)
-
-    def setVisible(self, visible):
-        QGraphicsWidget.setVisible(self, visible)
-        self.updateGeometry()
-
-    def changeEvent(self, event):
-        if event.type() == QEvent.FontChange:
-            self.__update_font()
-        return super().changeEvent(event)
-
-    def __iter__(self):
-        return iter(self.label_items)
-
-    def __update_font(self):
-        for item in self.label_items:
-            item.setFont(self.font())
-
-        layout = self.layout()
-        for i in range(layout.count()):
-            layout.itemAt(i).updateGeometry()
-
-        self.layout().invalidate()
-        self.updateGeometry()
-
-
 class WrapperLayoutItem(QGraphicsLayoutItem):
     """A Graphics layout item wrapping a QGraphicsItem allowing it
     to be managed by a layout.