Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork8.1k
Add corner coordinate helper methods to Ellipse/Rectangle#21977
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
22 changes: 22 additions & 0 deletionslib/matplotlib/patches.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -806,6 +806,18 @@ def get_xy(self): | ||
| """Return the left and bottom coords of the rectangle as a tuple.""" | ||
| return self._x0, self._y0 | ||
| def get_corners(self): | ||
| """ | ||
| Return the corners of the rectangle, moving anti-clockwise from | ||
ericpre marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| (x0, y0). | ||
| """ | ||
| return self.get_patch_transform().transform( | ||
| [(0, 0), (1, 0), (1, 1), (0, 1)]) | ||
| def get_center(self): | ||
| """Return the centre of the rectangle.""" | ||
| return self.get_patch_transform().transform((0.5, 0.5)) | ||
| def get_width(self): | ||
| """Return the width of the rectangle.""" | ||
| return self._width | ||
| @@ -1657,6 +1669,16 @@ def get_angle(self): | ||
| angle = property(get_angle, set_angle) | ||
| def get_corners(self): | ||
| """ | ||
| Return the corners of the ellipse bounding box. | ||
| The bounding box orientation is moving anti-clockwise from the | ||
| lower left corner defined before rotation. | ||
| """ | ||
| return self.get_patch_transform().transform( | ||
ericpre marked this conversation as resolved. OutdatedShow resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| [(-1, -1), (1, -1), (1, 1), (-1, 1)]) | ||
| class Annulus(Patch): | ||
| """ | ||
50 changes: 49 additions & 1 deletionlib/matplotlib/tests/test_patches.py
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -6,7 +6,7 @@ | ||
| import pytest | ||
| import matplotlib as mpl | ||
| from matplotlib.patches import (Annulus,Ellipse,Patch, Polygon, Rectangle, | ||
| FancyArrowPatch) | ||
| from matplotlib.testing.decorators import image_comparison, check_figures_equal | ||
| from matplotlib.transforms import Bbox | ||
| @@ -54,6 +54,54 @@ def test_Polygon_close(): | ||
| assert_array_equal(p.get_xy(), xyclosed) | ||
| def test_corner_center(): | ||
| loc = [10, 20] | ||
| width = 1 | ||
| height = 2 | ||
| # Rectangle | ||
| # No rotation | ||
| corners = ((10, 20), (11, 20), (11, 22), (10, 22)) | ||
| rect = Rectangle(loc, width, height) | ||
| assert_array_equal(rect.get_corners(), corners) | ||
| assert_array_equal(rect.get_center(), (10.5, 21)) | ||
| # 90 deg rotation | ||
| corners_rot = ((10, 20), (10, 21), (8, 21), (8, 20)) | ||
| rect.set_angle(90) | ||
ericpre marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| assert_array_equal(rect.get_corners(), corners_rot) | ||
| assert_array_equal(rect.get_center(), (9, 20.5)) | ||
| # Rotation not a multiple of 90 deg | ||
| theta = 33 | ||
| t = mtransforms.Affine2D().rotate_around(*loc, np.deg2rad(theta)) | ||
| corners_rot = t.transform(corners) | ||
| rect.set_angle(theta) | ||
| assert_almost_equal(rect.get_corners(), corners_rot) | ||
| # Ellipse | ||
| loc = [loc[0] + width / 2, | ||
| loc[1] + height / 2] | ||
| ellipse = Ellipse(loc, width, height) | ||
| # No rotation | ||
| assert_array_equal(ellipse.get_corners(), corners) | ||
| # 90 deg rotation | ||
| corners_rot = ((11.5, 20.5), (11.5, 21.5), (9.5, 21.5), (9.5, 20.5)) | ||
| ellipse.set_angle(90) | ||
| assert_array_equal(ellipse.get_corners(), corners_rot) | ||
| # Rotation shouldn't change ellipse center | ||
| assert_array_equal(ellipse.get_center(), loc) | ||
| # Rotation not a multiple of 90 deg | ||
| theta = 33 | ||
| t = mtransforms.Affine2D().rotate_around(*loc, np.deg2rad(theta)) | ||
| corners_rot = t.transform(corners) | ||
| ellipse.set_angle(theta) | ||
| assert_almost_equal(ellipse.get_corners(), corners_rot) | ||
| def test_rotate_rect(): | ||
| loc = np.asarray([1.0, 2.0]) | ||
| width = 2 | ||
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.