Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork8.1k
Implement head resizing (and reversal) for larrow/rarrow/darrow#29998
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
base:main
Are you sure you want to change the base?
Uh oh!
There was an error while loading.Please reload this page.
Changes fromall commits
2f366fae8d7eb715bd7dc4f574955c3fa6080655490471e92212cbc9273a2febf2d06b0ea2f5ad7fd405ff34b4bd9b0b32f3369c03913ef663a4ba97ed9fd1d953aefd2105da54147e6b5ba28e976e54ba08c67b1dc613e73d95322b83affe94a77798d4bc42ac0bffa6e2abff8ba2497b4b3b1119a05180d1c40460306e201e62c94fa82dFile filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| Arrow-style sub-classes of ``BoxStyle`` support arrow head resizing | ||
| ------------------------------------------------------------------- | ||
| The new *head_width* and *head_angle* parameters to | ||
| `.BoxStyle.LArrow`, `.BoxStyle.RArrow` and `.BoxStyle.DArrow` allow for adjustment | ||
| of the size and aspect ratio of the arrow heads used. | ||
| By using negative angles (or corresponding reflex angles) for *head_angle*, arrows | ||
| with 'backwards' heads may be created. | ||
| ..plot:: | ||
| :include-source: true | ||
| :alt: Six arrow-shaped text boxes, all containing the text "Arrow". The top left arrow has a shorter head than default, while the top right arrow a longer head. The centre left double arrow has a "road-sign" shape (head as wide as the arrow tail), while the centre right arrow has a "backwards" head. The bottom left arrow has two heads which are larger than default, and the bottom right arrow has a head narrower than its tail. | ||
Member 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. You should be able to wrap this as long as you wrap the first line. | ||
| import matplotlib.pyplot as plt | ||
| plt.text(0.2, 0.8, "Arrow", ha='center', size=16, bbox=dict(boxstyle="larrow, pad=0.3, head_angle=150")) | ||
| plt.text(0.7, 0.8, "Arrow", ha='center', size=16, bbox=dict(boxstyle="rarrow, pad=0.3, head_angle=30")) | ||
| plt.text(0.2, 0.2, "Arrow", ha='center', size=16, bbox=dict(boxstyle="darrow, pad=0.3, head_width=3")) | ||
| plt.text(0.7, 0.2, "Arrow", ha='center', size=16, bbox=dict(boxstyle="larrow, pad=0.3, head_width=0.5")) | ||
| plt.text(0.2, 0.5, "Arrow", ha='center', size=16, bbox=dict(boxstyle="darrow, pad=0.3, head_width=1, head_angle=60")) | ||
| plt.text(0.7, 0.5, "Arrow", ha='center', size=16, bbox=dict(boxstyle="rarrow, pad=0.3, head_width=2, head_angle=-90")) | ||
| plt.show() | ||
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -2508,33 +2508,134 @@ def __call__(self, x0, y0, width, height, mutation_size): | ||||||||||||||
| class LArrow: | ||||||||||||||
| """A box in the shape of a left-pointing arrow.""" | ||||||||||||||
| def __init__(self, pad=0.3, head_width=1.5, head_angle=90.0): | ||||||||||||||
| """ | ||||||||||||||
| Parameters | ||||||||||||||
| ---------- | ||||||||||||||
| pad : float, default: 0.3 | ||||||||||||||
| The amount of padding around the original box. | ||||||||||||||
| head_width : float, default: 1.5 | ||||||||||||||
| The width of the arrow head, relative to that of the arrow body. | ||||||||||||||
| Only positive values are accepted. | ||||||||||||||
| head_angle : float, default: 90.0 | ||||||||||||||
| The angle subtended by the tip of the arrow head, in degrees. | ||||||||||||||
| Only nonzero angles are accepted. | ||||||||||||||
CharlieThornton33 marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||||||||||||||
| """ | ||||||||||||||
| self.pad = pad | ||||||||||||||
| if head_width < 0: | ||||||||||||||
| raise ValueError("The relative head width must be a positive number.") | ||||||||||||||
| self.head_width = head_width | ||||||||||||||
| # Set arrow-head angle to within [0, 360 deg) | ||||||||||||||
| self.head_angle = head_angle % 360. | ||||||||||||||
CharlieThornton33 marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||||||||||||||
| if self.head_angle == 0: | ||||||||||||||
| # This would cause a division by zero ('infinitely long' arrow head) | ||||||||||||||
| raise ValueError("Head angle of zero is not valid.") | ||||||||||||||
| def __call__(self, x0, y0, width, height, mutation_size): | ||||||||||||||
| #scaledpadding | ||||||||||||||
| pad = mutation_size * self.pad | ||||||||||||||
| #add padding to width and height | ||||||||||||||
| width, height = width + 2 * pad, height + 2 * pad | ||||||||||||||
| # boundarypointsof the padded box (used as arrow shaft) | ||||||||||||||
| x0, y0 = x0 - pad, y0 - pad, | ||||||||||||||
| x1, y1 = x0 + width, y0 + height | ||||||||||||||
| # half-width and quarter-width of arrow shaft | ||||||||||||||
| dx = (y1 - y0) / 2 | ||||||||||||||
| dxx = dx / 2 | ||||||||||||||
| # Pad to position original box and its margins exactly inside arrow shaft | ||||||||||||||
| padding_offset = (0.5 * pad) + (0.25 * mutation_size) | ||||||||||||||
| x0 -= padding_offset | ||||||||||||||
Comment on lines +2550 to +2552 Member 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
I don't understand this. I thought the original box starts at Author 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. I'm not entirely sure myself why this is needed. When writing the code for padding, I noticed that padding just via Member 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. On So I don't quite understand the math added here, and I guess it depends on how close we want it to match the old version. Currently, it doesn't at all, but without | ||||||||||||||
| # The width adjustment is the distance that must be subtracted from | ||||||||||||||
| # y0 and added to y1 to reach the non-tip vertices of the head. | ||||||||||||||
| # The body width is 2dx. | ||||||||||||||
| # Subtracting 1 from the head width gives, in units of the body width, | ||||||||||||||
| # the total 'width' of arrow-head not within the body. | ||||||||||||||
| width_adjustment = (self.head_width - 1) * dx | ||||||||||||||
| if self.head_angle <= 180: | ||||||||||||||
| # Non-reversed arrow head (<---) | ||||||||||||||
| # tan(1/2 * angle subtended by arrow tip) | ||||||||||||||
| tan_half_angle = np.tan(self.head_angle * (math.pi / 360)) | ||||||||||||||
| # The angle adjustment is the tip-to-body length of the arrow head. | ||||||||||||||
| # Each half of the arrow head is a right-angled triangle. Therefore, | ||||||||||||||
| # each half of the arrow head has, by trigonometry, tan(head_angle/2)= | ||||||||||||||
| # (dx+width_adjustment)/(dxx+angle_adjustment). | ||||||||||||||
| angle_adjustment = ((dx + width_adjustment) / tan_half_angle) - dxx | ||||||||||||||
| # If there is sufficient space available, shorten the arrow shaft to | ||||||||||||||
| # push some of the padding margin into the head | ||||||||||||||
| if self.head_width > 1 and pad * tan_half_angle < width_adjustment: | ||||||||||||||
| # Pad original box into head | ||||||||||||||
| x0 += pad | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0), | ||||||||||||||
| (x1, y0), | ||||||||||||||
| (x1, y1), | ||||||||||||||
| (x0 + dxx, y1), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 - angle_adjustment, y0 + dx), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| (x0 + dxx, y0) | ||||||||||||||
| ]) | ||||||||||||||
| else: | ||||||||||||||
| # Reversed arrow head (>---) | ||||||||||||||
| # tan(1/2 * angle subtended by arrow tip) | ||||||||||||||
| tan_half_angle = -np.tan(self.head_angle * (math.pi / 360)) | ||||||||||||||
| if self.head_width <= 1: | ||||||||||||||
| # Rectangle; head entirely enclosed by body (don't count head | ||||||||||||||
| # 'poking' out of back of body) | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0), | ||||||||||||||
| (x1, y0), | ||||||||||||||
| (x1, y1), | ||||||||||||||
| (x0 + dxx, y1), | ||||||||||||||
| (x0 + dxx, y0) | ||||||||||||||
| ]) | ||||||||||||||
| # Distance from end of arrow to points where slanted parts of head | ||||||||||||||
| # intercept arrow body | ||||||||||||||
| intercept_adjustment = width_adjustment / tan_half_angle | ||||||||||||||
| if intercept_adjustment < width: | ||||||||||||||
| # Some of arrow body is outside of head | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| (x0 + dxx + intercept_adjustment, y0), | ||||||||||||||
| (x1, y0), | ||||||||||||||
| (x1, y1), | ||||||||||||||
| (x0 + dxx + intercept_adjustment, y1), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment) | ||||||||||||||
| ]) | ||||||||||||||
| else: | ||||||||||||||
| # Trapezium-shaped reversed arrow (reversed triangle 'cut off' by | ||||||||||||||
| # end of body | ||||||||||||||
| # Vertical distance between top of original box at end furthest from | ||||||||||||||
| # arrow head and corner of trapezium | ||||||||||||||
| vertical_offset = width_adjustment + ((x0 - x1) * tan_half_angle) | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| (x1, y0 - vertical_offset), | ||||||||||||||
| (x1, y1 + vertical_offset), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment) | ||||||||||||||
| ]) | ||||||||||||||
| @_register_style(_style_list) | ||||||||||||||
| class RArrow(LArrow): | ||||||||||||||
| @@ -2551,37 +2652,141 @@ class DArrow: | ||||||||||||||
| """A box in the shape of a two-way arrow.""" | ||||||||||||||
| # Modified from LArrow to add a right arrow to the bbox. | ||||||||||||||
| def __init__(self, pad=0.3, head_width=1.5, head_angle=90.0): | ||||||||||||||
| """ | ||||||||||||||
| Parameters | ||||||||||||||
| ---------- | ||||||||||||||
| pad : float, default: 0.3 | ||||||||||||||
| The amount of padding around the original box. | ||||||||||||||
| head_width : float, default: 1.5 | ||||||||||||||
| The width of each arrow head, relative to that of the arrow body. | ||||||||||||||
| Only positive values are accepted. | ||||||||||||||
| # This would cause a division by zero ('infinitely long' arrow head) | ||||||||||||||
| raise ValueError("Head angle of zero is not valid.") are accepted. | ||||||||||||||
| head_angle : float, default: 90.0 | ||||||||||||||
| The angle subtended by the tip of each arrow head, in degrees. | ||||||||||||||
| Only nonzero angles are accepted. | ||||||||||||||
| """ | ||||||||||||||
| self.pad = pad | ||||||||||||||
| if head_width < 0: | ||||||||||||||
| raise ValueError("The relative head width must be a positive number.") | ||||||||||||||
| self.head_width = head_width | ||||||||||||||
| # Set arrow-head angle to within [0, 360 deg) | ||||||||||||||
| self.head_angle = head_angle % 360. | ||||||||||||||
| if self.head_angle == 0: | ||||||||||||||
| # This would cause a division by zero ('infinitely long' arrow head) | ||||||||||||||
| raise ValueError("Head angle of zero is not valid.") | ||||||||||||||
| def __call__(self, x0, y0, width, height, mutation_size): | ||||||||||||||
| #scaledpadding | ||||||||||||||
| pad = mutation_size * self.pad | ||||||||||||||
| # add padding to height | ||||||||||||||
| height = height + 2 * pad | ||||||||||||||
| # boundarypointsof the padded box (used as arrow shaft) | ||||||||||||||
| x0, y0 = x0 - pad, y0 - pad | ||||||||||||||
| x1, y1 = x0 + width, y0 + height | ||||||||||||||
| # half-width and quarter-width of arrow shaft | ||||||||||||||
| dx = (y1 - y0) / 2 | ||||||||||||||
| dxx = dx / 2 | ||||||||||||||
| # Pad original box | ||||||||||||||
| padding_offset = (0.5 * pad) + (0.25 * mutation_size) | ||||||||||||||
| x0 -= padding_offset | ||||||||||||||
| x1 += 2 * pad | ||||||||||||||
| # The width adjustment is the distance that must be subtracted from | ||||||||||||||
| # y0 and added to y1 to reach the non-tip vertices of the head. | ||||||||||||||
| # The body width is 2dx. | ||||||||||||||
| # Subtracting 1 from the head width gives, in units of the body width, | ||||||||||||||
| # the total 'width' of arrow-head not within the body. | ||||||||||||||
| width_adjustment = (self.head_width - 1) * dx | ||||||||||||||
| if self.head_angle <= 180: | ||||||||||||||
| # Non-reversed arrow heads (<--->) | ||||||||||||||
| # tan(1/2 * angle subtended by arrow tip) | ||||||||||||||
| tan_half_angle = np.tan(self.head_angle * (math.pi / 360)) | ||||||||||||||
| # The angle adjustment is the tip-to-body length of the arrow head. | ||||||||||||||
| # Each half of the arrow head is a right-angled triangle. Therefore, | ||||||||||||||
| # each half of the arrow head has, by trigonometry, tan(head_angle/2)= | ||||||||||||||
| # (dx+width_adjustment)/(dxx+angle_adjustment). | ||||||||||||||
| angle_adjustment = ((dx + width_adjustment) / tan_half_angle) - dxx | ||||||||||||||
| # If there is sufficient space available, shorten the arrow shaft to | ||||||||||||||
| # push some of the padding margin into the heads | ||||||||||||||
| if self.head_width > 1 and pad * tan_half_angle < width_adjustment: | ||||||||||||||
| # Pad original box into heads | ||||||||||||||
| x0 += pad | ||||||||||||||
| x1 -= pad | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0), | ||||||||||||||
| (x1, y0), | ||||||||||||||
| (x1, y0 - width_adjustment), | ||||||||||||||
| (x1 + dxx + angle_adjustment, y0 + dx), | ||||||||||||||
| (x1, y1 + width_adjustment), | ||||||||||||||
| (x1, y1), | ||||||||||||||
| (x0 + dxx, y1), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 - angle_adjustment, y0 + dx), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| (x0 + dxx, y0) | ||||||||||||||
| ]) | ||||||||||||||
| else: | ||||||||||||||
| # Reversed arrow heads (>---<) | ||||||||||||||
| # tan(1/2 * angle subtended by arrow tip) | ||||||||||||||
| tan_half_angle = -np.tan(self.head_angle * (math.pi / 360)) | ||||||||||||||
| if self.head_width <= 1: | ||||||||||||||
| # Rectangle; heads entirely enclosed by body | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0), | ||||||||||||||
| (x1, y0), | ||||||||||||||
| (x1, y1), | ||||||||||||||
| (x0 + dxx, y1), | ||||||||||||||
| (x0 + dxx, y0) | ||||||||||||||
| ]) | ||||||||||||||
| # Distance from end of arrow to points where slanted parts of head | ||||||||||||||
| # intercept arrow body | ||||||||||||||
| intercept_adjustment = width_adjustment / tan_half_angle | ||||||||||||||
| if (2 * intercept_adjustment) < width: | ||||||||||||||
| # Some of arrow body is outside of heads | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| (x0 + dxx + intercept_adjustment, y0), | ||||||||||||||
| (x1 - intercept_adjustment, y0), | ||||||||||||||
| (x1, y0 - width_adjustment), | ||||||||||||||
| (x1, y1 + width_adjustment), | ||||||||||||||
| (x1 - intercept_adjustment, y1), | ||||||||||||||
| (x0 + dxx + intercept_adjustment, y1), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment) | ||||||||||||||
| ]) | ||||||||||||||
| else: | ||||||||||||||
| # Draw overlapping arrow heads | ||||||||||||||
| # y-offset inwards of central points | ||||||||||||||
| centre_offset = (width * tan_half_angle) / 2 | ||||||||||||||
| return Path._create_closed([ | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment), | ||||||||||||||
| ((x0 + x1 + dxx) / 2, y0 - width_adjustment + centre_offset), | ||||||||||||||
| (x1, y0 - width_adjustment), | ||||||||||||||
| (x1, y1 + width_adjustment), | ||||||||||||||
| ((x0 + x1 + dxx) / 2, y1 + width_adjustment - centre_offset), | ||||||||||||||
| (x0 + dxx, y1 + width_adjustment), | ||||||||||||||
| (x0 + dxx, y0 - width_adjustment) | ||||||||||||||
| ]) | ||||||||||||||
| @_register_style(_style_list) | ||||||||||||||
| class Round: | ||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -378,7 +378,11 @@ class BoxStyle(_Style): | ||
| class LArrow(BoxStyle): | ||
| pad: float | ||
| head_width: float | ||
| head_angle: float | ||
Comment on lines +381 to +382 Member 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. Since these appear to be new public attributes, the tests should also check that modifying them after creation is working correctly. | ||
| def __init__( | ||
| self, pad: float = ..., head_width: float = ..., head_angle: float = ... | ||
| ) -> None: ... | ||
| def __call__( | ||
| self, | ||
| x0: float, | ||
| @@ -400,7 +404,11 @@ class BoxStyle(_Style): | ||
| class DArrow(BoxStyle): | ||
| pad: float | ||
| head_width: float | ||
| head_angle: float | ||
| def __init__( | ||
| self, pad: float = ..., head_width: float = ..., head_angle: float = ... | ||
| ) -> None: ... | ||
| def __call__( | ||
| self, | ||
| x0: float, | ||
Uh oh!
There was an error while loading.Please reload this page.
Uh oh!
There was an error while loading.Please reload this page.



