Changed hard-coded slice 9 to z-dimension - 1

ruaridhg · ruaridhg · commit 040b614906b5 · 2023-06-02T14:50:22.000+01:00
diff --git a/src/napari_matplotlib/scatter.py b/src/napari_matplotlib/scatter.py
@@ -2,7 +2,6 @@
 
 import napari
 import numpy.typing as npt
-from numpy import array
 from qtpy.QtWidgets import QComboBox, QLabel, QVBoxLayout, QWidget
 
 from .base import NapariMPLWidget
@@ -94,8 +93,6 @@ def _get_data(self) -> Tuple[npt.NDArray[Any], npt.NDArray[Any], str, str]:
         """
         x = self.layers[0].data[self.current_z]
         y = self.layers[1].data[self.current_z]
-        print("x data size = ", array(x).shape)
-        print("y data size = ", array(y).shape)
         x_axis_name = self.layers[0].name
         y_axis_name = self.layers[1].name
 
diff --git a/src/napari_matplotlib/tests/scatter/test_scatter.py b/src/napari_matplotlib/tests/scatter/test_scatter.py
@@ -1,6 +1,7 @@
 from copy import deepcopy
 
 import pytest
+from numpy import array
 
 from napari_matplotlib import ScatterWidget
 
@@ -40,7 +41,7 @@ def test_scatter_3D(make_napari_viewer, brain_data):
     viewer.layers.selection.clear()
     # pdb.set_trace()
     axis = viewer.dims.last_used
-    slice_no = 9
+    slice_no = array(brain_data[0]).shape[0] - 1
     viewer.dims.set_current_step(axis, slice_no)
     # Select images
     viewer.layers.selection.add(viewer.layers[0])
diff --git a/src/napari_matplotlib/tests/test_histogram.py b/src/napari_matplotlib/tests/test_histogram.py
@@ -1,6 +1,7 @@
 from copy import deepcopy
 
 import pytest
+from numpy import array
 
 from napari_matplotlib import HistogramWidget
 from napari_matplotlib.tests.helpers import (
@@ -24,7 +25,7 @@ def test_histogram_3D(make_napari_viewer, brain_data):
     viewer = make_napari_viewer()
     viewer.add_image(brain_data[0], **brain_data[1])
     axis = viewer.dims.last_used
-    slice_no = 9
+    slice_no = array(brain_data[0]).shape[0] - 1
     viewer.dims.set_current_step(axis, slice_no)
     fig = HistogramWidget(viewer).figure
     # Need to return a copy, as original figure is too eagerley garbage
diff --git a/src/napari_matplotlib/tests/test_slice.py b/src/napari_matplotlib/tests/test_slice.py
@@ -1,6 +1,7 @@
 from copy import deepcopy
 
 import pytest
+from numpy import array
 
 from napari_matplotlib import SliceWidget
 
@@ -10,7 +11,7 @@ def test_slice_3D(make_napari_viewer, brain_data):
     viewer = make_napari_viewer()
     viewer.add_image(brain_data[0], **brain_data[1])
     axis = viewer.dims.last_used
-    slice_no = 9
+    slice_no = array(brain_data[0]).shape[0] - 1
     viewer.dims.set_current_step(axis, slice_no)
     fig = SliceWidget(viewer).figure
     # Need to return a copy, as original figure is too eagerley garbage
