Skip to content

FigureCanvasCairo can init RendererCairo; kill RendererCairo subclasses.#21981

Merged
timhoffm merged 1 commit into
matplotlib:mainfrom
anntzer:renderercairo
Dec 18, 2021
Merged

FigureCanvasCairo can init RendererCairo; kill RendererCairo subclasses.#21981
timhoffm merged 1 commit into
matplotlib:mainfrom
anntzer:renderercairo

Conversation

@anntzer

@anntzer anntzer commented Dec 16, 2021

Copy link
Copy Markdown
Contributor

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

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (install flake8-docstrings and run flake8 --docstring-convention=all).

Documentation

  • New features are documented, with examples if plot related.
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).

@anntzer anntzer added this to the v3.6.0 milestone Dec 16, 2021

def _get_printed_image_surface(self):
width, height = self.get_width_height()
renderer = RendererCairo(self.figure.dpi)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This used to make a new renderer, now it gets the cached one. Why should we not be worried about this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

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).
@timhoffm timhoffm merged commit 25975d0 into matplotlib:main Dec 18, 2021
@anntzer anntzer deleted the renderercairo branch December 18, 2021 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants