Skip to content

19195 rotated markers #20914

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.

Sign up for GitHub

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

Merged
dstansby merged 22 commits into from
Oct 5, 2021
Merged

19195 rotated markers #20914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e487b1c
Add user supplied transforms and join/cap styles
deep-jkl Jul 23, 2021
37859ea
Avoid reinstanting MarkerStyle in lines.py
deep-jkl Aug 26, 2021
8153632
Update dosctring.
deep-jkl Sep 5, 2021
4469006
Add marker.transformed + test
deep-jkl Sep 6, 2021
4ea2b91
Add affine transform primitives to markers
deep-jkl Sep 10, 2021
7f6d1be
Tweaking docstrings in MarkerStyle.
deep-jkl Sep 11, 2021
2729fe4
Update MarkerStyle module documentation
deep-jkl Sep 12, 2021
4357995
Update marker Reference documentation
deep-jkl Sep 12, 2021
b1bbdff
Add whats new for MarkerStyle features
deep-jkl Sep 12, 2021
9ac3ad2
Add new example with advanced MarkerStyle mapping
deep-jkl Sep 12, 2021
4180843
Fix errors discovered by CI
deep-jkl Sep 12, 2021
905eba4
Fix typo in markers api documentation.
deep-jkl Sep 13, 2021
3fc6140
Improve test for invalid rotated inputs
deep-jkl Sep 14, 2021
04a3e70
Add tests for MarkerStyle scaled and translated
deep-jkl Sep 14, 2021
af6b89a
Add function for optimized None+transform
deep-jkl Sep 15, 2021
c01e8f1
Remove ambiguous translated primitive for MarkerStyle
deep-jkl Sep 15, 2021
95d93d2
Add missing test for MarkerStyle.get_alt_transform
deep-jkl Sep 15, 2021
75a92d8
Improve documentation outputs.
deep-jkl Sep 16, 2021
e4f8456
Update docstrings according to jklymak
deep-jkl Sep 28, 2021
5aa5bbd
Make MarkerStyle.rotated more concise
deep-jkl Sep 28, 2021
214ea3f
Refactor code, linting.
deep-jkl Sep 28, 2021
7101e3c
Rework get_cap(join)style, add tests
deep-jkl Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove ambiguous translated primitive for MarkerStyle
  • Loading branch information
@deep-jkl
deep-jkl committed Sep 21, 2021
commit c01e8f1b5e1786b7be1159e92833496712ac7e89
16 changes: 0 additions & 16 deletions lib/matplotlib/markers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,22 +495,6 @@ def scaled(self, sx, sy=None):
new_marker._user_transform = _transform.scale(sx, sy)
return new_marker

def translated(self, tx, ty):
"""
Return new marker translated by tx and ty.

Parameters
----------
tx : float
Coordinate for translation in *x*-direction.
ty : float
Coordinate for translation in *y*-direction.
"""
new_marker = MarkerStyle(self)
_transform = new_marker._user_transform or Affine2D()
new_marker._user_transform = _transform.translate(tx, ty)
return new_marker

def _set_nothing(self):
self._filled = False

Expand Down
14 changes: 0 additions & 14 deletions lib/matplotlib/tests/test_marker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,20 +253,6 @@ def test_marker_rotated(marker, deg, rad, expected):
assert marker._user_transform is not new_marker._user_transform


def test_marker_translated():
marker = markers.MarkerStyle("1")
new_marker = marker.translated(1, 1)
assert new_marker is not marker
assert new_marker.get_user_transform() == Affine2D().translate(1, 1)
assert marker._user_transform is not new_marker._user_transform

marker = markers.MarkerStyle("1", transform=Affine2D().translate(1, 1))
new_marker = marker.translated(1, 1)
assert new_marker is not marker
assert new_marker.get_user_transform() == Affine2D().translate(2, 2)
assert marker._user_transform is not new_marker._user_transform


def test_marker_scaled():
marker = markers.MarkerStyle("1")
new_marker = marker.scaled(2)
Expand Down