Merge branch 'master' into data-drop-method

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.7.0 # Replace by any tag/version: https://github.com/psf/black/tags
+    rev: 23.12.1 # Replace by any tag/version: https://github.com/psf/black/tags
     hooks:
       - id: black
         language_version: python3 # Should be a command that runs python3.6+
         args: ["--line-length", "99"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude: datasets|.data$

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 ### Added
 - `Data.squeeze`: squeezing the data object to the shape of the axes.
 
+### Fixed
+- `interact2D`: fixed bug where use_imshow broke the sliders
+
 ## [3.5.0]
 
 ### Fixed

WrightTools/artists/_base.py

@@ -130,7 +130,7 @@ def _parse_plot_args(self, *args, **kwargs):
                     raise wt_exceptions.ValueError("Cannot squeeze axis to fit channel")
             zi = data.channels[channel_index].points
             if not zi.ndim == 2:
-                raise wt_exceptions.DimensionalityError(zi.ndim, data.ndim)
+                raise wt_exceptions.DimensionalityError(2, zi.ndim)
             squeeze = tuple([0 if i else slice(None) for i in squeeze])
             if plot_type == "imshow":
                 if "aspect" not in kwargs.keys():
@@ -646,7 +646,7 @@ def plot(self, *args, **kwargs):
             zi = data.channels[channel_index].points
             xi = xa[squeeze]
             if not zi.ndim == 1:
-                raise wt_exceptions.DimensionalityError(1, data.ndim)
+                raise wt_exceptions.DimensionalityError(1, zi.ndim)
             args = [xi, zi] + args
         else:
             data = None

WrightTools/artists/_interact.py

@@ -445,8 +445,8 @@ def update_slider(info, use_imshow=use_imshow):
             )
         if use_imshow:
             transpose = _order_for_imshow(
-                current_state[xaxis.natural_name][:],
-                current_state[yaxis.natural_name][:],
+                current_state.dat[xaxis.natural_name][:],
+                current_state.dat[yaxis.natural_name][:],
             )
             obj2D.set_data(current_state.dat[channel.natural_name][:].transpose(transpose))
         else:

tests/artists/test_interact2D.py

@@ -82,7 +82,7 @@ def test_4D():
     data.create_variable("d_1", values=tau[None, None, None, :], units="ps")
 
     data.transform("w_1", "w_2", "w_3", "d_1")
-    return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True)
+    return wt.artists.interact2D(data, xaxis=0, yaxis=1, local=True, use_imshow=True)
 
 
 if __name__ == "__main__":