Skip to content

Stop sorting artists in Figure Options dialog #22208

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 1 commit into from
Jan 12, 2022
Merged

Stop sorting artists in Figure Options dialog #22208

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
18 changes: 2 additions & 16 deletions lib/matplotlib/backends/qt_editor/figureoptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

"""Module that provides a GUI-based editor for Matplotlib's figure options."""

import re

from matplotlib import cbook, cm, colors as mcolors, markers, image as mimage
from matplotlib.backends.qt_compat import QtGui
from matplotlib.backends.qt_editor import _formlayout
Expand Down Expand Up @@ -65,18 +63,6 @@ def convert_limits(lim, converter):
xunits = axes.xaxis.get_units()
yunits = axes.yaxis.get_units()

# Sorting for default labels (_lineXXX, _imageXXX).
def cmp_key(label):
"""
Label should be a tuple consisting of the string label,
and the object being sorted by label.
"""
match = re.match(r"(_line|_image)(\d+)", label[0])
if match:
return match.group(1), int(match.group(2))
else:
return label[0], 0

# Get / Curves
labeled_lines = []
for line in axes.get_lines():
Expand Down Expand Up @@ -113,7 +99,7 @@ def prepare_data(d, init):
sorted(short2name.items(),
key=lambda short_and_name: short_and_name[1]))

for label, line in sorted(labeled_lines, key=cmp_key):
for label, line in labeled_lines:
color = mcolors.to_hex(
mcolors.to_rgba(line.get_color(), line.get_alpha()),
keep_alpha=True)
Expand Down Expand Up @@ -150,7 +136,7 @@ def prepare_data(d, init):
labeled_mappables.append((label, mappable))
mappables = []
cmaps = [(cmap, name) for name, cmap in sorted(cm._cmap_registry.items())]
for label, mappable in sorted(labeled_mappables, key=cmp_key):
for label, mappable in labeled_mappables:
cmap = mappable.get_cmap()
if cmap not in cm._cmap_registry.values():
cmaps = [(cmap, cmap.name), *cmaps]
Expand Down