From 7ae6d0a5d33c29714e8a801fca3ae2ec95f7b6ed Mon Sep 17 00:00:00 2001
From: Rory Yorke <rory.yorke@gmail.com>
Date: Sun, 11 Apr 2021 15:44:36 +0200
Subject: [PATCH] Fix warnings generated by sisotool
Use recommended canvas.manager.{get,set}_window_title instead of
deprecated canvas.{get,set}_window_title.
Remove redundant marker specification in sisotool rlocus plot.
---
control/rlocus.py | 4 ++--
control/sisotool.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/control/rlocus.py b/control/rlocus.py
index 2dae5a77e..bad243292 100644
--- a/control/rlocus.py
+++ b/control/rlocus.py
@@ -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)))
@@ -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')
diff --git a/control/sisotool.py b/control/sisotool.py
index bfd93736e..18c3b5d12 100644
--- a/control/sisotool.py
+++ b/control/sisotool.py
@@ -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 = {