Skip to content

[MNT] - Update handling of default colors #410

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
TomDonoghue merged 2 commits into from
Jun 22, 2026
+9 −6
Merged

[MNT] - Update handling of default colors #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edf998
udpate default colors
TomDonoghue Jun 22, 2026
0840072
update to use DEFAULT_COLORS in param plots
TomDonoghue Jun 22, 2026
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
4 changes: 2 additions & 2 deletions specparam/plts/aperiodic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from specparam.sim.gen import gen_freqs
from specparam.modutils.dependencies import safe_import, check_dependency
from specparam.modes.modes import check_mode_definition
from specparam.plts.settings import ITERABLES, PLT_FIGSIZES
from specparam.plts.settings import ITERABLES, PLT_FIGSIZES, DEFAULT_COLORS
from specparam.plts.templates import plot_yshade
from specparam.plts.style import style_param_plot, style_plot
from specparam.plts.utils import check_ax, recursive_plot, savefig, check_plot_kwargs
Expand Down Expand Up @@ -105,7 +105,7 @@ def plot_aperiodic_fits(aps, freq_range, aperiodic_mode, control_offset=False, a
if isinstance(aps, list):

if not colors:
colors = cycle(plt.rcParams['axes.prop_cycle'].by_key()['color'])
colors = cycle(DEFAULT_COLORS)

recursive_plot(aps, plot_function=plot_aperiodic_fits, ax=ax,
freq_range=tuple(freq_range), aperiodic_mode=aperiodic_mode,
Expand Down
4 changes: 2 additions & 2 deletions specparam/plts/periodic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from specparam.sim import gen_freqs
from specparam.modutils.dependencies import safe_import, check_dependency
from specparam.modes.modes import check_mode_definition
from specparam.plts.settings import ITERABLES, PLT_FIGSIZES
from specparam.plts.settings import ITERABLES, PLT_FIGSIZES, DEFAULT_COLORS
from specparam.plts.templates import plot_yshade
from specparam.plts.style import style_param_plot, style_plot
from specparam.plts.utils import check_ax, recursive_plot, savefig, check_plot_kwargs
Expand Down Expand Up @@ -109,7 +109,7 @@ def plot_peak_fits(peaks, periodic_mode, freq_range=None, average='mean', shade=
if isinstance(peaks, list):

if not colors:
colors = cycle(plt.rcParams['axes.prop_cycle'].by_key()['color'])
colors = cycle(DEFAULT_COLORS)

recursive_plot(peaks, plot_function=plot_peak_fits, ax=ax,
periodic_mode=periodic_mode,
Expand Down
7 changes: 5 additions & 2 deletions specparam/plts/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from collections import OrderedDict

import numpy as np
from matplotlib.colors import to_hex

from specparam.modutils.dependencies import safe_import

Expand All @@ -14,8 +15,10 @@
# Define list of iterables to check against
ITERABLES = (list, tuple, np.ndarray)

# Define list of default plot colors
DEFAULT_COLORS = plt.rcParams['axes.prop_cycle'].by_key()['color'] if plt else None
# Define list of default plot colors, making sure colors are hex, for downstream consistency
# Hex encoding changed in mpl: https://github.com/matplotlib/matplotlib/issues/29915
DEFAULT_COLORS = [to_hex(col) for col in plt.rcParams['axes.prop_cycle'].by_key()['color']] \
if plt else None

# Define default figure sizes
PLT_FIGSIZES = {
Expand Down
Loading