v0.6.1 updates

CHANGELOG.md

@@ -19,6 +19,12 @@
 ### Changed    
 ### Removed    
 
+## [0.6.1] - 2024-01-14
+### Added    
+* Testing
+### Changed    
+* Fixed `axstereo.autoscale_z()` not doing anything if `zlim` was set
+
 ## [0.6.0] - 2024-01-14
 ### Added    
 * Church full color anaglyph example

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpl_stereo"
-version = "0.6.0"
+version = "0.6.1"
 description = "See your matplotlib plots in 3D by making stereograms and anaglyphs"
 authors = ["Scott Shambaugh <[email protected]>"]
 license = "MIT"

src/mpl_stereo/AxesStereo.py

@@ -234,6 +234,7 @@ def __init__(self,
         self.zautoscale = True
         if self.zlim is not None or zscale is not None:
             self.zautoscale = False
+        self.is_redrawing = False
 
         self.artists_left = []
         self.artists_right = []
@@ -391,15 +392,22 @@ def autoscale_z(self):
         """
         self.zautoscale = True
         self.zlim = self._calc_bounding_zlim()
+        for _, _, kwargs in self.artist_args:
+            kwargs.pop('zlim', None)
         self.redraw()
 
     def _calc_bounding_zlim(self) -> tuple[float, float]:
         """
         Calculate the z limits that will bound all the z data for all artists.
         """
         zlim = (np.inf, -np.inf)
-        for _, _, kwargs in self.artist_args:
-            z = kwargs['z']
+        for _, args, kwargs in self.artist_args:
+            # Check if 'z' is in the keyword arguments or if there is a third
+            # argument of the same shape as x
+            if 'z' in kwargs:
+                z = kwargs['z']
+            elif len(args) > 0:
+                z, *args = args
             zlim = (min(zlim[0], np.min(z)), max(zlim[1], np.max(z)))
         return zlim
 
@@ -414,10 +422,12 @@ def redraw(self):
         self.artists_right = []
 
         # Plot the data again
+        self.is_redrawing = True
         artist_args = self.artist_args
         self.artist_args = []  # will repopulate in the getattr calls below
         for name, args, kwargs in artist_args:
             getattr(self, name)(*args, **kwargs)
+        self.is_redrawing = False
 
     def plot2d(self,
                ax_left: Axes,
@@ -492,7 +502,7 @@ def plot2d(self,
                                                                    xlim=ax_left.get_xlim())
         self.zscale = zscale
         self.zlim = zlim
-        if len(self.artist_args) > 0:
+        if len(self.artist_args) > 0 and not self.is_redrawing:
             self.redraw()
 
         if isinstance(self, AxesStereo2D):

tests/test_AxesStereo.py

@@ -140,6 +140,9 @@ def test_AxesAnaglyph_zlim():
 
     assert axstereo.get_zlim() == (1, 2)
 
+    axstereo.autoscale_z()  # will redraw
+    assert axstereo.zlim == (0, 9)
+
     n_artists = 5  # from above plot()'s
     assert len(axstereo.artists_left) == n_artists
     assert len(axstereo.artists_right) == n_artists
@@ -210,10 +213,19 @@ def test_AxesAnaglyph():
     assert True
 
 
-def test_AxesAnaglyph_imshow_steroe():
-    # Smoke test imshow_stereo
-    axstereo = AxesAnaglyph()
-    axstereo.imshow_stereo(np.array([[1]]), np.array([[1]]))
+def test_AxesAnaglyph_imshow_stereo():
+    # Smoke test imshow_stereo for scalar data
+    sun_left_data, sun_right_data = _testdata()['sun']
+    for cmap in [None, 'Oranges_r', 'viridis']:
+        axstereo = AxesAnaglyph()
+        axstereo.imshow_stereo(sun_left_data, sun_right_data, cmap=cmap)
+    assert True
+
+    # Smoke test imshow_stereo for RGB data
+    church_left_data, church_right_data = _testdata()['church']
+    for method in ['dubois', 'photoshop', 'photoshop2']:
+        axstereo = AxesAnaglyph()
+        axstereo.imshow_stereo(church_left_data, church_right_data, method=method)
     assert True