PEP-8 compliance and more

tests for multi-view.

Author: isaacrobinson2000

matplotview/__init__.py

@@ -1,10 +1,12 @@
 from typing import Optional, Iterable, Type, Union
 from matplotlib.artist import Artist
 from matplotlib.axes import Axes
-from matplotview._view_axes import view_wrapper, ViewSpecification, DEFAULT_RENDER_DEPTH
+from matplotview._view_axes import view_wrapper, ViewSpecification
+
 
 __all__ = ["view", "inset_zoom_axes", "ViewSpecification"]
 
+
 def view(
     axes: Axes,
     axes_to_view: Axes,
@@ -67,7 +69,7 @@ def inset_zoom_axes(
     render_depth: Optional[int] = None,
     filter_set: Optional[Iterable[Union[Type[Artist], Artist]]] = None,
     scale_lines: bool = True,
-    transform = None,
+    transform=None,
     zorder: int = 5,
     **kwargs
 ) -> Axes:

matplotview/_transform_renderer.py

@@ -234,7 +234,7 @@ def draw_gouraud_triangle(self, gc, points, colors, transform):
                                               IdentityTransform())
 
     # Images prove to be especially messy to deal with...
-    def draw_image(self, gc, x, y, im, transform = None):
+    def draw_image(self, gc, x, y, im, transform=None):
         mag = self.get_image_magnification()
         shift_data_transform = self._get_transfer_transform(
             IdentityTransform()
@@ -292,4 +292,3 @@ def draw_image(self, gc, x, y, im, transform = None):
             self.__renderer.draw_image(gc, x, y, out_arr, None)
         else:
             self.__renderer.draw_image(gc, x, y, out_arr)
-

matplotview/_view_axes.py

@@ -1,6 +1,6 @@
 import functools
 import itertools
-from typing import Type, List, Optional, Callable, Any, Set, Dict, Union
+from typing import Type, List, Optional, Any, Set, Dict, Union
 from matplotlib.axes import Axes
 from matplotlib.transforms import Bbox
 import matplotlib.docstring as docstring
@@ -11,6 +11,7 @@
 
 DEFAULT_RENDER_DEPTH = 5
 
+
 class _BoundRendererArtist:
     """
     Provides a temporary wrapper around a given artist, inheriting its
@@ -85,6 +86,7 @@ def do_3d_projection(self) -> float:
 
         return res
 
+
 def _view_from_pickle(builder, args):
     """
     PRIVATE: Construct a View wrapper axes given an axes builder and class.
@@ -106,13 +108,15 @@ def __post_init__(self):
             self.filter_set = set(self.filter_set)
         self.scale_lines = bool(self.scale_lines)
 
+
 class __ViewType:
     """
     PRIVATE: A simple identifier class for identifying view types, a view
     will inherit from the axes class it is wrapping and this type...
     """
     ...
 
+
 # Cache classes so grabbing the same type twice leads to actually getting the
 # same type (and type comparisons work).
 @functools.lru_cache(None)
@@ -201,6 +205,14 @@ def get_children(self) -> List[Artist]:
             # renderer, and therefore to the correct location.
             child_list = super().get_children()
 
+            def filter_check(artist, filter_set):
+                if(filter_set is None):
+                    return True
+                return (
+                    (artist not in filter_set)
+                    and (type(artist) not in filter_set)
+                )
+
             if(self.__renderer is not None):
                 for ax, spec in self.view_specifications.items():
                     mock_renderer = _TransformRenderer(
@@ -219,11 +231,7 @@ def get_children(self) -> List[Artist]:
                         for a in itertools.chain(
                             ax._children,
                             ax.child_axes
-                        ) if(
-                                (spec.filter_set is None)
-                                or ((a not in spec.filter_set)
-                                and (type(a) not in spec.filter_set))
-                        )
+                        ) if(filter_check(a, spec.filter_set))
                     ])
 
             return child_list
@@ -367,4 +375,4 @@ def from_axes(
     View.__name__ = f"{View.__name__}[{axes_class.__name__}]"
     View.__qualname__ = f"{View.__qualname__}[{axes_class.__name__}]"
 
-    return View
+    return View

matplotview/tests/test_view_obj.py

@@ -1,8 +1,8 @@
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import check_figures_equal
 from matplotview.tests.utils import plotting_test, matches_post_pickle
-from matplotview import view, view_wrapper, inset_zoom_axes, \
-                        DEFAULT_RENDER_DEPTH, ViewSpecification
+from matplotview import view, inset_zoom_axes, ViewSpecification
+from matplotview._view_axes import DEFAULT_RENDER_DEPTH, view_wrapper
 import numpy as np
 
 
@@ -38,7 +38,7 @@ def test_getters_and_setters(fig_test, fig_ref):
     assert ax1 in ax3.view_specifications
     assert ax3.view_specifications[ax1].image_interpolation == "nearest"
     assert ax3.get_max_render_depth() == DEFAULT_RENDER_DEPTH
-    assert ax3.view_specifications[ax1].scale_lines == True
+    assert ax3.view_specifications[ax1].scale_lines is True
     assert ax3.view_specifications[ax1].filter_set is None
 
     # Attempt setting to different values...
@@ -62,6 +62,7 @@ def test_getters_and_setters(fig_test, fig_ref):
     ax3.set_xlim(0, 30)
     ax3.set_ylim(0, 30)
 
+
 @plotting_test()
 def test_subplot_view_pickle(fig_test):
     np.random.seed(1)
@@ -74,14 +75,15 @@ def test_subplot_view_pickle(fig_test):
     ax_test1.add_patch(plt.Circle((3, 3), 1, ec="black", fc="blue"))
     ax_test1.text(10, 10, "Hello World!", size=14)
     ax_test1.imshow(im_data, origin="lower", cmap="Blues", alpha=0.5,
-                   interpolation="nearest")
+                    interpolation="nearest")
     ax_test2 = view(ax_test2, ax_test1)
     ax_test2.set_aspect(ax_test1.get_aspect())
     ax_test2.set_xlim(ax_test1.get_xlim())
     ax_test2.set_ylim(ax_test1.get_ylim())
 
     assert matches_post_pickle(fig_test)
 
+
 @plotting_test()
 def test_zoom_plot_pickle(fig_test):
     np.random.seed(1)
@@ -106,6 +108,7 @@ def test_zoom_plot_pickle(fig_test):
 
     assert matches_post_pickle(fig_test)
 
+
 @plotting_test()
 def test_3d_view_pickle(fig_test):
     X = Y = np.arange(-5, 5, 0.25)
@@ -122,4 +125,28 @@ def test_3d_view_pickle(fig_test):
     ax2_test.set_ylim(-10, 10)
     ax2_test.set_zlim(-2, 2)
 
-    assert matches_post_pickle(fig_test)
+    assert matches_post_pickle(fig_test)
+
+
+@plotting_test()
+def test_multiplot_pickle(fig_test):
+    ax_test1, ax_test2, ax_test3 = fig_test.subplots(1, 3)
+
+    ax_test1.add_patch(plt.Circle((1, 1), 1.5, ec="black", fc=(0, 0, 1, 0.5)))
+    ax_test3.add_patch(plt.Circle((3, 1), 1.5, ec="black", fc=(1, 0, 0, 0.5)))
+
+    for ax in (ax_test1, ax_test3):
+        ax.set_aspect(1)
+        ax.relim()
+        ax.autoscale_view()
+
+    ax_test2 = view(
+        view(ax_test2, ax_test1, scale_lines=False),
+        ax_test3, scale_lines=False
+    )
+
+    ax_test2.set_aspect(1)
+    ax_test2.set_xlim(-0.5, 4.5)
+    ax_test2.set_ylim(-0.5, 2.5)
+
+    assert matches_post_pickle(fig_test)

matplotview/tests/test_view_rendering.py

@@ -3,6 +3,7 @@
 from matplotlib.testing.decorators import check_figures_equal
 from matplotview import view, inset_zoom_axes
 
+
 @check_figures_equal(tol=6)
 def test_double_plot(fig_test, fig_ref):
     np.random.seed(1)
@@ -15,7 +16,7 @@ def test_double_plot(fig_test, fig_ref):
     ax_test1.add_patch(plt.Circle((3, 3), 1, ec="black", fc="blue"))
     ax_test1.text(10, 10, "Hello World!", size=14)
     ax_test1.imshow(im_data, origin="lower", cmap="Blues", alpha=0.5,
-                   interpolation="nearest")
+                    interpolation="nearest")
     ax_test2 = view(ax_test2, ax_test1)
     ax_test2.set_aspect(ax_test1.get_aspect())
     ax_test2.set_xlim(ax_test1.get_xlim())
@@ -161,7 +162,9 @@ def test_polar_view(fig_test, fig_ref):
 def test_map_projection_view(fig_test, fig_ref):
     x = np.linspace(-2.5, 2.5, 20)
     y = np.linspace(-1, 1, 20)
-    circ_gen = lambda: plt.Circle((1.5, 0.25), 0.7, ec="black", fc="blue")
+
+    def circ_gen():
+        return plt.Circle((1.5, 0.25), 0.7, ec="black", fc="blue")
 
     # Test case...
     ax_t1 = fig_test.add_subplot(1, 2, 1, projection="hammer")
@@ -215,4 +218,4 @@ def test_double_view(fig_test, fig_ref):
     for ax in (ax_test1, ax_test3, ax_ref1, ax_ref3):
         ax.set_aspect(1)
         ax.relim()
-        ax.autoscale_view()
+        ax.autoscale_view()

matplotview/tests/utils.py

@@ -1,5 +1,3 @@
-import functools
-
 import numpy as np
 import matplotlib.pyplot as plt
 
@@ -23,7 +21,7 @@ def matches_post_pickle(figure):
     return np.all(img_expected == img_result)
 
 
-def plotting_test(num_figs = 1, *args, **kwargs):
+def plotting_test(num_figs=1, *args, **kwargs):
     def plotting_decorator(function):
         def test_plotting():
             plt.close("all")
@@ -36,6 +34,3 @@ def test_plotting():
         return test_plotting
 
     return plotting_decorator
-
-
-