MNT: Add support to enums in both in PyQt5 and PySide6 #1145
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using the python Enum class is a first step required for later support of enum macros in PySide6, see https://doc.qt.io/qtforpython-6/PySide6/QtCore/QEnum.html. Also these python 'Enums' provide some minor benefits like easier iteration, and are already compatible with PyQt5 enums. Also remove our subclassing of enum classes, this isn't needed and not even allowed now that the enums are python 'Enums'. Also we switch from 'Q_ENUMS' -> 'Q_ENUM' since its a newer verison of the enum macro for PyQt5. We import 'Q_ENUM' directly from PyQt5 b/c its not provided by the qtpy abstraction layer. But this is fine since seems there is no nice enum abstraction that works for both PyQt5 and PySide6 anyway. The new enum macro for PySide6 will be added later, and which we use will be determined with conditional check of Qt wrapper.
nstelter-slac
changed the title
nstelter-slac
force-pushed
the
pyside2_macro_support
branch
5 times, most recently
from
3403788 to
b1e5262
Compare
This is messy but necessary since qtpy doesn't seem to provide an abstraction over enums that works with both pyqt and pyside.
nstelter-slac
force-pushed
the
pyside2_macro_support
branch
from
b1e5262 to
432e66e
Compare
YektaY
reviewed
Jan 8, 2025
| QT_WRAPPER = "" | ||
| if importlib.util.find_spec("PySide6"): | ||
| QT_WRAPPER = "pyside6" | ||
| elif importlib.util.find_spec("PyQt5"): |
There was a problem hiding this comment.
We are considering only supporting Pyside6 and PyQt5 right? we are not considering supporting PyQt6 as well?
There was a problem hiding this comment.
once pyside6 support is in, we could see how much diff there is between pyqt6 and pyside6. if its minimal (maybe the case since both are qt6), i think having support for pyqt6 could be nice.
| @@ -1,5 +1,6 @@ | |||
| from qtpy.QtWidgets import QActionGroup | |||
| from qtpy.QtCore import Signal, Slot, Property, QTimer, Q_ENUMS, QThread | |||
| from qtpy.QtCore import Signal, Slot, Property, QTimer, QThread | |||
| from PyQt5.QtCore import Q_ENUM | |||
There was a problem hiding this comment.
does this work for pyside6?
There was a problem hiding this comment.
Also would it make it so anyone using pyside6 have to also have PyQt5 installed as well?
There was a problem hiding this comment.
Wait I read your previous PR and see that a pyside6 enum will be added in the future
| from .display_format import DisplayFormat, parse_value_for_display | ||
| from pydm.utilities import is_pydm_app, is_qt_designer | ||
| from pydm import config | ||
| from pydm.widgets.base import only_if_channel_set | ||
| from PyQt5.QtCore import Q_ENUM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this should merge after: #1146