Skip to content

Improvements to colormap classes, "show" functions #98

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
lukelbd merged 16 commits into from
Jan 7, 2020
Merged

Improvements to colormap classes, "show" functions #98

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bdfdcb7
Initial commit
lukelbd Jan 7, 2020
9f59217
Remove lxml dependency
lukelbd Jan 7, 2020
5fe6b05
show_cycles and show_cmaps both use colorbars
lukelbd Jan 7, 2020
0bae2f3
Considerably simplify register_cmaps/cycles funcs
lukelbd Jan 7, 2020
fbac357
Remove unused variables
lukelbd Jan 7, 2020
8d9a171
Docs cleanup, remove cyclic_doc and gamma_doc stubs
lukelbd Jan 7, 2020
7deb1b7
Add from_file static methods, file loading cleanup
lukelbd Jan 7, 2020
3e8cf71
Update changelog
lukelbd Jan 7, 2020
cf20366
Warn when from_file() fails on startup, raise error otherwise
lukelbd Jan 7, 2020
af5ae91
Add builtin cycles as files, just like colormaps
lukelbd Jan 7, 2020
f082458
Rename 'open' category --> 'opencolor'
lukelbd Jan 7, 2020
03c3b0f
Merge branch 'master' into cmap-cycle-improvements
lukelbd Jan 7, 2020
9a70e9e
cycle_wrapper bugfix with colors in lists/ndarrays
lukelbd Jan 7, 2020
19779c9
Fix bug due to samples --> N rename
lukelbd Jan 7, 2020
317e076
Update changelog
lukelbd Jan 7, 2020
2b80888
show_cmaps bugfix
lukelbd Jan 7, 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
Prev Previous commit
Next Next commit
Rename 'open' category --> 'opencolor'
  • Loading branch information
@lukelbd
lukelbd committed Jan 7, 2020
commit f0824586d4bcc1c9634559c3289f3d2a4d9d466e
0 proplot/colors/open.txt → proplot/colors/opencolor.txt
View file
Open in desktop
File renamed without changes.
17 changes: 10 additions & 7 deletions proplot/styletools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3022,23 +3022,26 @@ def register_colors(nmax=np.inf):
if i == 0:
paths = [ # be explicit because categories matter!
os.path.join(path, base)
for base in ('xkcd.txt', 'crayola.txt', 'open.txt')
for base in ('xkcd.txt', 'crayola.txt', 'opencolor.txt')
]
else:
paths = sorted(glob.glob(os.path.join(path, '*.txt')))
for file in paths:
cat, _ = os.path.splitext(os.path.basename(file))
with open(file, 'r') as f:
pairs = [tuple(item.strip() for item in line.split(':'))
for line in f.readlines() if line.strip()]
pairs = [
tuple(item.strip() for item in line.split(':'))
for line in f.readlines()
if line.strip() and line.strip()[0] != '#'
]
if not all(len(pair) == 2 for pair in pairs):
raise RuntimeError(
f'Invalid color names file {file!r}. '
f'Every line must be formatted as "name: color".'
)

# Categories for which we add *all* colors
if cat == 'open' or i == 1:
if cat == 'opencolor' or i == 1:
dict_ = {name: color for name, color in pairs}
mcolors.colorConverter.colors.update(dict_)
colors[cat] = sorted(dict_)
Expand Down Expand Up @@ -3430,8 +3433,8 @@ def _color_filter(i, hcl): # noqa: E306
figs = []
from . import subplots
for cats in (
('open',),
tuple(name for name in colors if name not in ('css', 'open'))
('opencolor',),
tuple(name for name in colors if name not in ('css', 'opencolor'))
):
# Dictionary of colors for that category
data = {}
Expand All @@ -3441,7 +3444,7 @@ def _color_filter(i, hcl): # noqa: E306

# Group colors together by discrete range of hue, then sort by value
# For opencolors this is not necessary
if cats == ('open',):
if cats == ('opencolor',):
wscale = 0.5
swatch = 1.5
nrows, ncols = 10, len(COLORS_OPEN) # rows and columns
Expand Down