10000 Fix collection legend handlers by tacaswell · Pull Request #7832 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix collection legend handlers #7832

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 15, 2017
Merged

Fix collection legend handlers #7832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fb4f9b
MNT: copy unscaled dash data in update_from
tacaswell Jan 15, 2017
9893d4f
FIX: pull the unscaled dashes from the line collection
tacaswell Jan 15, 2017
9a75feb
TST: tweak imports / whitespace in tests
tacaswell Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
8000 Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
TST: tweak imports / whitespace in tests
  • Loading branch information
@tacaswell
tacaswell committed Jan 15, 2017
commit 9a75feba7ff054ee3d68a922934d40ca525522da
1 change: 0 additions & 1 deletion lib/matplotlib/tests/test_coding_standards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ def test_pep8_conformance_installed_files():
'tests/test_delaunay.py',
'tests/test_dviread.py',
'tests/test_image.py',
'tests/test_legend.py',
'tests/test_lines.py',
'tests/test_mathtext.py',
'tests/test_rcparams.py',
Expand Down
25 changes: 13 additions & 12 deletions lib/matplotlib/tests/test_legend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
import numpy as np

from matplotlib.testing.decorators import image_comparison, cleanup
from matplotlib.cbook import MatplotlibDeprecationWarning
import matplotlib.pyplot as plt
import matplotlib as mpl
import matplotlib.patches as mpatches
import matplotlib.transforms as mtrans
import matplotlib.collections as mc
import matplotlib.collections as mcollections


@image_comparison(baseline_images=['legend_auto1'], remove_text=True)
def test_legend_auto1():
Expand Down Expand Up @@ -110,7 +109,8 @@ def test_fancy():
plt.subplot(121)
plt.scatter(list(xrange(10)), list(xrange(10, 0, -1)), label='XX\nXX')
plt.plot([5] * 10, 'o--', label='XX')
plt.errorbar(list(xrange(10)), list(xrange(10)), xerr=0.5, yerr=0.5, label='XX')
plt.errorbar(list(xrange(10)), list(xrange(10)), xerr=0.5,
yerr=0.5, label='XX')
plt.legend(loc="center left", bbox_to_anchor=[1.0, 0.5],
ncol=2, shadow=True, title="My legend", numpoints=1)

Expand All @@ -123,7 +123,8 @@ def test_framealpha():
plt.legend(framealpha=0.5)


@image_comparison(baseline_images=['scatter_rc3', 'scatter_rc1'], remove_text=True)
@image_comparison(baseline_images=['scatter_rc3', 'scatter_rc1'],
remove_text=True)
def test_rc():
# using subplot triggers some offsetbox functionality untested elsewhere
fig = plt.figure()
Expand Down Expand Up @@ -221,8 +222,8 @@ def test_warn_args_kwargs(self):
ax.legend((lnc, lns), labels=('a', 'b'))

warn.assert_called_with("You have mixed positional and keyword "
"arguments, some input will be "
"discarded.")
"arguments, some input will be "
"discarded.")


@image_comparison(baseline_images=['legend_stackplot'], extensions=['png'])
Expand Down Expand Up @@ -273,10 +274,10 @@ def test_nanscatter():

@image_comparison(baseline_images=['not_covering_scatter'], extensions=['png'])
def test_not_covering_scatter():
colors = ['b','g','r']
colors = ['b', 'g', 'r']

for n in range(3):
plt.scatter([n,], [n,], color=colors[n])
plt.scatter([n], [n], color=colors[n])

plt.legend(['foo', 'foo', 'foo'], loc='best')
plt.gca().set_xlim(-0.5, 2.2)
Expand All @@ -301,9 +302,9 @@ def test_linecollection_scaled_dashes():
lines1 = [[(0, .5), (.5, 1)], [(.3, .6), (.2, .2)]]
lines2 = [[[0.7, .2], [.8, .4]], [[.5, .7], [.6, .1]]]
lines3 = [[[0.6, .2], [.8, .4]], [[.5, .7], [.1, .1]]]
lc1 = mc.LineCollection(lines1, linestyles="--", lw=3)
lc2 = mc.LineCollection(lines2, linestyles="-.")
lc3 = mc.LineCollection(lines3, linestyles=":", lw=.5)
lc1 = mcollections.LineCollection(lines1, linestyles="--", lw=3)
lc2 = mcollections.LineCollection(lines2, linestyles="-.")
lc3 = mcollections.LineCollection(lines3, linestyles=":", lw=.5)

fig, ax = plt.subplots()
ax.add_collection(lc1)
Expand Down
0