add more tests

Author: chrishavlin

src/yt_napari/_tests/test_layers_to_yt.py

@@ -0,0 +1,81 @@
+import napari
+import numpy as np
+import pytest
+from yt.data_objects.static_output import Dataset
+
+from yt_napari.viewer import layers_to_yt
+
+
+@pytest.fixture
+def some_images():
+
+    sh = (8, 16, 32)
+    n_images = 4
+    images = []
+
+    for im in range(n_images):
+        images.append(
+            {
+                "value": np.random.random(sh),
+                "name": f"image_{im}",
+            }
+        )
+
+    return images
+
+
+def test_layers_to_yt(
+    make_napari_viewer,
+    some_images,
+):
+
+    viewer: napari.Viewer = make_napari_viewer()
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    bbox = np.array([[-1.0, 1.0], [-1.0, 1.0], [-1.5, 2.0]])
+    ds = layers_to_yt(viewer, layers=["image_0", "image_1"], bbox=bbox)
+
+    assert isinstance(ds, Dataset)
+    assert len(ds.field_list) == 2
+
+
+def test_layers_bad_names(make_napari_viewer, some_images):
+    viewer: napari.Viewer = make_napari_viewer()
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    with pytest.raises(RuntimeError, match="Layer notalayer not found"):
+        _ = layers_to_yt(viewer, layers=["image_0", "notalayer"])
+
+    with pytest.raises(RuntimeError, match="Layer 100 not found"):
+        _ = layers_to_yt(viewer, layers=[0, 100])
+
+
+def test_layers_bad_shape(make_napari_viewer, some_images):
+    viewer: napari.Viewer = make_napari_viewer()
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    viewer.add_image(np.random.random((10, 10, 20)), name="bad_shape")
+
+    with pytest.raises(RuntimeError, match="Layer notalayer not found"):
+        _ = layers_to_yt(viewer, layers=["image_0", "notalayer"])
+
+    with pytest.raises(RuntimeError, match="Can only export layers as a yt dataset"):
+        _ = layers_to_yt(viewer)
+
+
+def test_additional_kwargs(
+    make_napari_viewer,
+    some_images,
+):
+    viewer: napari.Viewer = make_napari_viewer()
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    ds = layers_to_yt(viewer, length_unit="km")
+    assert len(ds.field_list) == len(some_images)
+    assert ds.domain_right_edge.to("km")[2].d == 1

src/yt_napari/_tests/test_phaseplot_widget.py

@@ -3,9 +3,10 @@
 import numpy as np
 import pytest
 from napari import Viewer
+from qtpy.QtWidgets import QComboBox, QVBoxLayout
 from yt.visualization.profile_plotter import PhasePlot
 
-from yt_napari._widget_2d_plots import YTPhasePlot
+from yt_napari._widget_2d_plots import YTPhasePlot, _validate_cmyt_name
 
 
 @pytest.fixture
@@ -49,7 +50,7 @@ def test_phaseplot_widget(
     r.callback_container.apply_logx.value = True
     r.callback_container.apply_logy.value = True
     r.callback_container.apply_logz.value = True
-
+    r.callback_container.reverse_cmap.value = True
     r.callback_container.save.value = True
 
     svfig = str(tmp_path / "pp_fig.png")
@@ -58,3 +59,112 @@ def test_phaseplot_widget(
     assert os.path.isfile(svfig)
 
     r.deleteLater()
+
+
+def test_phaseplot_fields(
+    make_napari_viewer,
+    some_images,
+):
+    viewer: Viewer = make_napari_viewer()
+    r = YTPhasePlot(napari_viewer=viewer)
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    r.update_layers.native.click()
+
+    r.layer_1.setCurrentIndex(len(some_images))
+    assert r.layer_1.currentText() == r._default_index_fields[0]
+    assert r.layer_1.currentIndex() == len(some_images)
+
+    r.render_button.native.click()
+
+    r.deleteLater()
+
+
+def test_weight_field(
+    make_napari_viewer,
+    some_images,
+):
+    viewer: Viewer = make_napari_viewer()
+    r = YTPhasePlot(napari_viewer=viewer)
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    r.update_layers.native.click()
+
+    r.layer_4_weight.setCurrentIndex(1)
+    assert r.layer_4_weight.currentText() == some_images[0]["name"]
+
+    r.render_button.native.click()
+    r.deleteLater()
+
+
+def test_apply_callbacks_without_render(
+    make_napari_viewer,
+    some_images,
+):
+    viewer: Viewer = make_napari_viewer()
+    r = YTPhasePlot(napari_viewer=viewer)
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    r.update_layers.native.click()
+
+    assert r.phase_plot is None
+    r.run_callback_button.native.click()
+    assert isinstance(r.phase_plot, PhasePlot)
+    r.deleteLater()
+
+
+@pytest.mark.parametrize(
+    "input_name,expected",
+    [("cmapname.cmyt", "cmyt.cmapname"), ("notacmytcmap", "notacmytcmap")],
+)
+def test_validate_cmyt_name(input_name: str, expected: str):
+    result = _validate_cmyt_name(input_name)
+    assert result == expected
+
+
+def test_add_layer_dropdown(
+    make_napari_viewer,
+    some_images,
+):
+    viewer: Viewer = make_napari_viewer()
+    r = YTPhasePlot(napari_viewer=viewer)
+
+    for im in some_images:
+        viewer.add_image(im["value"], name=im["name"])
+
+    r.update_layers.native.click()
+
+    sub_QVbox = QVBoxLayout()
+
+    r.add_layer_dropdown(
+        "teststr",
+        "teststr2",
+        sub_QVbox,
+        value=None,
+    )
+    n_items = sub_QVbox.count()
+    index = n_items - 1
+    # dropdown gets added to an inner layout
+    layer_hbox = sub_QVbox.itemAt(index).layout()
+    # should be 2 widgets here
+    n_items = layer_hbox.count()
+    assert n_items == 2
+    assert isinstance(layer_hbox.itemAt(1).widget(), QComboBox)
+
+    r.add_layer_dropdown(
+        "teststr",
+        "teststr2",
+        sub_QVbox,
+        value=None,
+        value_index=100,
+    )
+
+    sub_QVbox.deleteLater()
+
+    r.deleteLater()

src/yt_napari/_widget_2d_plots.py

@@ -17,7 +17,7 @@
 from yt_napari._gui_utilities import clearLayout
 from yt_napari.viewer import layers_to_yt
 
-if TYPE_CHECKING:
+if TYPE_CHECKING:  # pragma: no cover
     import matplotlib.figure
 
 
@@ -144,13 +144,21 @@ def set_figure(self, figure: "matplotlib.figure.Figure"):
 
 
 class YTPhasePlot(QWidget):
+
+    _default_index_fields = ["x", "y", "z", "ones"]
+
     def __init__(self, napari_viewer: "napari.viewer.Viewer", parent=None):
         super().__init__(parent)
         self.viewer = napari_viewer
         root_vbox = QVBoxLayout()
 
         active_layers = self.available_layer_list
         self.current_layers = active_layers
+
+        self.layer_1: QComboBox = None
+        self.layer_2: QComboBox = None
+        self.layer_3: QComboBox = None
+        self.layer_4_weight: QComboBox = None
         self.add_layer_dropdown("layer_1", "x field", root_vbox, value_index=0)
         self.add_layer_dropdown("layer_2", "y field", root_vbox, value_index=1)
         self.add_layer_dropdown("layer_3", "z field", root_vbox, value_index=2)
@@ -304,8 +312,8 @@ def apply_callbacks_and_render(self):
     def available_layer_list(self):
         layers = [layer.name for layer in self.viewer.layers]
 
-        dims = ["x", "y", "z", "ones"]  # TODO: check ndim
-        layers += dims
+        # TODO: check ndim
+        layers += self._default_index_fields
         return layers
 
 

src/yt_napari/viewer.py

@@ -678,12 +678,6 @@ def layers_to_yt(
                 f"{available_layer_names}."
             )
             raise RuntimeError(msg)
-        elif not isinstance(layer, str) and not isinstance(layer, int):
-            msg = (
-                f"Unexpected layer type, type({layer})={type(layer)} but it "
-                f" must be a str or int."
-            )
-            raise TypeError(msg)
 
     layer_shape = available_layers[layers[0]].data.shape
     # ndim = available_layers[layers[0]].ndim  # use below...