iframe-proxy

deep-jkl · 2021-08-26T19:17:34Z

PR Summary

Add user supplied transforms and join/cap styles …

Improvement was done in instantiating new instance utilizing deep copy should preserve immutability of MarkerStyle members (e.g. Path, or Transform). However deepcopy of MarkerStyle(r"$|||$") fails. Originally it was needed in lines.py, but I think it can be optimized out to avoid multiple re-instantiation of MarkerStyle.

I followed the discussion for issue #19195 and tried several cases:

from matplotlib import transforms
import matplotlib.pyplot as plt
import matplotlib.pyplot as plt
from matplotlib.lines import Line2D
from matplotlib.transforms import Affine2D
from matplotlib.markers import MarkerStyle, JoinStyle, CapStyle

text_style = dict(horizontalalignment='right', verticalalignment='center',
                  fontsize=12, fontfamily='monospace')
marker_style = dict(linestyle=':', color='0.8', markersize=10,
                    markerfacecolor="tab:blue", markeredgecolor="tab:blue")

def format_axes(ax):
    ax.margins(0.2)
    ax.set_axis_off()
    ax.invert_yaxis()

fig, ax = plt.subplots()
fig.suptitle('Marker fillstyle', fontsize=14)
fig.subplots_adjust(left=0.4)

marker_colors = dict(markersize=15,
                    markerfacecolor='tab:blue',
                    markerfacecoloralt='lightsteelblue',
                    markeredgecolor='brown')

for y, fill_style in enumerate(Line2D.fillStyles[1:-1]):
    ax.text(-0.5, y, repr(fill_style), **text_style)
    ax.plot([0,5],[y]*2, linestyle=":", color='darkgrey')
    for x, theta in enumerate([0, 10, 15, 20, 30, 45]):
        ax.plot(x, y, marker=MarkerStyle("o", fill_style, transform=Affine2D().rotate_deg(theta)), **marker_colors)
        ax.text(x, 4, f"{theta}°", **text_style)
format_axes(ax)

plt.show()

fig, ax = plt.subplots()
fig.suptitle('Marker CapStyle', fontsize=14)
fig.subplots_adjust(left=0.1)

marker_inner = dict(markersize=35,
                    markerfacecolor='tab:blue',
                    markerfacecoloralt='lightsteelblue',
                    markeredgecolor='brown',
                    markeredgewidth=8,
                    )

marker_outer = dict(markersize=35,
                    markerfacecolor='tab:blue',
                    markerfacecoloralt='lightsteelblue',
                    markeredgecolor='white',
                    markeredgewidth=1,
                    )

for y, cap_style in enumerate(CapStyle):
    ax.text(-0.5, y, cap_style.name, **text_style)
    ax.plot([0,5],[y]*2, linestyle=":", color='darkgrey')
    for x, theta in enumerate([0, 10, 15, 20, 30, 45]):
        ax.plot(x, y, marker=MarkerStyle("1", transform=Affine2D().rotate_deg(theta), capstyle=cap_style), **marker_inner)
        ax.plot(x, y, marker=MarkerStyle("1", transform=Affine2D().rotate_deg(theta), capstyle=cap_style), **marker_outer)
        ax.text(x, 3, f"{theta}°", **text_style)
format_axes(ax)

plt.show()

fig, ax = plt.subplots()
fig.suptitle('Marker JoinStyle', fontsize=14)
fig.subplots_adjust(left=0.1)

marker_colors = dict(markersize=35,
                    markerfacecolor='tab:blue',
                    markerfacecoloralt='lightsteelblue',
                    markeredgecolor='brown',
                    markeredgewidth=8)

for y, join_style in enumerate(JoinStyle):
    ax.text(-0.5, y, join_style.name, **text_style)
    ax.plot([0,5],[y]*2, linestyle=":", color='darkgrey')
    for x, theta in enumerate([0, 10, 15, 20, 30, 45]):
        ax.plot(x, y, marker=MarkerStyle("*", transform=Affine2D().rotate_deg(theta), joinstyle=join_style), **marker_colors)
        ax.text(x, 3, f"{theta}°", **text_style)
format_axes(ax)

plt.show()

list1 = [0, 1] #| x coordinates
list2 = [0, 0] #| y coordinates

p1 = [.5, 0] #| p1 stands for point1, the marker will be placed in this point
marker1 = MarkerStyle(r'$|||$', transform=Affine2D().rotate_deg(45))

plt.plot(list1, list2, 'o-k', linewidth = 1)
plt.plot(p1[0], p1[1], 'k', marker = marker1)

#T# show the results
plt.show()

Things that needs to be done:

Add modifiers such as (rotated -> returns new rotated instance, and other primitive transformations)
Add tests
Improve documentation

PR Checklist

Has pytest style unit tests (and pytest passes).
Is Flake 8 compliant (run flake8 on changed files to check).
New features are documented, with examples if plot related.
Documentation is sphinx and numpydoc compliant (the docs should build without error).
Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
[ N/A ] API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

dstansby

I think this looks 👍 overall. I've left some comments and questions.

jklymak · 2021-09-21T11:43:50Z

Improvement was done in instantiating new instance utilizing deep copy should preserve immutability of MarkerStyle members (e.g. Path, or Transform).

Added, translated, scaled, and rotated methods with test.

@timhoffm

Apply suggestion from @timhoffm, update lib/matplotlib/markers.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>

jklymak

This is looking good to me. I made a bunch of suggestions, mostly to do w/ the doc strings...

@jklymak

Apply suggestions from @jklymak code review Co-authored-by: Jody Klymak <jklymak@gmail.com>

Apply suggestions from code review Co-authored-by: Jody Klymak <jklymak@gmail.com>

deep-jkl · 2021-09-28T12:36:14Z

Check for user style in get_cap(join)style is removed. This is also supported with two new tests. Additional test checks that get_transform returns combination of supplied and internal transformation.

jklymak

This looks good to me, and is an oft-requested feature that I think will make a lot of people happy!

19195 rotated markers

When these Enum classes were added in matplotlib#18544, they were supposed to be for documentation only. To that end, matplotlib#22055 was a followup that ensured that only the strings were exposed from the getter side. However, when user-supplied cap/join style were added in matplotlib#20914, they were only for the Enum type instead of the string, so correctly allow strings here as well. Also, specifically type hint the return values as literals, as was done in matplotlib#25719.

QuLogic added New feature status: needs documentation status: needs tests labels Aug 27, 2021

timhoffm reviewed Sep 13, 2021

View reviewed changes

Comment thread lib/matplotlib/markers.py Outdated

deep-jkl marked this pull request as ready for review September 13, 2021 08:30

deep-jkl mentioned this pull request Sep 14, 2021

Rotate errorbar caps in polar plots #21006

Closed

7 tasks

dstansby reviewed Sep 14, 2021

View reviewed changes

Comment thread lib/matplotlib/markers.py Outdated

Comment thread lib/matplotlib/markers.py Outdated

Comment thread lib/matplotlib/markers.py

Comment thread lib/matplotlib/markers.py Outdated

Comment thread lib/matplotlib/markers.py Outdated

deep-jkl force-pushed the 19195-rotated-markers branch 2 times, most recently from 1a6f754 to 1aef5fa Compare September 16, 2021 19:03

jklymak added status: needs rebase and removed status: needs tests status: needs documentation labels Sep 21, 2021

deep-jkl force-pushed the 19195-rotated-markers branch from 1aef5fa to 75a92d8 Compare September 21, 2021 19:37

deep-jkl and others added 16 commits September 21, 2021 23:36

Add user supplied transforms and join/cap styles

e487b1c

Improvement was done in instantiating new instance utilizing deep copy should preserve immutability of MarkerStyle members (e.g. Path, or Transform).

Avoid reinstanting MarkerStyle in lines.py

37859ea

Update dosctring.

8153632

Add marker.transformed + test

4469006

Add affine transform primitives to markers

4ea2b91

Added, translated, scaled, and rotated methods with test.

Tweaking docstrings in MarkerStyle.

7f6d1be

Update MarkerStyle module documentation

2729fe4

Update marker Reference documentation

4357995

Add whats new for MarkerStyle features

b1bbdff

Add new example with advanced MarkerStyle mapping

9ac3ad2

Fix errors discovered by CI

4180843

Fix typo in markers api documentation.

905eba4

Apply suggestion from @timhoffm, update lib/matplotlib/markers.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>

Improve test for invalid rotated inputs

3fc6140

Add tests for MarkerStyle scaled and translated

04a3e70

Add function for optimized None+transform

af6b89a

Remove ambiguous translated primitive for MarkerStyle

c01e8f1

jklymak added status: needs review topic: markers labels Sep 24, 2021

jklymak reviewed Sep 24, 2021

View reviewed changes

deep-jkl and others added 3 commits September 28, 2021 09:26

Update docstrings according to jklymak

e4f8456

Apply suggestions from @jklymak code review Co-authored-by: Jody Klymak <jklymak@gmail.com>

Make MarkerStyle.rotated more concise

5aa5bbd

Apply suggestions from code review Co-authored-by: Jody Klymak <jklymak@gmail.com>

Refactor code, linting.

214ea3f

jklymak added this to the v3.6.0 milestone Sep 28, 2021

dstansby reviewed Sep 28, 2021

View reviewed changes

Comment thread lib/matplotlib/markers.py

Comment thread lib/matplotlib/markers.py

Comment thread lib/matplotlib/tests/test_marker.py

Rework get_cap(join)style, add tests

7101e3c

Check for user style in get_cap(join)style is removed. This is also supported with two new tests. Additional test checks that get_transform returns combination of supplied and internal transformation.

jklymak approved these changes Oct 5, 2021

View reviewed changes

dstansby approved these changes Oct 5, 2021

View reviewed changes

dstansby merged commit fcfea77 into matplotlib:master Oct 5, 2021

tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Oct 12, 2021

Merge pull request matplotlib#20914 from deep-jkl/19195-rotated-markers

e891345

19195 rotated markers

QuLogic removed the status: needs review label Oct 13, 2021

deep-jkl mentioned this pull request Oct 18, 2021

Enable tests for text path based markers #21377

Merged

2 tasks

tacaswell pushed a commit that referenced this pull request Oct 20, 2021

Merge pull request #20914 from deep-jkl/19195-rotated-markers

2259d03

19195 rotated markers

j-bowhay mentioned this pull request Oct 29, 2021

Rotate Markers in functions like plot, scatter, etcetera #19195

Closed

deep-jkl deleted the 19195-rotated-markers branch April 13, 2022 18:31

tacaswell mentioned this pull request Dec 6, 2022

ENH: Allow for non-normalized and transformed markers #16773

Closed

6 tasks

QuLogic mentioned this pull request May 6, 2023

Fix MarkerStyle types #25825

Merged

1 task

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

deep-jkl commented Aug 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

PR Checklist

Uh oh!

Uh oh!

dstansby left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jklymak commented Sep 21, 2021

Uh oh!

jklymak left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

deep-jkl commented Sep 28, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jklymak left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

deep-jkl commented Aug 26, 2021 •

edited

Loading