Skip to content

Commit 14dc50d

Browse files
author
Wiliam
committed
Implement the changes to the text rotation
1 parent d45f971 commit 14dc50d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+14
-4
lines changed

‎lib/matplotlib/backends/backend_agg.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,20 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
197197
xo, yo = font.get_bitmap_offset()
198198
xo /= 64.0
199199
yo /= 64.0
200-
xd = d * sin(radians(angle))
201-
yd = d * cos(radians(angle))
202-
x = round(x + xo + xd)
203-
y = round(y + yo + yd)
200+
201+
rad = radians(angle)
202+
xd = d * sin(rad)
203+
yd = d * cos(rad)
204+
# Rotating the offset vector ensures text rotates around the anchor point.
205+
# Without this, rotated text offsets incorrectly, causing a horizontal shift.
206+
# Applying the 2D rotation matrix.
207+
rotated_xo = xo * cos(rad) - yo * sin(rad)
208+
rotated_yo = xo * sin(rad) + yo * cos(rad)
209+
# Subtract rotated_yo to account for the inverted y-axis in computer graphics,
210+
# compared to the mathematical convention.
211+
x = round(x + rotated_xo + xd)
212+
y = round(y - rotated_yo + yd)
213+
204214
self._renderer.draw_text_image(font, x, y + 1, angle, gc)
205215

206216
def get_text_width_height_descent(self, s, prop, ismath):

‎lib/matplotlib/tests/baseline_images/test_axes/fill_units.png

132 Bytes

‎lib/matplotlib/tests/baseline_images/test_axes/formatter_ticker_002.png

82 Bytes

‎lib/matplotlib/tests/baseline_images/test_axes/pcolor_datetime_axis.png

-605 Bytes

‎lib/matplotlib/tests/baseline_images/test_axes/pcolormesh_datetime_axis.png

-605 Bytes

‎lib/matplotlib/tests/baseline_images/test_axes/pie_rotatelabels_true.png

-53 Bytes

‎lib/matplotlib/tests/baseline_images/test_axes/test_stairs_datetime.png

68 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout1.png

-25 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11.png

-101 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout11rat.png

-115 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout12.png

40 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout14.png

-67 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout17.png

55 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout2.png

-89 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout3.png

46 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout4.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout5.png

-30 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout6.png

4 Bytes

‎lib/matplotlib/tests/baseline_images/test_constrainedlayout/constrained_layout8.png

-10 Bytes

‎lib/matplotlib/tests/baseline_images/test_contour/contour_datetime_axis.png

-280 Bytes

‎lib/matplotlib/tests/baseline_images/test_contour/contour_disconnected_segments.png

-36 Bytes

‎lib/matplotlib/tests/baseline_images/test_contour/contour_test_label_transforms.png

15.7 KB

‎lib/matplotlib/tests/baseline_images/test_dates/DateFormatter_fractionalSeconds.png

408 Bytes

‎lib/matplotlib/tests/baseline_images/test_dates/RRuleLocator_bounds.png

469 Bytes

‎lib/matplotlib/tests/baseline_images/test_dates/date_axvline.png

-57 Bytes

‎lib/matplotlib/tests/baseline_images/test_dates/date_axvspan.png

52 Bytes

‎lib/matplotlib/tests/baseline_images/test_figure/figure_align_labels.png

-151 Bytes

‎lib/matplotlib/tests/baseline_images/test_figure/figure_align_titles_tight.png

19 Bytes

‎lib/matplotlib/tests/baseline_images/test_figure/figure_suptitle.png

52 Bytes

‎lib/matplotlib/tests/baseline_images/test_figure/test_subfigure_double.png

-7 Bytes

‎lib/matplotlib/tests/baseline_images/test_polar/polar_rlabel_position.png

60 Bytes

‎lib/matplotlib/tests/baseline_images/test_polar/polar_theta_wedge.png

-198 Bytes

‎lib/matplotlib/tests/baseline_images/test_text/multiline2.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout1.png

-18 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout3.png

-52 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout4.png

-40 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout6.png

-48 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout7.png

-60 Bytes

‎lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout8.png

-33 Bytes

‎lib/matplotlib/tests/baseline_images/test_units/jpl_barh_units.png

12 Bytes

‎lib/matplotlib/tests/baseline_images/test_units/plot_pint.png

-44 Bytes

‎lib/mpl_toolkits/axisartist/tests/baseline_images/test_axis_artist/axis_artist_ticklabels.png

-11 Bytes

‎lib/mpl_toolkits/axisartist/tests/baseline_images/test_axislines/subplotzero_ylabel.png

-20 Bytes

‎lib/mpl_toolkits/axisartist/tests/baseline_images/test_grid_helper_curvelinear/polar_box.png

-22 Bytes

‎lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_label_offset_tick_position.png

6 Bytes

0 commit comments

Comments
 (0)