Skip to content

Backport qt editor improvements #6718

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 11 commits into from
Jul 10, 2016
Merged

Backport qt editor improvements #6718

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44ce103
Sort and uniquify style entries in figure options.
anntzer Oct 28, 2015
68b42d9
Clarify the implementation of prepare_data.
anntzer Nov 12, 2015
240d24b
Set image cmap from figure options.
anntzer Nov 12, 2015
cf4b219
Avoid duplicate cmap in image options.
anntzer Apr 28, 2016
21174b5
Allow setting image clims in Qt options editor.
anntzer Apr 28, 2016
6d9b4a5
Sort default labels numerically in Qt editor.
anntzer May 5, 2016
5d179ba
DOC: add whats_new for qt configuration editor.
anntzer May 5, 2016
46dd689
Minor cleanups for FormLayout.
anntzer May 5, 2016
c077c56
Qt editor alpha handling.
anntzer May 5, 2016
61a16e4
Drop conditional import of figureoptions.
anntzer Jun 17, 2016
90aeeeb
Mock the entire PyQt4.QtGui classes API.
anntzer Jun 17, 2016
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
Prev Previous commit
Next Next commit
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 Jul 10, 2016
commit cf4b2196a06742c2d1cdea756b5f11274b7bd62c
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/qt_editor/figureoptions.py
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():
cmaps = [(cmap, cmap.name)] + cmaps
imagedata = [
('Label', label),
Expand Down