Skip to content
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

Jump to bottom

replace turbo colormap with mpl turbo #1167

Merged
merged 5 commits into from
Mar 20, 2024
Merged

replace turbo colormap with mpl turbo #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1883866
remove turbo
ddkohler Mar 15, 2024
df42c17
Update _colors.py
ddkohler Mar 15, 2024
9f3598a
Update _colors.py
ddkohler Mar 15, 2024
e614f59
Update CHANGELOG.md
ddkohler Mar 15, 2024
6fd60be
Merge branch 'master' into turbo
kameyer226 Mar 20, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).

## [Unreleased]

## Changed
- artists now gets turbo colormap straight from matplotlib
=======
### Fixed
- constants in chopped data will inherit the units of the original data

Expand Down
3 changes: 0 additions & 3 deletions WrightTools/artists/_colors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import matplotlib.colors as mplcolors
import matplotlib.gridspec as grd

from ._turbo import turbo


# --- define -------------------------------------------------------------------------------------

Expand Down Expand Up @@ -438,7 +436,6 @@ def __getitem__(self, key):
colormaps["skyebar1"] = mplcolors.LinearSegmentedColormap.from_list("skyebar", skyebar)
colormaps["skyebar2"] = mplcolors.LinearSegmentedColormap.from_list("skyebar dark", skyebar_d)
colormaps["skyebar3"] = mplcolors.LinearSegmentedColormap.from_list("skyebar inverted", skyebar_i)
colormaps["turbo"] = turbo
colormaps["wright"] = mplcolors.LinearSegmentedColormap.from_list("wright", wright)


Expand Down
280 changes: 0 additions & 280 deletions WrightTools/artists/_turbo.py
View file
Open in desktop

This file was deleted.

Loading