Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/rlocus.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def root_locus(sys, kvect=None, xlim=None, ylim=None,
fig.axes[1].plot(
[root.real for root in start_mat],
[root.imag for root in start_mat],
'm.', marker='s', markersize=8, zorder=20, label='gain_point')
marker='s', markersize=8, zorder=20, label='gain_point')
s = start_mat[0][0]
if isdtime(sys, strict=True):
zeta = -np.cos(np.angle(np.log(s)))
Expand Down Expand Up @@ -628,7 +628,7 @@ def _RLFeedbackClicksPoint(event, sys, fig, ax_rlocus, sisotool=False):
ax_rlocus.plot(
[root.real for root in mymat],
[root.imag for root in mymat],
'm.', marker='s', markersize=8, zorder=20, label='gain_point')
marker='s', markersize=8, zorder=20, label='gain_point')
else:
ax_rlocus.plot(s.real, s.imag, 'k.', marker='s', markersize=8,
zorder=20, label='gain_point')
Expand Down
4 changes: 2 additions & 2 deletions control/sisotool.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ def sisotool(sys, kvect=None, xlim_rlocus=None, ylim_rlocus=None,

# Setup sisotool figure or superimpose if one is already present
fig = plt.gcf()
if fig.canvas.get_window_title() != 'Sisotool':
if fig.canvas.manager.get_window_title() != 'Sisotool':
plt.close(fig)
fig,axes = plt.subplots(2, 2)
fig.canvas.set_window_title('Sisotool')
fig.canvas.manager.set_window_title('Sisotool')

# Extract bode plot parameters
bode_plot_params = {
Expand Down