Small cleanups around TexManager usage. #22547
Merged
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
Mostly take advantage of the fact that TexManager() now always returns the same instance, so get_texmanager isn't really needed anymore. Still keep RendererBase.get_texmanager as backcompat for now as inheriting renderers (e.g. mplcairo) may be using that to also support older versions where there was no singleton logic); OTOH probably(?) no one is inheriting from TextToPath (which is mostly the text_to_path singleton) so we can deprecate *its* get_texmanager.
oscargus
reviewed
Feb 24, 2022
| @@ -605,13 +606,12 @@ def get_text_width_height_descent(self, s, prop, ismath): | |||
| to the baseline), in display coords, of the string *s* with | |||
| `.FontProperties` *prop*. | |||
| """ | |||
| fontsize = prop.get_size_in_points() | |||
There was a problem hiding this comment.
I guess this was defined multiple times as the second return does not depend on it. But with the very simple function, it should not be a factor.
The similar change in textpath has no potential drawback at all though.
Edit: deleted confused follow-up... Hard to remember the difference between a PR and what I get if I search my local copy...
There was a problem hiding this comment.
both returns depend on fontsize?
There was a problem hiding this comment.
Not this:
if ismath:
dims = self._text2path.mathtext_parser.parse(s, dpi, prop)
return dims[0:3] # return width, height, descent
but no big deal.
oscargus
approved these changes
Feb 24, 2022
timhoffm
approved these changes
Mar 6, 2022
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.
Mostly take advantage of the fact that TexManager() now always returns
the same instance, so get_texmanager isn't really needed anymore. Still
keep RendererBase.get_texmanager as backcompat for now as inheriting
renderers (e.g. mplcairo) may be using that to also support older
versions where there was no singleton logic); OTOH probably(?) no one is
inheriting from TextToPath (which is mostly the text_to_path singleton)
so we can deprecate its get_texmanager.
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).