move plotutil to ctrlplot

murrayrm · murrayrm · commit 010b18425753 · 2024-06-15T13:28:54.000-07:00
diff --git a/control/__init__.py b/control/__init__.py
@@ -83,6 +83,7 @@
 from .timeplot import *
 
 from .bdalg import *
+from .ctrlplot import *
 from .delay import *
 from .descfcn import *
 from .dtime import *
@@ -92,7 +93,6 @@
 from .modelsimp import *
 from .nichols import *
 from .phaseplot import *
-from .plotutil import *
 from .pzmap import *
 from .rlocus import *
 from .statefbk import *
diff --git a/control/ctrlplot.py b/control/ctrlplot.py
@@ -1,4 +1,4 @@
-# plotutil.py - utility functions for plotting
+# ctrlplot.py - utility functions for plotting
 # Richard M. Murray, 14 Jun 2024
 #
 # Collection of functions that are used by various plotting functions.
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -19,12 +19,12 @@
 
 from . import config
 from .bdalg import feedback
+from .ctrlplot import suptitle, _find_axes_center
 from .ctrlutil import unwrap
 from .exception import ControlMIMONotImplemented
 from .frdata import FrequencyResponseData
 from .lti import LTI, _process_frequency_response, frequency_response
 from .margins import stability_margins
-from .plotutil import suptitle, _find_axes_center
 from .statesp import StateSpace
 from .timeplot import _make_legend_labels
 from .xferfcn import TransferFunction
@@ -35,7 +35,7 @@
            'bode', 'nyquist', 'gangof4']
 
 # Default font dictionary
-# TODO: move common plotting params to 'ctrlplot' (in plotutil)
+# TODO: move common plotting params to 'ctrlplot'
 _freqplot_rcParams = mpl.rcParams.copy()
 _freqplot_rcParams.update({
     'axes.labelsize': 'small',
diff --git a/control/nichols.py b/control/nichols.py
@@ -18,11 +18,11 @@
 import numpy as np
 
 from . import config
+from .ctrlplot import suptitle
 from .ctrlutil import unwrap
 from .freqplot import _default_frequency_range, _freqplot_defaults, \
     _get_line_labels, _process_ax_keyword
 from .lti import frequency_response
-from .plotutil import suptitle
 from .statesp import StateSpace
 from .xferfcn import TransferFunction
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# plotutil.py - utility functions for plotting`
	`1`	`+# ctrlplot.py - utility functions for plotting`
`2`	`2`	`# Richard M. Murray, 14 Jun 2024`
`3`	`3`	`#`
`4`	`4`	`# Collection of functions that are used by various plotting functions.`