Merge pull request #608 from roryyorke/rory/sisotool-warnings

bnavigator · web-flow · commit 15dc5cef9bb6 · 2021-04-11T16:41:14.000+02:00
Fix warnings generated by sisotool
diff --git 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
@@ -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 = {
