NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commit7884314

committed

Redo colorbar overhaul.

Previous overhaul packaged an inner and outer axes in a container"ColorbarAxes" and tried to dispatch methods between them.This overhaul takes the _much_ simpler approach of resizing theimage using a custom _axes_locator that a) calls any existing locatorb) or just uses the axes default position. The custom _axes_locatorthen shrinks the axes in the appropriate direction to make room forextend tri/rectangles. As with the previous fix, the extendtri/rectangles are drawn as patches in axes co-ordinates, rather thanpcolormesh in "data" co-ordinates.

1 parent4b7b2c9 commit7884314Copy full SHA for 7884314

File tree

14 files changed

+564

-563

lines changed

doc/api/next_api_changes/behavior
- 20054-JMK.rst
lib
- matplotlib
  - _constrained_layout.py
  - axes
    - _base.py
  - colorbar.py
  - figure.py
  - tests
    - baseline_images
      - test_axes
        contour_colorbar.pdf
        contour_colorbar.png
        contour_colorbar.svg
      - test_colorbar
        colorbar_change_lim_scale.png
        double_cbar.png
      - test_contour
        contour_manual_colors_and_levels.png
    - test_axes.py
    - test_colorbar.py
- mpl_toolkits/axes_grid1
  - axes_grid.py

14 files changed

+564

-563

lines changed

`‎doc/api/next_api_changes/behavior/20054-JMK.rst`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,3 @@`
`1`		`-Axes used to make colorbar now wrapped`
`2`		`-======================================`
`3`		`-`
`4`		`-The axes used to place a colorbar is now wrapped by a new parent class`
`5`		-(``ColorbarAxes``) when the colorbar is created::
`6`		`-`
`7`		`- cb = fig.colorbar(im, cax=cax)`
`8`		`-`
`9`		-This means that ``cb.ax`` is no longer the same object as ``cax``. However,
`10`		-we map all the methods from ``cb.ax`` onto ``cax`` so ``cax`` should remain
`11`		-functionally the same as ``cb.ax``.
`12`		`-`
`13`	`1`	`Colorbar lines no longer clipped`
`14`	`2`	`================================`
`15`	`3`

`‎lib/matplotlib/_constrained_layout.py`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,11 @@ def _reposition_colorbar(cbax, renderer, *, offset=None):`
`575`	`575`	`pbcb=trans_fig_to_subfig.transform_bbox(pbcb)`
`576`	`576`	`cbax.set_transform(fig.transSubfigure)`
`577`	`577`	`cbax._set_position(pbcb)`
`578`		`-cbax.set_aspect(aspect,anchor=anchor,adjustable='box')`
	`578`	`+cbax.set_anchor(anchor)`
	`579`	`+iflocationin ['bottom','top']:`
	`580`	`+aspect=1/aspect`
	`581`	`+cbax.set_box_aspect(aspect)`
	`582`	`+cbax.set_aspect('auto')`
`579`	`583`	`returnoffset`
`580`	`584`
`581`	`585`

`‎lib/matplotlib/axes/_base.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2371,6 +2371,8 @@ def _update_patch_limits(self, patch):`
`2371`	`2371`	`return`
`2372`	`2372`	`patch_trf=patch.get_transform()`
`2373`	`2373`	`updatex,updatey=patch_trf.contains_branch_seperately(self.transData)`
	`2374`	`+ifnot (updatexorupdatey):`
	`2375`	`+return`
`2374`	`2376`	`ifself.name!="rectilinear":`
`2375`	`2377`	`# As in _update_line_limits, but for axvspan.`
`2376`	`2378`	`ifupdatexandpatch_trf==self.get_yaxis_transform():`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit7884314

File tree

14 files changed

14 files changed

`‎doc/api/next_api_changes/behavior/20054-JMK.rst`

`‎lib/matplotlib/_constrained_layout.py`

`‎lib/matplotlib/axes/_base.py`

0 commit comments