8000 Changed 'colors' paramater in PyPlot vlines/hlines and Axes vlines/hlines to default to configured rcParams 'lines.color' option by McCoubs · Pull Request #1 · CSCD01-team31/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Changed 'colors' paramater in PyPlot vlines/hlines and Axes vlines/hlines to default to configured rcParams 'lines.color' option #1

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1,515 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
1515 commits
Select commit Hold shift + click to select a range
e737d0d
Simplify masking in tri.
QuLogic May 8, 2020
b672f68
Fix running test_internal_cpp_api directly.
QuLogic May 8, 2020
95ada39
Merge pull request #17220 from anntzer/ann
QuLogic May 8, 2020
ef8a6ae
Merge pull request #17092 from anntzer/nostatbar
QuLogic May 8, 2020
fbbc84f
Merge pull request #17287 from anntzer/tbb
QuLogic May 8, 2020
17db319
Remove randomness from test_colorbar_get_ticks_2.
anntzer May 8, 2020
f7c5635
Also use light color tool buttons in qt+toolmanager+dark theme.
anntzer May 8, 2020
0f31553
Restrict Qt toolbars to top/bottom of canvas.
anntzer May 8, 2020
a81b6da
Replace backend_driver by new example runner.
anntzer Apr 23, 2020
b5fbbb5
Merge pull request #17151 from anntzer/colordoc
efiring May 8, 2020
a0569fe
Merge pull request #17361 from anntzer/unrandcbt
QuLogic May 8, 2020
47be1cb
Merge pull request #17366 from anntzer/qtoolpos
QuLogic May 8, 2020
0fc4ad6
Change _get_executable_info() to catch ExecutableNotFoundError
May 8, 2020
f62a209
Fix remaining flake8 issue
May 8, 2020
b8083ec
Merge pull request #17365 from anntzer/qtoolmancolors
QuLogic May 8, 2020
70b2141
Wrap reviewdog yaml.
QuLogic May 8, 2020
1357102
CI: Add linting of JavaScript/CSS with eslint.
QuLogic May 8, 2020
b786dcd
Merge pull request #17226 from anntzer/driver
tacaswell May 8, 2020
5962f1a
Update lib/matplotlib/__init__.py
tacaswell May 8, 2020
3da9aca
Add indent settings to eslintrc.
QuLogic May 8, 2020
be2ba7f
Add quotes settings to eslintrc.
QuLogic May 8, 2020
8f3f689
Merge pull request #17369 from QuLogic/reviewdog-eslint
tacaswell May 8, 2020
dec272c
Merge pull request #17355 from jat255/fix_inkscape_detection
QuLogic May 9, 2020
eda2ed3
DOC: edits from review
tacaswell May 9, 2020
7cf68e8
DOC: remove non-existent function call
tacaswell May 9, 2020
bfa3589
DOC: edits and duplicate removal
tacaswell May 9, 2020
b5d4a6c
Merge pull request #17359 from QuLogic/fix-tri-test
anntzer May 9, 2020
6edcb47
DOC: windows not widows
tacaswell May 9, 2020
9b492bd
DOC: Revert all changes to blocking_input_api.rst
tacaswell May 9, 2020
d174bb0
Auto-set artist.mouseover based on if get_cursor_data is overridden.
anntzer May 9, 2020
4428da6
Fix marker overlap
xenoryt Mar 14, 2018
ab37ea2
Remove code for sphinx < 1.8
timhoffm May 10, 2020
1e58203
revert plot_streamplot.py to original version
asafmaman101 May 11, 2020
8167e81
Support standard names for freetype hinting flags.
anntzer May 11, 2020
c6ec7f1
Update backend_svg.py
cover-me May 11, 2020
8d33af7
Merge pull request #17266 from efiring/set_ticklabels
tacaswell May 11, 2020
97477d7
Simplify file handling in ft2font.
anntzer Aug 21, 2019
505cbed
Handle review comments.
anntzer May 11, 2020
35fd945
Merge pull request #17377 from timhoffm/sphinx-version
QuLogic May 11, 2020
23d36d9
Inline convert_open_args.
anntzer May 11, 2020
904227b
Merge pull request #17372 from anntzer/mos
QuLogic May 11, 2020
9b6c490
FIX: properly check figure on gridspec
jklymak May 11, 2020
d79498b
make sure all gridspecs have a figure attribute
jklymak May 11, 2020
f792c8b
Merge pull request #17380 from anntzer/ftflags
QuLogic May 11, 2020
965e533
Merge pull request #15104 from anntzer/ft2fontfile
QuLogic May 12, 2020
34b86a5
yticks: Fix typos
jiahao May 12, 2020
28f41f9
Merge pull request #17383 from jiahao/cjh/yticks-doc
QuLogic May 12, 2020
9e6b9b4
Fix running the test suite with inkscape>=1.
anntzer May 7, 2020
8e5aac9
Update backend_svg.py
cover-me May 12, 2020
82dfe4b
Merge pull request #2 from cover-me/fix-pep8
cover-me May 12, 2020
f936648
Update backend_svg.py
cover-me May 12, 2020
932a863
Merge pull request #3 from cover-me/fix-pep8
cover-me May 12, 2020
8ec7307
Small updates to troubleshooting guide.
anntzer May 12, 2020
4f95512
Merge pull request #17390 from anntzer/tsg
timhoffm May 12, 2020
7377faf
Merge pull request #17382 from jklymak/fix-properly-check-for-figrue
QuLogic May 13, 2020
a6f82b9
Merge pull request #17351 from anntzer/inkscape1
QuLogic May 13, 2020
ee52f21
Clarify deprecation message re: tex/pgf preambles as list-of-strings.
anntzer May 13, 2020
0de8ef5
TexManager fixes.
anntzer May 13, 2020
cc10355
Merge pull request #17378 from timhoffm/fix-marker-overlap2
tacaswell May 13, 2020
aaacd25
Remove qt4 backends from backend fallback candidates.
anntzer May 13, 2020
7a8be18
Cleanup wx examples.
anntzer May 13, 2020
35ead09
FIX: Fix for FFMpeg + GIF
larsoner May 13, 2020
54bd6f1
Merge pull request #17400 from anntzer/wxex
timhoffm May 13, 2020
2572f90
DOC: Use @timhoffm's wording about unexpected compilation
tacaswell Feb 18, 2020
7ac9e13
DOC: tweak note about out-of-the-box backends
tacaswell May 7, 2020
bb8480b
Merge pull request #17392 from anntzer/preamblewarning
QuLogic May 13, 2020
b8ffb8c
MNT: improve the error message in Path init
tacaswell Feb 24, 2020
351f47e
MNT: pull shape checking into cbook
tacaswell Feb 28, 2020
21082ab
MNT: simplify and add tests for cbook._check_shape
tacaswell Feb 28, 2020
6cffcc1
FIX: typo from review
tacaswell May 13, 2020
f4f365f
Merge pull request #17399 from anntzer/unqt4
tacaswell May 14, 2020
1982469
Update lib/matplotlib/animation.py
larsoner May 14, 2020
8bddf0a
Merge pull request #17395 from anntzer/texman
QuLogic May 14, 2020
dfa7d1c
Don't forget to dlclose() main_program in tkagg init.
anntzer May 13, 2020
6e6fe87
Deprecate passing keys to update_keymap as single comma-separated string
anntzer May 13, 2020
d8418e2
Revert "DOC: drop the experimental tag constrained_layout and tight_l…
jklymak May 14, 2020
22eade6
Merge pull request #17394 from anntzer/update_keymap
timhoffm May 14, 2020
3756e58
Keep validate_date private.
anntzer May 14, 2020
83dd1de
Cygwin fixes
Sonic-Amiga May 14, 2020
88ea5b7
Merge pull request #17413 from matplotlib/revert-17094-doc-drop-exper…
QuLogic May 14, 2020
7ce2788
Merge pull request #17414 from anntzer/validate_date
QuLogic May 14, 2020
9ebcbc1
Merge pull request #17404 from anntzer/dlclose
QuLogic May 14, 2020
23335e6
Merge pull request #16569 from tacaswell/mnt_better_path_errors
QuLogic May 15, 2020
60fd88f
Merge pull request #17401 from larsoner/ffmpeg
tacaswell May 15, 2020
8673167
Merge pull request #17415 from Sonic-Amiga/p.fedin/5962
QuLogic May 15, 2020
0538ea7
Remove status bars in toolmanager mode as well.
anntzer May 8, 2020
c01f9d3
Unstale viewlims before draw()ing polar axes.
anntzer May 15, 2020
3fb7408
fix typo in stem doc
mdeff May 15, 2020
425f9cf
Merge pull request #17425 from mdeff/typo
anntzer May 15, 2020
e70c6f8
Merge pull request #17422 from anntzer/polarunstale
QuLogic May 16, 2020
7a2a049
Merge pull request #17328 from jbhopkins/wx_4p10
efiring May 16, 2020
370ad44
Merge pull request #16551 from tacaswell/doc_pip_opinions
timhoffm May 16, 2020
ef0a308
Merge pull request #17362 from anntzer/toolmanstatbar
timhoffm May 16, 2020
1241d59
tk: Skip setting cursor if window is unavailable.
QuLogic May 12, 2020
2acbdd0
TST: Smoke test saving with interactive backends.
QuLogic May 12, 2020
b65d1e7
wx: Fix saving after window is closed.
QuLogic May 13, 2020
04b047b
wx: Fix saving to a BytesIO.
QuLogic May 14, 2020
c0e7fbe
TST: Skip backend savefig equality check on Qt5+macOS.
QuLogic May 16, 2020
222b3ba
Avoid creating a Tick in Axis.get_tick_space.
QuLogic Apr 7, 2020
661100a
Changed line color of boxplot for dark_background (#15725)
manan2501 May 16, 2020
178515c
Get default params from matplotlibrc.template.
anntzer Jul 30, 2019
5fe972e
Fix toolbar separators in wx+toolmanager.
anntzer May 8, 2020
a664c8a
adding both methods how to generate multiple plots
asafmaman101 May 17, 2020
a9d580e
fix linting
asafmaman101 May 17, 2020
5c13fb4
Merge pull request #17348 from QuLogic/tickspace-no-tick
timhoffm May 17, 2020
2240f34
Merge pull request #17363 from anntzer/wxtb
timhoffm May 17, 2020
140058b
Discourage use of proprietary Matplotlib names for freetype hinting
timhoffm May 17, 2020
5698325
Merge pull request #15029 from anntzer/rc2
timhoffm May 17, 2020
6d82ceb
Remove comment re: validation of datetime format strings.
anntzer May 18, 2020
ec579de
Show the failing line in bad-rcparams warnings.
anntzer May 13, 2020
42b2dff
Merge pull request #16340 from anntzer/set_xmargin-autoscale
efiring May 18, 2020
1a6ef99
Merge pull request #16990 from terencehonles/update-testing-helpers
tacaswell May 18, 2020
20c320b
Merge pull request #17438 from timhoffm/freetype-hinting
anntzer May 18, 2020
6c02d68
Merge pull request #17439 from anntzer/unvalidate
timhoffm May 18, 2020
eff7337
Move integerness checks to SubplotSpec._from_subplot_args.
anntzer May 7, 2020
98ff4b4
Support odd-length dash patterns in Agg.
anntzer May 18, 2020
f964afd
Fix rcParams validator for dashes.
anntzer May 18, 2020
bc444fa
revert xkcd.py
asafmaman101 May 19, 2020
6d49644
Make validate_date throw ValueError, not RuntimeError.
anntzer May 19, 2020
2bdfea8
Merge pull request #17452 from anntzer/validate_date
timhoffm May 19, 2020
0c0848b
Merge pull request #17405 from anntzer/badrc
QuLogic May 19, 2020
16ae357
Merge pull request #17444 from anntzer/odddash
QuLogic May 19, 2020
4a8aa8c
Merge pull request #17350 from anntzer/gscheckint
QuLogic May 20, 2020
2f41868
FIX: cancel pending autoscale on manually setting limits
tacaswell May 14, 2020
26fd914
Merge pull request #17391 from QuLogic/tk-cursor
tacaswell May 20, 2020
6d4747f
DOC: reduce jargon and correct grammar
tacaswell May 20, 2020
89be34e
Correctly initialize kwargs to _image.resample.
QuLogic May 20, 2020
e5abc17
image: Avoid excess NumPy array refcount twiddling.
anntzer May 20, 2020
949cc29
Make array_view.set return a bool.
QuLogic May 20, 2020
8e7aaff
Fix leak of input mesh during image resampling.
QuLogic May 20, 2020
db783f7
Merge pull request #17443 from anntzer/dash-validator
timhoffm May 20, 2020
f05ea3d
DOC: grammar / wording corrections from review
tacaswell May 20, 2020
28c7b23
Fold _make_nseq_validator into _listify_validator.
anntzer May 20, 2020
22d406a
DOC: clarify that milestones are intentions not approvals
tacaswell May 20, 2020
8627f64
Replace PyObject_Call* with PyObject_Call*ObjArgs.
QuLogic May 20, 2020
2d2083c
Remove extraneous `(char *)` casts.
QuLogic May 20, 2020
0edefcd
Merge pull request #17062 from cover-me/master
jklymak May 20, 2020
3964e71
Merge pull request #17466 from tacaswell/doc_milestone_implications
QuLogic May 20, 2020
897bc57
Use qVersion, not QT_VERSION_STR -- the latter doesn't exist in PySide2.
anntzer May 20, 2020
d132860
Merge pull request #17458 from QuLogic/image-cleanup
tacaswell May 21, 2020
46936d7
Merge pull request #4779 from tacaswell/doc_interactive_doc
QuLogic May 21, 2020
969513e
Merge pull request #17469 from anntzer/qv
QuLogic May 21, 2020
edcc3c3
Deprecate the private FigureCanvasGTK3._renderer_init.
anntzer May 20, 2020
aaa9cc1
DOC: Use Sphinx-gallery animation capture
larsoner May 21, 2020
0d82faf
DOC: Tweak
larsoner May 21, 2020
7e57660
Add support for blitting in qt5cairo.
anntzer May 21, 2020
1df45d6
FIX: Ref
larsoner May 21, 2020
a39c462
Fix typo in validate_stringlist doc.
anntzer May 21, 2020
0a4dd1c
FIX: Birthday adjusted for better spiking
larsoner May 21, 2020
4780a81
STY: PEP8
larsoner May 21, 2020
de0fb17
Update doc/Makefile
larsoner May 21, 2020
ac400b5
Fix LightSource.shade on fully unmasked array.
QuLogic May 21, 2020
f288658
Cleanup RectangleSelector example.
anntzer May 21, 2020
81a9396
Shorten RectangleSelector._release.
anntzer May 21, 2020
e689289
Merge pull request #17464 from anntzer/unnseq
tacaswell May 21, 2020
3816dff
Merge pull request #17461 from anntzer/unrenderer_init
tacaswell May 22, 2020
35808ec
Merge pull request #17475 from anntzer/rse
QuLogic May 22, 2020
d03c337
Merge pull request #17482 from anntzer/rsx
QuLogic May 22, 2020
eb27af0
Merge pull request #17477 from larsoner/anim
QuLogic May 22, 2020
0165830
Merge pull request #17358 from QuLogic/masked-CubicTriInterpolator
jklymak May 22, 2020
3c27f6c
Remove unnecessary cast in Line3DCollection.set_segments.
QuLogic May 1, 2020
2e57d5b
Avoid unnecessary conversions to arrays.
QuLogic May 1, 2020
ac018af
Rewrite _reshape_2D to not use ragged ndarrays.
QuLogic May 6, 2020
b8b1733
Change hist empty check to not use 2D arrays.
QuLogic May 6, 2020
a0aac5a
Allow object arrays in cbook._combine_masks.
QuLogic May 6, 2020
98f22a9
Error out of index_of if input is not a NumPy array.
QuLogic May 16, 2020
00deb04
MNT: avoid casting to numpy in violin_stats
tacaswell May 16, 2020
5ab1352
Merge pull request #17289 from QuLogic/np119
jklymak May 22, 2020
d02b8be
Inline FigureCanvasGtkFoo._render_figure.
anntzer May 20, 2020
d7d11a7
Make get_sample_data autoload npy/npz files.
anntzer Nov 9, 2019
56d509f
Merge pull request #17481 from QuLogic/masked-shading
dstansby May 22, 2020
a1c51a0
Merge pull request #15641 from anntzer/get_sample_data-npy
tacaswell May 22, 2020
df67aaf
Merge pull request #17478 from anntzer/qt5cblit
jklymak May 22, 2020
67e2590
Numpydocify RectangleSelector docstring.
anntzer May 21, 2020
4eda3f2
Simplify handling of fontproperties=None.
anntzer May 22, 2020
54a61cc
BUG: Show bug test case
larsoner May 22, 2020
93cf388
Revert "Don't divide by zero in Line2D.segment_hits."
larsoner May 22, 2020
e919969
Support marking a single artist as not-usetex.
anntzer May 22, 2020
906d8c6
Merge pull request #17486 from anntzer/fpnone
QuLogic May 22, 2020
4cec73f
Merge pull request #17489 from larsoner/bug
QuLogic May 23, 2020
e10ab91
Update SVGs that use interpolation='none'.
QuLogic May 23, 2020
56e9b41
Don't composite images that are no clipped.
QuLogic May 23, 2020
3a1fbf3
Fix Pillow import in testing.
QuLogic May 23, 2020
28756a2
Fix clipping of images with clipping disabled.
QuLogic May 23, 2020
8373989
Add an explicit initializer to std::stringstream.
QuLogic Dec 27, 2019
4b06006
Hide symbols in compiled extension where possible.
QuLogic Dec 23, 2019
9c1f752
Hide inlines in compiled extensions.
QuLogic Dec 23, 2019
17566b2
Only build local FreeType statically.
QuLogic Mar 31, 2020
c266293
Enable LTO for all compiled extensions.
QuLogic Apr 2, 2020
fa5059d
Add docstring for `add_optional_flags`.
QuLogic May 23, 2020
786d18a
Merge pull request #17003 from QuLogic/hidden-visibility
anntzer May 23, 2020
16df024
Merge pull request #17474 from anntzer/rs
timhoffm May 23, 2020
fb9e723
Merge pull request #17462 from anntzer/gtk_render_figure
timhoffm May 23, 2020
d84f4a7
FIX: fix support for single color 2D array as c to mean single color
tacaswell May 23, 2020
1a56e12
DOC: tweak wording about c input to scatter
tacaswell May 23, 2020
6ed975c
Merge pull request #17495 from QuLogic/pillow-import
tacaswell May 23, 2020
346f6f7
Merge pull request #17499 from tacaswell/fix_scatter_singlecolor
efiring May 23, 2020
898bd5f
Merge pull request #13884 from anntzer/docextreme
tacaswell May 23, 2020
e85a17d
Undocument parameter orientation of bar()
timhoffm May 24, 2020
f5e6f5d
Deprecate ismath parameter to draw_tex and ismath="TeX!".
anntzer May 22, 2020
cf95c21
Merge pull request #17504 from timhoffm/bar-orientation2
tacaswell May 25, 2020
820bbdf
modify heading in subplot.py
asafmaman101 May 25, 2020
e92682d
added integration tests
story645 May 25, 2020
2e20e67
closes #17502 by adding check to plot
story645 May 25, 2020
6a2d498
flake
story645 May 25, 2020
81c01b2
more flake, will rebase eventually probably
story645 May 25, 2020
36bc7da
Merge pull request #17340 from asafmaman101/same-fig-creation-method
timhoffm May 25, 2020
5e5ac01
Adding 2d support to quadmesh set_array
greglucas Mar 25, 2020
58a59ed
reverted double quotes on string
story645 May 25, 2020
626d54f
Merge pull request #17496 from QuLogic/image-clip
timhoffm May 25, 2020
fcb0a41
Merge pull request #17506 from story645/fix-dicts
tacaswell May 25, 2020
49593b7
Merge pull request #16908 from greglucas/quadmesh_set_array
tacaswell May 25, 2020
66289c4
Correctly set default linewidth for unfilled markers.
QuLogic May 23, 2020
51a1940
Merge pull request #17492 from QuLogic/unfilled-marker-lw
timhoffm May 25, 2020
69e651f
Merge pull request #17484 from anntzer/ismath_tex
QuLogic May 26, 2020
85a7c23
Steal fontconfig's font weight guessing algorithm, using fc weights.
anntzer Dec 14, 2018
8a74fe2
Go back to using OpenType weight values.
anntzer Jan 13, 2020
c24b1af
Simplifications to errorbar().
anntzer Jan 6, 2019
76b6674
DOC: remove inkscape restriction in doc
jklymak May 26, 2020
775e41c
Merge pull request #17512 from jklymak/doc-inkscape-req
jklymak May 26, 2020
b9cea08
Don't fallback to agg in tight_layout.get_renderer.
anntzer Sep 7, 2019
9ccdb1d
Merge pull request #15221 from anntzer/get_renderer
QuLogic May 26, 2020
24fa78d
FIX: legend issue with bbox_inches="tight"
jklymak May 26, 2020
a022b52
Override set_url() in class Tick
khyox Nov 6, 2017
3964f2a
Add test for urls on ticks in svg.
QuLogic May 6, 2020
08169a9
Ensure URLs are stored for plain lines in SVG.
QuLogic May 6, 2020
b71691a
TST: test fig legend doesn't move
jklymak May 26, 2020
90200c6
Merge pull request #17493 from QuLogic/svg-interpolation-images
tacaswell May 27, 2020
01cb983
windowextent-for-annotationbbox
ImportanceOfBeingErnest Feb 18, 2019
8e569e9
Merge pull request #15037 from anntzer/simplify-errorbar
QuLogic May 27, 2020
2f63dc4
Merge pull request #13457 from ImportanceOfBeingErnest/windowextent-f…
jklymak May 27, 2020
dd3d5e6
Bump FontManager version.
anntzer May 27, 2020
7ff1611
Prefer demo'ing rcParams rather than rc in examples.
anntzer May 27, 2020
c0e1cfc
Merge pull request #17519 from anntzer/unrc
timhoffm May 27, 2020
510482f
Merge pull request #17338 from QuLogic/svg-url
tacaswell May 27, 2020
a3d7a42
Merge pull request #17485 from anntzer/usenotex
QuLogic May 27, 2020
a6f31e3
Merge pull request #16203 from anntzer/fontweight
jklymak May 28, 2020
853358b
Privatize ttconv module.
QuLogic May 28, 2020
a5a4324
Merge pull request #17511 from jklymak/fix-offset-legend-tightbbox
tacaswell May 28, 2020
bd8c6a2
DOC/API: set __qualname__ when using class factory
tacaswell May 28, 2020
eaf7e8f
Merge pull request #17525 from tacaswell/doc_fix_build
anntzer May 28, 2020
34706b5
Remove _parent from NavigationToolbar2QT and add deprecated setter fo…
astrofrog May 28, 2020
880ade0
Merge pull request #17517 from astrofrog/fix-parent-set
tacaswell May 28, 2020
c7a6b12
Merge pull request #17408 from tacaswell/fix_unautoscale
WeatherGod May 28, 2020
9ac9157
Remove unneeded check/comment re: multiprocessing in setup.py.
anntzer May 28, 2020
413bf65
Fix title_fontsize description
MaozGelbart May 28, 2020
71a6674
Merge pull request #17522 from QuLogic/private-ttconv
timhoffm May 28, 2020
61eb480
Merge pull request #17531 from anntzer/setupmulti
story645 May 28, 2020
793c6b0
Merge pull request #17532 from MaozGelbart/title_docfix
QuLogic May 28, 2020
fafa132
changed 'colors' parameter to default to rcParams['lines.color'] in l…
McCoubs Mar 6, 2020
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
6 changes: 6 additions & 0 deletions doc/api/api_changes_3.3/behaviour.rst
Original file line number Diff line number Diff line change
Expand Up @@ -274,3 +274,9 @@ instead of ::

<a list of 3 Lists of Patches objects> # "bar", "barstacked"
<a list of 3 Lists of Patches objects> # "step", "stepfilled"

Qt and wx backends no longer create a status bar by default
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The coordinates information is now displayed in the toolbar, consistently with
the other backends. This is intended to simplify embedding of Matplotlib in
larger GUIs, where Matplotlib may control the toolbar but not the status bar.
14 changes: 5 additions & 9 deletions lib/matplotlib/backend_bases.py
Original file line number Diff line number Diff line change
Expand Up @@ -2881,22 +2881,18 @@ def mouse_move(self, event):
except (ValueError, OverflowError):
pass
else:
s = s.rstrip()
artists = [a for a in event.inaxes._mouseover_set
if a.contains(event)[0] and a.get_visible()]

if artists:
a = cbook._topmost_artist(artists)
if a is not event.inaxes.patch:
data = a.get_cursor_data(event)
if data is not None:
data_str = a.format_cursor_data(data)
if data_str is not None:
s = s + ' ' + data_str

if len(self.mode):
self.set_message('%s, %s' % (self.mode, s))
else:
self.set_message(s)
data_str = a.format_cursor_data(data).rstrip()
if data_str:
s = s + '\n' + data_str
self.set_message(s)
else:
self.set_message(self.mode)

Expand Down
16 changes: 7 additions & 9 deletions lib/matplotlib/backends/backend_qt5.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,23 +550,21 @@ def __init__(self, canvas, num):
if self.toolbar:
backend_tools.add_tools_to_container(self.toolbar)
self.statusbar = StatusbarQt(self.window, self.toolmanager)
sbs_height = self.statusbar.sizeHint().height()
else:
sbs_height = 0

if self.toolbar is not None:
self.window.addToolBar(self.toolbar)
if not self.toolmanager:
# add text label to status bar
statusbar_label = QtWidgets.QLabel()
self.window.statusBar().addWidget(statusbar_label)
self.toolbar.message.connect(statusbar_label.setText)
tbs_height = self.toolbar.sizeHint().height()
else:
tbs_height = 0

# resize the main window so it will display the canvas with the
# requested size:
cs = canvas.sizeHint()
sbs = self.window.statusBar().sizeHint()
height = cs.height() + tbs_height + sbs.height()
cs_height = cs.height()
height = cs_height + tbs_height + sbs_height
self.window.resize(cs.width(), height)

self.window.setCentralWidget(self.canvas)
Expand Down Expand Up @@ -599,7 +597,7 @@ def _get_toolbar(self, canvas, parent):
# must be inited after the window, drawingArea and figure
# attrs are set
if matplotlib.rcParams['toolbar'] == 'toolbar2':
toolbar = NavigationToolbar2QT(canvas, parent, False)
toolbar = NavigationToolbar2QT(canvas, parent, True)
elif matplotlib.rcParams['toolbar'] == 'toolmanager':
toolbar = ToolbarQt(self.toolmanager, self.window)
else:
Expand Down Expand Up @@ -679,7 +677,7 @@ def __init__(self, canvas, parent, coordinates=True):
if self.coordinates:
self.locLabel = QtWidgets.QLabel("", self)
self.locLabel.setAlignment(
QtCore.Qt.AlignRight | QtCore.Qt.AlignTop)
QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter)
self.locLabel.setSizePolicy(
QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding,
QtWidgets.QSizePolicy.Ignored))
Expand Down
16 changes: 8 additions & 8 deletions lib/matplotlib/backends/backend_wx.py
Original file line number Diff line number Diff line change
Expand Up @@ -928,13 +928,11 @@ def __init__(self, num, fig):

self.figmgr = FigureManagerWx(self.canvas, num, self)

statusbar = (StatusbarWx(self, self.toolmanager)
if self.toolmanager else StatusBarWx(self))
self.SetStatusBar(statusbar)
self.toolbar = self._get_toolbar()

if self.toolmanager:
backend_tools.add_tools_to_manager(self.toolmanager)
if self.figmgr.toolmanager:
self.SetStatusBar(StatusbarWx(self, self.figmgr.toolmanager))
backend_tools.add_tools_to_manager(self.figmgr.toolmanager)
if self.toolbar:
backend_tools.add_tools_to_container(self.toolbar)

Expand Down Expand Up @@ -1122,6 +1120,10 @@ def __init__(self, canvas):
self.Bind(wx.EVT_TOOL, getattr(self, callback),
id=self.wx_ids[text])

self.AddStretchableSpace()
self._label_text = wx.StaticText(self)
self.AddControl(self._label_text)

self.Realize()

NavigationToolbar2.__init__(self, canvas)
Expand Down Expand Up @@ -1300,9 +1302,7 @@ def statbar(self):
return self.GetTopLevelParent().GetStatusBar()

def set_message(self, s):
status_bar = self.GetTopLevelParent().GetStatusBar()
if status_bar is not None:
status_bar.set_function(s)
self._label_text.SetLabel(s)

def set_history_buttons(self):
can_backward = self._nav_stack._pos > 0
Expand Down
0