Skip to content

Fix color cycling not working in singular_values_plot #1138

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 2 commits into from
Mar 3, 2025
Merged

Fix color cycling not working in singular_values_plot #1138

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
d61e6d4
fix color cycling not working in singular_values_plot
lkies Mar 2, 2025
049a716
test to verify that color cycling works for singular_values_plot
lkies Mar 2, 2025
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 control/freqplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2556,12 +2556,12 @@ def singular_values_plot(
nyq_freq = None

# Determine the color to use for this response
color = _get_color(
current_color = _get_color(
color, fmt=fmt, offset=color_offset + idx_sys,
color_cycle=color_cycle)

# To avoid conflict with *fmt, only pass color kw if non-None
color_arg = {} if color is None else {'color': color}
color_arg = {} if current_color is None else {'color': current_color}

# Decide on the system name
sysname = response.sysname if response.sysname is not None \
Expand Down
33 changes: 33 additions & 0 deletions control/tests/freqplot_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,39 @@ def test_display_margins(nsys, display_margins, gridkw, match):
assert cplt.axes[0, 0].get_title() == ''


def test_singular_values_plot_colors():
# Define some systems for testing
sys1 = ct.rss(4, 2, 2, strictly_proper=True)
sys2 = ct.rss(4, 2, 2, strictly_proper=True)

# Get the default color cycle
color_cycle = plt.rcParams['axes.prop_cycle'].by_key()['color']

# Plot the systems individually and make sure line colors are OK
cplt = ct.singular_values_plot(sys1)
assert cplt.lines.size == 1
assert len(cplt.lines[0]) == 2
assert cplt.lines[0][0].get_color() == color_cycle[0]
assert cplt.lines[0][1].get_color() == color_cycle[0]

cplt = ct.singular_values_plot(sys2)
assert cplt.lines.size == 1
assert len(cplt.lines[0]) == 2
assert cplt.lines[0][0].get_color() == color_cycle[1]
assert cplt.lines[0][1].get_color() == color_cycle[1]
plt.close('all')

# Plot the systems as a list and make sure colors are OK
cplt = ct.singular_values_plot([sys1, sys2])
assert cplt.lines.size == 2
assert len(cplt.lines[0]) == 2
assert len(cplt.lines[1]) == 2
assert cplt.lines[0][0].get_color() == color_cycle[0]
assert cplt.lines[0][1].get_color() == color_cycle[0]
assert cplt.lines[1][0].get_color() == color_cycle[1]
assert cplt.lines[1][1].get_color() == color_cycle[1]


if __name__ == "__main__":
#
# Interactive mode: generate plots for manual viewing
Expand Down
Loading