arrayview 0.46.0__tar.gz → 0.46.1__tar.gz

{arrayview-0.46.0 → arrayview-0.46.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: arrayview
-Version: 0.46.0
+Version: 0.46.1
 Summary: Fast multi-dimensional array viewer
 Project-URL: Home, https://github.com/oscarvanderheide/arrayview
 Project-URL: Source, https://github.com/oscarvanderheide/arrayview
@@ -56,19 +56,6 @@ uvx arrayview your_array.npy
 uvx arrayview path/to/dicom-series/
 ```
 
-Press `v` for the three-plane ortho view. `Shift+3` replaces the current slice,
-or all three ortho panes, with interactive 3D cutaway renders.
-Drop another file onto an open viewer to compare, open separately, or overlay it.
-Press `Shift+R` for ROI analysis: a compact HUD lists each region's mean and standard
-deviation. The HUD sits beside the image when space allows; drag its header
-to move it. Hover a row or region to highlight its counterpart, and use each
-row's trash icon to delete that region. Open the detailed analysis with the
-button beside the HUD's column headings.
-Hold a flood-fill seed and drag up/down to adjust sensitivity; a translucent tapered gauge
-at the starting point shows the current value and the 1%–100% range. The
-pointer hides while adjusting; only the gauge marker moves.
-
-
 Check the [docs](https://oscarvanderheide.github.io/arrayview/) to learn more. 
 
 **Warning**: Arrayview is still under active development. Things may break or change without warning.

{arrayview-0.46.0 → arrayview-0.46.1}/README.md

@@ -19,19 +19,6 @@ uvx arrayview your_array.npy
 uvx arrayview path/to/dicom-series/
 ```
 
-Press `v` for the three-plane ortho view. `Shift+3` replaces the current slice,
-or all three ortho panes, with interactive 3D cutaway renders.
-Drop another file onto an open viewer to compare, open separately, or overlay it.
-Press `Shift+R` for ROI analysis: a compact HUD lists each region's mean and standard
-deviation. The HUD sits beside the image when space allows; drag its header
-to move it. Hover a row or region to highlight its counterpart, and use each
-row's trash icon to delete that region. Open the detailed analysis with the
-button beside the HUD's column headings.
-Hold a flood-fill seed and drag up/down to adjust sensitivity; a translucent tapered gauge
-at the starting point shows the current value and the 1%–100% range. The
-pointer hides while adjusting; only the gauge marker moves.
-
-
 Check the [docs](https://oscarvanderheide.github.io/arrayview/) to learn more. 
 
 **Warning**: Arrayview is still under active development. Things may break or change without warning.

{arrayview-0.46.0 → arrayview-0.46.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arrayview"
-version = "0.46.0"
+version = "0.46.1"
 description = "Fast multi-dimensional array viewer"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.12"

{arrayview-0.46.0 → arrayview-0.46.1}/src/arrayview/_analysis.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import itertools
+import os
 
 import numpy as np
 
@@ -63,6 +64,9 @@ def _build_metadata(session) -> dict:
         )
     if getattr(session, "array_keys", None):
         meta["array_keys"] = session.array_keys
+        meta["array_key"] = getattr(session, "array_key", None)
+        meta["array_prompt"] = bool(getattr(session, "array_prompt", False))
+        meta["array_filename"] = os.path.basename(getattr(session, "array_filepath", "") or "")
     if collection_spatial_ndim is not None:
         meta["collection_spatial_ndim"] = int(collection_spatial_ndim)
     if getattr(session.data, "_av_ragged", False):

{arrayview-0.46.0 → arrayview-0.46.1}/src/arrayview/_io.py

@@ -67,6 +67,38 @@ def _is_viewable_mat_array(value):
     )
 
 
+def _is_viewable_h5_dataset(ds):
+    """True for HDF5 datasets in a v7.3 .mat file ArrayView can display.
+
+    MATLAB v7.3 stores complex arrays as a compound dtype with 'real' and
+    'imag' fields, which has dtype kind 'V' rather than 'c'.
+    """
+    import h5py
+
+    if not isinstance(ds, h5py.Dataset) or len(ds.shape) < 1:
+        return False
+    names = ds.dtype.names
+    if names:
+        return "real" in names and "imag" in names
+    return ds.dtype.kind in ("b", "i", "u", "f", "c")
+
+
+def _h5_display_dtype(ds):
+    """Dtype string to show for a v7.3 .mat dataset (compound complex → complex)."""
+    if ds.dtype.names:
+        return "complex128" if ds.dtype["real"].itemsize == 8 else "complex64"
+    return str(ds.dtype)
+
+
+def array_choice_placeholder():
+    """Stand-in data for a multi-array file whose array is not chosen yet.
+
+    The session exists so the viewer can open and ask which array to load;
+    nothing from the file is read until the user picks one.
+    """
+    return np.zeros((2, 2), dtype=np.float32)
+
+
 def list_npz_keys(filepath):
     """Return [{key, shape, dtype}] for each ndarray in an .npz file.
 
@@ -106,8 +138,8 @@ def list_mat_keys(filepath):
         keys = []
         for k in f.keys():
             ds = f[k]
-            if isinstance(ds, h5py.Dataset) and len(ds.shape) >= 1 and ds.dtype.kind in ("b", "i", "u", "f", "c"):
-                keys.append({"key": k, "shape": list(ds.shape), "dtype": str(ds.dtype)})
+            if _is_viewable_h5_dataset(ds):
+                keys.append({"key": k, "shape": list(ds.shape), "dtype": _h5_display_dtype(ds)})
         f.close()
         return keys
 
@@ -1726,11 +1758,11 @@ def load_data(filepath, key=None, *, progress=None):
             import h5py
 
             f = h5py.File(filepath, "r")
-            arrays = {k: f[k] for k in f.keys() if isinstance(f[k], h5py.Dataset)}
+            arrays = {k: f[k] for k in f.keys() if _is_viewable_h5_dataset(f[k])}
             if key is not None:
-                return np.array(arrays[key])
+                return _fix_mat_complex(np.array(arrays[key]))
             if len(arrays) == 1:
-                return np.array(next(iter(arrays.values())))
+                return _fix_mat_complex(np.array(next(iter(arrays.values()))))
             raise ValueError(
                 f".mat (v7.3) file contains multiple datasets: {list(arrays.keys())}. "
                 "Select one in the viewer or pass a key."

{arrayview-0.46.0 → arrayview-0.46.1}/src/arrayview/_launcher.py

@@ -1321,6 +1321,9 @@ def _load_session_from_filepath(
         "requested_sid": requested_sid,
         "release_on_disconnect": release_on_disconnect,
         "related_sids": related_sids or [],
+        # Multi-array .npz/.mat: open the first array instead of returning
+        # the key list; the viewer then offers the choice.
+        "array_default": True,
     }
     if source_staging_dir:
         payload["source_staging_dir"] = source_staging_dir
@@ -4691,6 +4694,7 @@ def _serve_daemon(
 
     def _load():
         from arrayview._io import (
+            array_choice_placeholder,
             load_data,
             load_data_with_meta,
             load_dir_collection,
@@ -4705,8 +4709,8 @@ def _serve_daemon(
                 if dir_patterns is None and not cleanup
                 else None
             )
-            # Multi-array .npz/.mat: load the first array so the session is
-            # created, then store keys so the viewer can show a picker.
+            # Multi-array .npz/.mat: create the session with a placeholder and
+            # store the keys; the viewer asks which array to load.
             _array_keys = None
             if dir_patterns is not None:
                 data, spatial_meta, dir_overlay_items, _summary = load_dir_collection(
@@ -4723,8 +4727,12 @@ def _serve_daemon(
                     _array_keys = list_array_keys(filepath)
                 except Exception:
                     pass
-                _load_key = _array_keys[0]["key"] if _array_keys else None
-                data, spatial_meta = load_data_with_meta(filepath, key=_load_key)
+                if _array_keys and len(_array_keys) > 1:
+                    _load_key = None
+                    data, spatial_meta = array_choice_placeholder(), None
+                else:
+                    _load_key = _array_keys[0]["key"] if _array_keys else None
+                    data, spatial_meta = load_data_with_meta(filepath, key=_load_key)
                 dir_overlay_items = None
                 collection_spatial_ndim = None
             else:
@@ -4758,6 +4766,9 @@ def _serve_daemon(
             if _array_keys and len(_array_keys) > 1:
                 session.array_keys = _array_keys
                 session.array_filepath = filepath
+                session.array_key = _load_key
+                # Nothing is loaded yet; the viewer asks once which array to show.
+                session.array_prompt = True
             if spatial_meta is not None:
                 session.original_volume = data
             if rgb:

{arrayview-0.46.0 → arrayview-0.46.1}/src/arrayview/_routes_loading.py

@@ -413,12 +413,18 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
             PENDING_SESSIONS.add(dir_pending_sid)
         try:
             try:
-                from ._io import load_data_with_meta, load_dir_collection, list_array_keys
+                from ._io import (
+                    array_choice_placeholder,
+                    list_array_keys,
+                    load_data_with_meta,
+                    load_dir_collection,
+                )
 
                 # Multi-array .npz/.mat: if no key provided, return the key list so
                 # the client can show a picker instead of blocking on terminal input.
                 _key = body.get("key")
                 _array_keys = None
+                _array_prompt = False
                 if dir_patterns:
                     data, spatial_meta, dir_overlay_items, summary = await asyncio.to_thread(
                         load_dir_collection,
@@ -432,16 +438,22 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
                 elif filepath.endswith(".npz") or filepath.endswith(".mat"):
                     _array_keys = await asyncio.to_thread(list_array_keys, filepath)
                     if len(_array_keys) > 1 and not _key:
-                        return {"array_keys": _array_keys, "filepath": filepath}
+                        if not body.get("array_default"):
+                            return {"array_keys": _array_keys, "filepath": filepath}
+                        # Command-line launch: open the viewer without reading
+                        # any array; it asks which one to load.
+                        _array_prompt = True
+                        data, spatial_meta = array_choice_placeholder(), None
                     if len(_array_keys) == 1 and not _key:
                         _key = _array_keys[0]["key"]
 
-                data, spatial_meta = await asyncio.to_thread(
-                    load_data_with_meta,
-                    filepath,
-                    key=_key,
-                    select=body.get("select"),
-                ) if not dir_patterns else (data, spatial_meta)
+                if not dir_patterns and not _array_prompt:
+                    data, spatial_meta = await asyncio.to_thread(
+                        load_data_with_meta,
+                        filepath,
+                        key=_key,
+                        select=body.get("select"),
+                    )
             except Exception as e:
                 if staging_dir:
                     cleanup_staging_directory(staging_dir)
@@ -482,6 +494,8 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
             if _array_keys and len(_array_keys) > 1:
                 session.array_keys = _array_keys
                 session.array_filepath = filepath
+                session.array_key = _key
+                session.array_prompt = _array_prompt
             if body.get("rgb"):
                 try:
                     await asyncio.to_thread(setup_rgb, session)
@@ -627,15 +641,25 @@ def register_loading_routes(app, *, notify_shells, setup_rgb) -> None:
             return {"error": str(e)}
         session.data = data
         session.shape = data.shape
+        session.spatial_shape = data.shape
+        session.rgb_axis = None
+        session.fft_original_data = None
+        session.fft_axes = None
+        session.reset_caches()
         session.data_version += 1
-        session.raw_cache.clear()
-        session.rgba_cache.clear()
-        session.mosaic_cache.clear()
-        session._raw_bytes = 0
-        session._rgba_bytes = 0
-        session._mosaic_bytes = 0
         session._estimated_mem = session._estimate_memory()
         # Keep array_keys so the user can switch again, but don't auto-prompt
+        session.array_key = key
+        session.array_prompt = False
+        return {"ok": True}
+
+    @app.post("/session/{sid}/array-prompt-done")
+    async def array_prompt_done(sid: str):
+        """Record that the array picker was offered, so it never reopens by itself."""
+        session = SESSIONS.get(sid)
+        if session is None:
+            raise HTTPException(status_code=404, detail="Session not found")
+        session.array_prompt = False
         return {"ok": True}
 
     @app.get("/fs/list")