8000 Avoid duplicate cmap in image options. by anntzer · Pull Request #6346 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Avoid duplicate cmap in image options. #6346

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
tacaswell merged 1 commit into from
Apr 28, 2016
Merged

Avoid duplicate cmap in image options. #6346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Avoid duplicate cmap in image options. 
The previous implementation was incorrect and would yield a double entry
in the cmap combobox.
  • Loading branch information
@anntzer
anntzer committed Apr 28, 2016
commit ad4feab7262455b48fcba8817677892319e45e1f
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/qt_editor/figureoptions.py
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def prepare_data(d, init):
for label in imagelabels:
image = imagedict[label]
cmap = image.get_cmap()
if cmap not in cm.cmap_d:
if cmap not in cm.cmap_d.values():
Copy link
Member
@tacaswell tacaswell Apr 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be better to check that cmap.name not in cm.cmap_d?

Copy link
Contributor Author
@anntzer anntzer Apr 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought someone could accidentally create a custom cmap with the same name as one in cmap_d (although it's a pretty theoretical risk and it'd make the combobox awkward anyways), so checking on cmap identity should be safer.

cmaps = [(cmap, cmap.name)] + cmaps
imagedata = [
('Label', label),
Expand Down
0