TwoPy 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

twopy/napari/plotting/docks/response_plot_widget.py

@@ -583,11 +583,12 @@ class _ResponsePlotWidget(QWidget):
         """Show the copyable update command when a newer release is known."""
         if notice is None:
             return
-        self._update_notice_label.setText(notice.command)
+        self._update_notice_label.setText(notice.text)
+        print(notice.text, flush=True)
         if self._viewer is not None:
             refresh_empty_viewer_message(
                 self._viewer,
-                update_command=notice.command,
+                update_command=notice.text,
             )
 
     def _ignore_update_notice_error(self, _error: Exception) -> None:

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/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/napari/version_check.py

@@ -1,7 +1,7 @@
 """Check whether PyPI has a newer twopy release for the napari app.
 
 Inputs: installed twopy version, PyPI JSON metadata, and local UI cache.
-Outputs: an optional copyable update command for the Metadata tab.
+Outputs: an optional copyable update notice for the Metadata tab.
 
 The app only tells users how to update. It does not choose or run an
 environment manager, because users may launch twopy from pip, conda, or another
@@ -97,14 +97,24 @@ class UpdateNotice:
         latest_version: Newer version available from the package index.
         command: Update command shown to the user.
 
-    The Metadata tab shows only ``command`` so twopy does not assume how the
-    user's Python environment is managed.
+    The Metadata tab shows text the user can copy. The command stays plain so
+    twopy does not assume how the user's Python environment is managed.
     """
 
     current_version: str
     latest_version: str
     command: str = PIP_UPDATE_COMMAND
 
+    @property
+    def text(self) -> str:
+        """Return the copyable user-facing update notice."""
+        return (
+            "Update available!\n"
+            f"Latest version is {self.latest_version}.\n"
+            "To update, run:\n"
+            f"{self.command}"
+        )
+
 
 def check_for_update(
     *,
@@ -131,9 +141,9 @@ def check_for_update(
         Update notice, or ``None`` when twopy is current or the check cannot
         prove that a newer final release exists.
 
-    A fresh cache avoids one network request per launch. If PyPI is unreachable
-    and an older cache already proves a newer version exists, twopy can still
-    show the update command.
+    A fresh cache avoids one network request per launch only after it has
+    already seen a newer version. If PyPI is unreachable and an older cache
+    proves a newer version exists, twopy can still show the update command.
     """
     checked_now = _utc(now)
     cache = read_version_check_cache(state_file=state_file)
@@ -261,7 +271,7 @@ def _cache_is_fresh(
         latest = Version(cache.latest_version)
     except InvalidVersion:
         return False
-    if latest < current:
+    if latest <= current:
         return False
     return now - checked_at <= max_age
 

{twopy-0.3.6.dist-info → twopy-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twopy
-Version: 0.3.6
+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.6.dist-info → twopy-0.3.8.dist-info}/RECORD

@@ -114,13 +114,13 @@ twopy/napari/protocols.py,sha256=ZZKBrihoXNzBYdPp7z7dB9aetZsHrcWwYEdJ40w_w08,396
 twopy/napari/responses.py,sha256=5pehTKhX0vXt243uH8RorHO0Mnwc_AhTGFujJeL8hoQ,11803
 twopy/napari/roi.py,sha256=C74NY22w1ZwFSikb3IWXOXXv3yQv91KBGBQ4TQqYCVE,14901
 twopy/napari/roi_signatures.py,sha256=f7agEqdEKlRYFZBTV6zTDobOSpKy5A3FpP0_HYdg_7o,618
-twopy/napari/session.py,sha256=xZpGp2zxEqXQ76PgL6qnRouX9vd61KA82tM1ABXDTkw,18356
+twopy/napari/session.py,sha256=wcpBmQHoKQ9vZPLs39a_t6GLMCnuj4QcxSiL7bVOZlA,19012
 twopy/napari/sidebar.py,sha256=wBMWvVlSUJdM8uRfq1KI6ebN3Da0nLZjenIyojGQn2o,8520
 twopy/napari/state.py,sha256=P4QD9XZdeHvm_Ebjn7nOqV49gmDUTqBr0kSlOSZruhU,7337
 twopy/napari/text.py,sha256=amsxpoq4zMj5sHnNIiWpcVS5sS2KzIh7d1vQD2C4paE,2127
 twopy/napari/trial_timeline.py,sha256=oZSrYDEWfV60mrI9yekc813cc2W8-8EQZVwb7EUQn74,24349
 twopy/napari/types.py,sha256=yBHw9FSWFdjf8Xp-bK2SKBlH2BW7nIhUgPZceG63amc,1201
-twopy/napari/version_check.py,sha256=hOBIfVb2_YwFqGh9LxwCDaYfTv4oOIqGqZqfDEFCG-A,8730
+twopy/napari/version_check.py,sha256=YzU8-fzbcPpCxrdOPciudVnRKi4f2tAS7nWhkanm4R4,9084
 twopy/napari/viewer.py,sha256=FIIRjPmuBkgQshTNFVXzXQFtubgnMI2KOs4eAiXhMq4,22079
 twopy/napari/assets/twopy-app-icon-128.png,sha256=93BO_VF7_CsUCRKpd5OrIid0ax3eV1vUciUtc8UyjP8,10629
 twopy/napari/assets/twopy-app-icon-16.png,sha256=uTRc_JlpzN1jNrWAu4Zi_xUd2nTvNa9TI--yzkGoJZs,1284
@@ -146,7 +146,7 @@ twopy/napari/group_matching/window.py,sha256=bLxT-qUAjzSkJVhynBeQXKMZIfeIlWl5gq1
 twopy/napari/plotting/__init__.py,sha256=JWUrDXYi6x8YYMrzGZyJtIKz6U8-CR9cVxDIkNsnuVY,1572
 twopy/napari/plotting/data.py,sha256=Rpiy_NePnd56-ixunN8inp8ez57Vfn41h-UhBE5pZX0,16343
 twopy/napari/plotting/dff_options.py,sha256=-Jwa5A15qJpKYUFnQi8ZedftPZUTWsdQ-IXy-T3VWu8,15956
-twopy/napari/plotting/export.py,sha256=BeySQQ-SUg_7bFYMEj4C1z1TKoyVh2jlCts4wh2YMDg,30338
+twopy/napari/plotting/export.py,sha256=rEXVzXW1ojgphi53CI0djOIs4f1FtpQsZkMis_4ZUUY,30891
 twopy/napari/plotting/export_controls.py,sha256=oy0k7Zi3Iyv5Fhz1Wx4qWwxU-ZYsmMAzVxhriVI6w4M,11105
 twopy/napari/plotting/form_controls.py,sha256=qqiiOzfIT7oHHlft9qUBf2Z_6rUZP8vfX5XCW8tp_hA,2526
 twopy/napari/plotting/label_visibility.py,sha256=415JAD6dqYYJvGIikgay2RPTHEc2FEsULzzlTjLzeVE,9246
@@ -167,7 +167,7 @@ twopy/napari/plotting/docks/options_panel.py,sha256=Lp5sieUtzt8iRetyv8_P_4-ST5nK
 twopy/napari/plotting/docks/paths.py,sha256=hR2kP5-benxEfxpDedpbbosW1h2c4-no9zN6Da6DD94,4253
 twopy/napari/plotting/docks/plot_area.py,sha256=m7tvd9DmESq-4nhwIXqVVahCmlzTF1oRF44ph3hpdBs,12765
 twopy/napari/plotting/docks/response_map_area.py,sha256=5jFrfH0CZOp8D70-Wt6eNDlS-ny7SuzxdthVdzUWIgk,16033
-twopy/napari/plotting/docks/response_plot_widget.py,sha256=YkytmkSE2P7REGSeocE1XyQHqy0NKllKFV5oBUJ8-5I,88192
+twopy/napari/plotting/docks/response_plot_widget.py,sha256=5rXk3JaRUT4xdfBP_l0c4reWNt1N5xv9Yr7TdU9IPbo,88225
 twopy/napari/plotting/docks/save_actions.py,sha256=06xSrv_xzti7Ii1LtERiSQKDf4bt8898BucxxnHNgFk,6063
 twopy/napari/plotting/docks/visibility_state.py,sha256=kmj6fwRV1IrUPFOjAMaHC92P8fNOtWqpzTPJhPUKFKg,5229
 twopy/napari/plotting/roi_generation/__init__.py,sha256=-NGko64QCV08KtQR0L6jTswhAk-sQZzWWBE9hO-ax20,1067
@@ -180,8 +180,8 @@ twopy/parity/psycho5.py,sha256=Xg7Q8Ipyv6hH9AXYKLxU0cLx9z10uWDLg7PNxT-rDyk,13908
 twopy/parity/roi.py,sha256=Q3deH6xRGCmTXASTlPHQgzH7FhBWkdjRUgh9skyS8j0,4975
 twopy/parity/roi_extraction.py,sha256=Z-ABVSB4Z6IUqZMWU1bq6Ko1tGP4uTdzk3As0gHaHTA,10372
 twopy/parity/saved_analysis.py,sha256=Kbpaxh1zapR5XxnHEkin8r4mEZX8kEtonudeZcwI7Dw,5597
-twopy-0.3.6.dist-info/METADATA,sha256=8YmH-hI7C1Bz1ZkRgr190obrkmVPYrIFoAnaOfkdZfA,4143
-twopy-0.3.6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-twopy-0.3.6.dist-info/entry_points.txt,sha256=RnmRKOxEv5ZwLN-dArdSB678gM2iNxbE30VwRpwhp8o,44
-twopy-0.3.6.dist-info/top_level.txt,sha256=8MB6QGpnHMTeTfEE543DOr676HcemeoELujrJkFcvak,6
-twopy-0.3.6.dist-info/RECORD,,
+twopy-0.3.8.dist-info/METADATA,sha256=jjT2lCro_K1biXVpbzMoRSipJPkbzaJ3nvZU8USEsxo,4143
+twopy-0.3.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+twopy-0.3.8.dist-info/entry_points.txt,sha256=RnmRKOxEv5ZwLN-dArdSB678gM2iNxbE30VwRpwhp8o,44
+twopy-0.3.8.dist-info/top_level.txt,sha256=8MB6QGpnHMTeTfEE543DOr676HcemeoELujrJkFcvak,6
+twopy-0.3.8.dist-info/RECORD,,