Skip to content
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

Jump to bottom

Added PyQt6 support #5258

Merged
merged 2 commits into from Feb 11, 2021
Merged

Added PyQt6 support #5258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57d6e8c
Added PyQt6 support
radarhere Feb 10, 2021
98eaef5
Added release notes for PyQt6 [ci skip]
radarhere Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion Tests/test_imageqt.py
View file
Open in desktop
Expand Up @@ -14,7 +14,9 @@ def test_rgb():
# typedef QRgb
# An ARGB quadruplet on the format #AARRGGBB,
# equivalent to an unsigned int.
if ImageQt.qt_version == "side6":
if ImageQt.qt_version == "6":
from PyQt6.QtGui import qRgb
elif ImageQt.qt_version == "side6":
from PySide6.QtGui import qRgb
elif ImageQt.qt_version == "5":
from PyQt5.QtGui import qRgb
Expand Down
4 changes: 3 additions & 1 deletion Tests/test_qt_image_qapplication.py
View file
Open in desktop
Expand Up @@ -7,7 +7,9 @@
if ImageQt.qt_is_installed:
from PIL.ImageQt import QPixmap

if ImageQt.qt_version == "side6":
if ImageQt.qt_version == "6":
from PyQt6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
elif ImageQt.qt_version == "side6":
from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
elif ImageQt.qt_version == "5":
from PyQt5.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget
Expand Down
20 changes: 13 additions & 7 deletions src/PIL/ImageQt.py
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
from ._util import isPath

qt_versions = [
["6", "PyQt6"],
["side6", "PySide6"],
["5", "PyQt5"],
["side2", "PySide2"],
Expand All @@ -32,7 +33,10 @@
qt_versions.sort(key=lambda qt_version: qt_version[1] in sys.modules, reverse=True)
for qt_version, qt_module in qt_versions:
try:
if qt_module == "PySide6":
if qt_module == "PyQt6":
from PyQt6.QtCore import QBuffer, QIODevice
from PyQt6.QtGui import QImage, QPixmap, qRgba
elif qt_module == "PySide6":
from PySide6.QtCore import QBuffer, QIODevice
from PySide6.QtGui import QImage, QPixmap, qRgba
elif qt_module == "PyQt5":
Expand Down Expand Up @@ -63,7 +67,8 @@ def fromqimage(im):
(given either as Python string or a PyQt string object)
"""
buffer = QBuffer()
buffer.open(QIODevice.ReadWrite)
qt_openmode = QIODevice.OpenMode if qt_version == "6" else QIODevice
buffer.open(qt_openmode.ReadWrite)
# preserve alpha channel with png
# otherwise ppm is more friendly with Image.open
if im.hasAlphaChannel():
Expand Down Expand Up @@ -132,25 +137,26 @@ def _toqclass_helper(im):
if isPath(im):
im = Image.open(im)

qt_format = QImage.Format if qt_version == "6" else QImage
if im.mode == "1":
format = QImage.Format_Mono
format = qt_format.Format_Mono
elif im.mode == "L":
format = QImage.Format_Indexed8
format = qt_format.Format_Indexed8
colortable = []
for i in range(256):
colortable.append(rgb(i, i, i))
elif im.mode == "P":
format = QImage.Format_Indexed8
format = qt_format.Format_Indexed8
colortable = []
palette = im.getpalette()
for i in range(0, len(palette), 3):
colortable.append(rgb(*palette[i : i + 3]))
elif im.mode == "RGB":
data = im.tobytes("raw", "BGRX")
format = QImage.Format_RGB32
format = qt_format.Format_RGB32
elif im.mode == "RGBA":
data = im.tobytes("raw", "BGRA")
format = QImage.Format_ARGB32
format = qt_format.Format_ARGB32
else:
raise ValueError(f"unsupported image mode {repr(im.mode)}")

Expand Down