FigureCanvasCairo can init RendererCairo; kill RendererCairo subclasses. #21981
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
ae1ceeb to
f107fae
Compare
tacaswell
reviewed
Dec 16, 2021
| @@ -463,11 +475,10 @@ def print_rgba(self, fobj): | |||
|
|
|||
| def _get_printed_image_surface(self): | |||
| width, height = self.get_width_height() | |||
| renderer = RendererCairo(self.figure.dpi) | |||
There was a problem hiding this comment.
This used to make a new renderer, now it gets the cached one. Why should we not be worried about this?
There was a problem hiding this comment.
I realized that I forgot to update self._renderer.dpi (now fixed), but the point is that other than the dpi, the width/height, and the surface, there's no other state on the renderer (the graphicscontext is reset between draws), and all of these always get reset manually before each draw.
f107fae to
19f4dbb
Compare
Initialization of RendererCairo is duplicated across all
FigureCanvasCairo subclasses (and also in FigureCanvasCairo itself),
so just move it to a single place (in a delayed-init property to avoid
having to play around multiple inheritance and GUI frameworks).
RendererCairoGTK{3,4} simply add a set_context method, which can just as
well be defined on the base RendererCairo class (which after all already
defines set_ctx_from_surface for the benefit of {qt,tk,wx}cairo).
19f4dbb to
de1a72f
Compare
tacaswell
approved these changes
Dec 17, 2021
timhoffm
approved these changes
Dec 18, 2021
6 tasks
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.
Initialization of RendererCairo is duplicated across all
FigureCanvasCairo subclasses (and also in FigureCanvasCairo itself),
so just move it to a single place (in a delayed-init property to avoid
having to play around multiple inheritance and GUI frameworks).
RendererCairoGTK{3,4} simply add a set_context method, which can just as
well be defined on the base RendererCairo class (which after all already
defines set_ctx_from_surface for the benefit of {qt,tk,wx}cairo).
PR Summary
PR Checklist
Tests and Styling
pytestpasses).flake8-docstringsand runflake8 --docstring-convention=all).Documentation
doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).