Fix compatibility with Matplotlib 3.7 and Qt6. #62
Conversation
This file contains hidden or 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
Collaborator
anntzer
commented
Apr 15, 2023
anntzer
commented
- enum scoping change.
- exec vs. exec_.
- Matplotlib no longer exports _getSaveFileName (only PyQt4 required a separate _getSaveFileName because it called that function getSaveFileNameAndFilter instead; let's not try to support qt4 anymore). Also, PyQt and PySide use different parameter names for this function; pass parameters positionally instead.
- addAction parameter order changed between qt5 and qt6, but we can call it in a way that's compatible with everyone by using setShortcut instead.
- QAction moved between qt5 and qt6 but we don't need to explicitly instantiate it; we can use addAction instead to do so.
- enum scoping change. - exec vs. exec_. - Matplotlib no longer exports _getSaveFileName (only PyQt4 required a separate _getSaveFileName because it called that function getSaveFileNameAndFilter instead; let's not try to support qt4 anymore). Also, PyQt and PySide use different parameter names for this function; pass parameters positionally instead. - addAction parameter order changed between qt5 and qt6, but we can call it in a way that's compatible with everyone by using setShortcut instead. - QAction moved between qt5 and qt6 but we don't need to explicitly instantiate it; we can use addAction instead to do so.
|
I'd like to work on getting this merged in the next couple of weeks and hopefully do a release with qt6 and mpl3.7 support by the end of that period. |
mfisher87
reviewed
Jun 11, 2023
| @@ -1050,7 +1053,7 @@ def main(argv): | |||
| import signal | |||
| signal.signal(signal.SIGINT, signal.SIG_DFL) | |||
|
|
|||
| app.exec_() | |||
| (getattr(app, "exec", None) or getattr(app, "exec_"))() | |||
There was a problem hiding this comment.
I think we can just app.exec() because we're dropping support for Qt4. What do you think?
mfisher87
added a commit
to mfisher87/viscm
that referenced
this pull request
Jun 11, 2023
Re-integrating changes from <matplotlib#62> Thank you, @anntzer!
This was referenced Jun 12, 2023
Closed
|
This change is integrated in to #75 . Thank you! |
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.