test for correct grid and no plot. fix pzmap config handling

bnavigator · bnavigator · commit b292feb1b0ff · 2020-08-21T01:31:11.000+02:00
diff --git a/control/grid.py b/control/grid.py
@@ -34,11 +34,9 @@ def __call__(self, transform_xy, x1, y1, x2, y2):
                 # Changed from 180 to 360 to be able to span only
                 # 90-270 (left hand side)
                 lon -= 360. * ((lon - lon0) > 360.)
-            if self.lat_cycle is not None:
+            if self.lat_cycle is not None:  # pragma: no cover
                 lat0 = np.nanmin(lat)
-                # Changed from 180 to 360 to be able to span only
-                # 90-270 (left hand side)
-                lat -= 360. * ((lat - lat0) > 360.)
+                lat -= 360. * ((lat - lat0) > 180.)
 
         lon_min, lon_max = np.nanmin(lon), np.nanmax(lon)
         lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
@@ -49,7 +47,7 @@ def __call__(self, transform_xy, x1, y1, x2, y2):
         # check cycle
         if self.lon_cycle:
             lon_max = min(lon_max, lon_min + self.lon_cycle)
-        if self.lat_cycle:
+        if self.lat_cycle:  # pragma: no cover
             lat_max = min(lat_max, lat_min + self.lat_cycle)
 
         if self.lon_minmax is not None:
diff --git a/control/pzmap.py b/control/pzmap.py
@@ -58,7 +58,7 @@
 # TODO: Implement more elegant cross-style axes. See:
 #    http://matplotlib.sourceforge.net/examples/axes_grid/demo_axisline_style.html
 #    http://matplotlib.sourceforge.net/examples/axes_grid/demo_curvelinear_grid.html
-def pzmap(sys, plot=True, grid=False, title='Pole Zero Map', **kwargs):
+def pzmap(sys, plot=None, grid=None, title='Pole Zero Map', **kwargs):
     """
     Plot a pole/zero map for a linear system.
 
@@ -90,6 +90,7 @@ def pzmap(sys, plot=True, grid=False, title='Pole Zero Map', **kwargs):
     plot = config._get_param('pzmap', 'plot', plot, True)
     grid = config._get_param('pzmap', 'grid', grid, False)
 
+
     if not isinstance(sys, LTI):
         raise TypeError('Argument ``sys``: must be a linear system.')
 
diff --git a/control/tests/pzmap_test.py b/control/tests/pzmap_test.py
@@ -6,9 +6,11 @@
 @author: bnavigator
 """
 
+import matplotlib
 import numpy as np
 import pytest
 from matplotlib import pyplot as plt
+from mpl_toolkits.axisartist import Axes as mpltAxes
 
 from control import TransferFunction, config, pzmap
 
@@ -45,6 +47,7 @@ def test_pzmap(kwargs, setdefaults, dt, editsdefaults, mplcleanup):
         for k in ['plot', 'grid']:
             if k in pzkwargs:
                 v = pzkwargs.pop(k)
+                print("setting {} to {}".format(k,v))
                 config.set_defaults('pzmap', **{k: v})
 
     P, Z = pzmap(T, **pzkwargs)
@@ -54,10 +57,26 @@ def test_pzmap(kwargs, setdefaults, dt, editsdefaults, mplcleanup):
 
     if kwargs.get('plot', True):
         ax = plt.gca()
+
         assert ax.get_title() == kwargs.get('title', 'Pole Zero Map')
+
+        # FIXME: This won't work when zgrid and sgrid are unified
+        children = ax.get_children()
+        has_zgrid = False
+        for c in children:
+            if isinstance(c, matplotlib.text.Annotation):
+                if r'\pi' in c.get_text():
+                    has_zgrid = True
+        has_sgrid = isinstance(ax, mpltAxes)
+
         if kwargs.get('grid', False):
-            # TODO: check for correct grid
-            pass
+            assert dt == has_zgrid
+            assert dt != has_sgrid
+        else:
+            assert not has_zgrid
+            assert not has_sgrid
+    else:
+        assert not plt.get_fignums()
 
 
 def test_pzmap_warns():
