TwoPy 0.3.7__tar.gz → 0.3.8__tar.gz

{twopy-0.3.7 → twopy-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twopy
-Version: 0.3.7
+Version: 0.3.8
 Summary: Two-photon imaging analysis tool with a napari interface.
 Author-email: Gustavo Madeira Santana <fromweb1@gumadeiras.com>
 License-Expression: MIT

{twopy-0.3.7 → twopy-0.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "twopy"
-version = "0.3.7"
+version = "0.3.8"
 description = "Two-photon imaging analysis tool with a napari interface."
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{twopy-0.3.7 → twopy-0.3.8}/src/twopy/napari/plotting/export.py

@@ -388,7 +388,7 @@ def current_recording_image(
     Returns:
         Two-dimensional display-coordinate image.
     """
-    movie_layer = _layer_by_name(viewer, "aligned movie")
+    movie_layer = _visible_layer_by_name(viewer, "aligned movie")
     if movie_layer is not None:
         data = np.asarray(cast(NapariLayerWithData, movie_layer).data)
         if data.ndim == 3:
@@ -397,6 +397,12 @@ def current_recording_image(
         if data.ndim == 2:
             return cast(npt.NDArray[np.float64], data)
 
+    mean_layer = _visible_layer_by_name(viewer, "mean image")
+    if mean_layer is not None:
+        data = np.asarray(cast(NapariLayerWithData, mean_layer).data)
+        if data.ndim == 2:
+            return cast(npt.NDArray[np.float64], data)
+
     mean_image = recording.alignment_valid_crop.crop_image(recording.mean_image)
     return cast(npt.NDArray[np.float64], mean_image)
 
@@ -948,3 +954,11 @@ def _layer_by_name(viewer: object | None, name: str) -> object | None:
         if getattr(layer, "name", None) == name:
             return layer
     return None
+
+
+def _visible_layer_by_name(viewer: object | None, name: str) -> object | None:
+    """Return a named layer only when napari is currently showing it."""
+    layer = _layer_by_name(viewer, name)
+    if layer is None or not bool(getattr(layer, "visible", True)):
+        return None
+    return layer

{twopy-0.3.7 → twopy-0.3.8}/src/twopy/napari/session.py

@@ -269,6 +269,27 @@ def remove_loaded_recording_layers(
         _remove_layer(viewer, layer)
 
 
+def _clear_all_viewer_layers(viewer: object) -> None:
+    """Clear every viewer layer because twopy owns the layer stack."""
+    layer_collection = getattr(viewer, "layers", None)
+    clear = getattr(layer_collection, "clear", None)
+    if callable(clear):
+        clear()
+        return
+
+    for collection_name in ("images", "labels"):
+        collection = getattr(viewer, collection_name, None)
+        if isinstance(collection, list):
+            collection.clear()
+
+    selection = getattr(layer_collection, "selection", None)
+    if selection is not None and hasattr(selection, "active"):
+        try:
+            cast(_LayerSelection, selection).active = None
+        except (AttributeError, TypeError):
+            return
+
+
 def record_loaded_view(
     state: NapariSessionState,
     *,
@@ -444,7 +465,7 @@ def unload_loaded_recording(state: NapariSessionState, index: int) -> None:
 
 
 def unload_all_loaded_recordings(state: NapariSessionState) -> None:
-    """Unload every recording and remove all owned layers from napari.
+    """Unload every recording and clear all twopy-owned layers from napari.
 
     Args:
         state: Mutable napari session state.
@@ -454,8 +475,7 @@ def unload_all_loaded_recordings(state: NapariSessionState) -> None:
     """
     if len(state.loaded_recordings) == 0:
         return
-    for loaded_recording in state.loaded_recordings:
-        remove_loaded_recording_layers(state.viewer, loaded_recording)
+    _clear_all_viewer_layers(state.viewer)
     state.loaded_recordings.clear()
     clear_matching_state = getattr(
         state.group_matching_panel,

{twopy-0.3.7 → twopy-0.3.8}/src/twopy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twopy
-Version: 0.3.7
+Version: 0.3.8
 Summary: Two-photon imaging analysis tool with a napari interface.
 Author-email: Gustavo Madeira Santana <fromweb1@gumadeiras.com>
 License-Expression: MIT

{twopy-0.3.7 → twopy-0.3.8}/tests/test_napari_export.py

@@ -4,6 +4,8 @@ Inputs: shared fake napari state and tiny converted recordings.
 Outputs: assertions for one napari workflow area.
 """
 
+from types import SimpleNamespace
+
 from qtpy.QtWidgets import QSizePolicy
 
 from tests.napari_support import (
@@ -41,7 +43,9 @@ from tests.napari_support import (
     temporary_directory,
     unittest,
 )
+from twopy.converted import RecordingData
 from twopy.napari.output_routing import NapariOutputRoute
+from twopy.napari.plotting.export import current_recording_image
 from twopy.napari.plotting.panels import SidebarTextLabel
 
 
@@ -202,6 +206,28 @@ class NapariExportTest(NapariAdapterTestCase):
         self.assertEqual(len(fig.axes), 2)
         np.testing.assert_allclose(fig.axes[1].get_yticks(), (-0.2, 0.0, 0.2))
 
+    def test_recording_export_uses_visible_mean_image_when_movie_hidden(self) -> None:
+        """Confirm recording exports match the visible image layer.
+
+        Inputs: one hidden aligned-movie layer and one visible mean-image layer.
+        Outputs: exported image data comes from the visible mean image.
+        """
+        mean_image = np.array([[1.0, 2.0], [3.0, 4.0]], dtype=np.float64)
+        movie_frame = np.array([[9.0, 9.0], [9.0, 9.0]], dtype=np.float64)
+        viewer = SimpleNamespace(
+            layers={
+                "mean image": SimpleNamespace(data=mean_image, visible=True),
+                "aligned movie": SimpleNamespace(data=movie_frame, visible=False),
+            }
+        )
+
+        image = current_recording_image(
+            viewer=viewer,
+            recording=cast(RecordingData, object()),
+        )
+
+        np.testing.assert_array_equal(image, mean_image)
+
     def test_response_plot_export_draws_epoch_marker(self) -> None:
         """Confirm exported response plots show the coarse epoch top rail.
 

{twopy-0.3.7 → twopy-0.3.8}/tests/test_napari_loaded_recordings.py

@@ -850,6 +850,7 @@ class NapariLoadedRecordingsTest(NapariAdapterTestCase):
 
             unload_buttons["Unload all"].click()
 
+            self.assertEqual(viewer.layer_clear_calls, 1)
             self.assertEqual(loaded_list.count(), 0)
             self.assertFalse(sidebar_buttons["Open Group Matching"].isEnabled())
             self.assertFalse(sidebar_buttons["Reconvert selected"].isEnabled())