Fix: tuple linetypes work as documented. #353
Merged
Conversation
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
TyberiusPrime
force-pushed
the
bug_352
branch
from
d4f72cb
to
3dcc949
Compare
has2k1
reviewed
Feb 3, 2020
plotnine/guides/guide_legend.py
Outdated
| key = pd.DataFrame({ | ||
| aesthetic: scale.map(breaks), | ||
| aesthetic: mapped, |
There was a problem hiding this comment.
This change can be omitted. See below.
plotnine/scales/scale.py
Outdated
| # Otherwise it uses the first entry of each tuple | ||
| # and throws away the rest | ||
| mapped = [tuple(x) for x in mapped] | ||
| df[ae] = mapped |
There was a problem hiding this comment.
I think we can limit the change to the specific code path for manual linetypes. That is in scale_linetype_manual.map
def map(...):
result = super().map(...)
# ...
if len(result) and hasattr(result[0], '__hash__'):
result = [tuple(x) for x in result]
return resultThis way there is no need to make changes to guide_legend.
There was a problem hiding this comment.
Sure. It's marginally more complicated since we still want to support mixed string/tuple linetype definitions, but it's done.
TyberiusPrime
force-pushed
the
bug_352
branch
from
3dcc949
to
6d0b112
Compare
TyberiusPrime
force-pushed
the
bug_352
branch
from
6d0b112
to
1a3d653
Compare
|
Made the changes as requested. |
|
Thanks @TyberiusPrime. |
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.
This makes the line types work as documented with tuples.
Fixes #352 .