-
Notifications
You must be signed in to change notification settings - Fork 216
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Convert booleans arguments in build_arg_string, not in kwargs_to_strings #1125
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
06bee27
Do not convert booleans in the kwargs_to_strings decorator
seisman b7210ff
Deal with boolean values in build_arg_string
seisman 59a2b28
load_earth_relief no longer need the convert_bools=False hack
seisman a9d167d
Fix the weird codes in subplot autolabel
seisman aac61c2
Fix the weird codes in text
seisman bf38deb
Apply suggestions from code review
seisman 69aa4fb
Merge branch 'master' into fix-bools
seisman 2e4b60d
Refactor the build_arg_string function
seisman 2193053
Fix a broken test
seisman 11be35d
Remove an unnecessary blank line
seisman 8f1a53e
Merge branch 'master' into fix-bools
seisman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -177,13 +177,23 @@ def text_( | |||||||||||||||||
) | ||||||||||||||||||
): | ||||||||||||||||||
kwargs.update({"F": ""}) | ||||||||||||||||||
if angle is not None and isinstance(angle, (int, float, str)): | ||||||||||||||||||
|
||||||||||||||||||
if angle is True: | ||||||||||||||||||
kwargs["F"] += "+a" | ||||||||||||||||||
elif isinstance(angle, (int, float, str)): | ||||||||||||||||||
kwargs["F"] += f"+a{str(angle)}" | ||||||||||||||||||
if font is not None and isinstance(font, str): | ||||||||||||||||||
|
||||||||||||||||||
if font is True: | ||||||||||||||||||
kwargs["F"] += "+f" | ||||||||||||||||||
elif isinstance(font, str): | ||||||||||||||||||
kwargs["F"] += f"+f{font}" | ||||||||||||||||||
Comment on lines
+186
to
189
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
if justify is not None and isinstance(justify, str): | ||||||||||||||||||
|
||||||||||||||||||
if justify is True: | ||||||||||||||||||
kwargs["F"] += "+j" | ||||||||||||||||||
elif isinstance(justify, str): | ||||||||||||||||||
kwargs["F"] += f"+j{justify}" | ||||||||||||||||||
Comment on lines
+191
to
194
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||
if position is not None and isinstance(position, str): | ||||||||||||||||||
|
||||||||||||||||||
if isinstance(position, str): | ||||||||||||||||||
kwargs["F"] += f'+c{position}+t"{text}"' | ||||||||||||||||||
|
||||||||||||||||||
extra_arrays = [] | ||||||||||||||||||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just thinking ahead to resolve #483 (allowing list inputs to angle/list/justify), we could simply use
if angle
(returns True for list/int/float/str inputs) like so:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I was planing to work on #483, but I realized that the
Figure.text()
function needs more refactoring, so I opened PR #1121.Personally, I prefer to make the changes to
text.py
as small as possible, and will address #483 after #1121 is merged.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, as you wish then.