Skip to content

Fix triage tool due to Qt bump to 5.12 #26384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Fix triage tool due to Qt bump to 5.12 #26384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions tools/triage_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import sys

from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets
from matplotlib.backends.qt_compat import _enum, _exec
from matplotlib.backends.qt_compat import _exec


# matplotlib stores the baseline images under two separate subtrees,
Expand Down Expand Up @@ -62,13 +62,13 @@ def __init__(self, parent, index, name):
layout = QtWidgets.QVBoxLayout()

label = QtWidgets.QLabel(name)
label.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
_enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
label.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter |
QtCore.Qt.AlignmentFlag.AlignVCenter)
layout.addWidget(label, 0)

self.image = QtWidgets.QLabel()
self.image.setAlignment(_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
_enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
self.image.setAlignment(QtCore.Qt.AlignmentFlag.AlignHCenter |
QtCore.Qt.AlignmentFlag.AlignVCenter)
self.image.setMinimumSize(800 // 3, 600 // 3)
layout.addWidget(self.image)
self.setLayout(layout)
Expand All @@ -86,7 +86,7 @@ def __init__(self, window):
self.window = window

def eventFilter(self, receiver, event):
if event.type() == _enum('QtCore.QEvent.Type').KeyPress:
if event.type() == QtCore.QEvent.Type.KeyPress:
self.window.keyPressEvent(event)
return True
else:
Expand Down Expand Up @@ -127,8 +127,8 @@ def __init__(self, entries):
images_box = QtWidgets.QWidget()
self.image_display = QtWidgets.QLabel()
self.image_display.setAlignment(
_enum('QtCore.Qt.AlignmentFlag').AlignHCenter |
_enum('QtCore.Qt.AlignmentFlag').AlignVCenter)
QtCore.Qt.AlignmentFlag.AlignHCenter |
QtCore.Qt.AlignmentFlag.AlignVCenter)
self.image_display.setMinimumSize(800, 600)
images_layout.addWidget(self.image_display, 6)
images_box.setLayout(images_layout)
Expand Down Expand Up @@ -167,8 +167,8 @@ def set_entry(self, index):
pixmap = QtGui.QPixmap(os.fspath(fname))
scaled_pixmap = pixmap.scaled(
thumbnail.size(),
_enum('QtCore.Qt.AspectRatioMode').KeepAspectRatio,
_enum('QtCore.Qt.TransformationMode').SmoothTransformation)
QtCore.Qt.AspectRatioMode.KeepAspectRatio,
QtCore.Qt.TransformationMode.SmoothTransformation)
thumbnail.image.setPixmap(scaled_pixmap)
self.pixmaps.append(scaled_pixmap)

Expand All @@ -177,14 +177,14 @@ def set_entry(self, index):

def set_large_image(self, index):
self.thumbnails[self.current_thumbnail].setFrameShape(
_enum('QtWidgets.QFrame.Shape').NoFrame)
QtWidgets.QFrame.Shape.NoFrame)
self.current_thumbnail = index
pixmap = QtGui.QPixmap(os.fspath(
self.entries[self.current_entry]
.thumbnails[self.current_thumbnail]))
self.image_display.setPixmap(pixmap)
self.thumbnails[self.current_thumbnail].setFrameShape(
_enum('QtWidgets.QFrame.Shape').Box)
QtWidgets.QFrame.Shape.Box)

def accept_test(self):
entry = self.entries[self.current_entry]
Expand All @@ -209,17 +209,17 @@ def reject_test(self):
self.set_entry(min((self.current_entry + 1), len(self.entries) - 1))

def keyPressEvent(self, e):
if e.key() == _enum('QtCore.Qt.Key').Key_Left:
if e.key() == QtCore.Qt.Key.Key_Left:
self.set_large_image((self.current_thumbnail - 1) % 3)
elif e.key() == _enum('QtCore.Qt.Key').Key_Right:
elif e.key() == QtCore.Qt.Key.Key_Right:
self.set_large_image((self.current_thumbnail + 1) % 3)
elif e.key() == _enum('QtCore.Qt.Key').Key_Up:
elif e.key() == QtCore.Qt.Key.Key_Up:
self.set_entry(max(self.current_entry - 1, 0))
elif e.key() == _enum('QtCore.Qt.Key').Key_Down:
elif e.key() == QtCore.Qt.Key.Key_Down:
self.set_entry(min(self.current_entry + 1, len(self.entries) - 1))
elif e.key() == _enum('QtCore.Qt.Key').Key_A:
elif e.key() == QtCore.Qt.Key.Key_A:
self.accept_test()
elif e.key() == _enum('QtCore.Qt.Key').Key_R:
elif e.key() == QtCore.Qt.Key.Key_R:
self.reject_test()
else:
super().keyPressEvent(e)
Expand Down