Merge pull request #214 from hanjinliu/fix-roi-widget

Record recent files for each profile

Author: hanjinliu

mkdocs.yml

@@ -3,7 +3,7 @@ site_description: An infinitely extensible and reusable applications framework.
 repo_name: himena
 repo_url: https://github.com/hanjinliu/himena
 
-copyright: Copyright (c) 2024 - 2024 Hanjin Liu
+copyright: Copyright (c) 2024 - 2026 Hanjin Liu
 
 theme:
   name: material

pyproject.toml

@@ -82,7 +82,7 @@ testing = [
 docs = [
   "mkdocs",
   "mkdocs-autorefs",
-  "mkdocs-material",
+  "mkdocs-material==9.7.1",
   "mkdocs-material-extensions",
   "mkdocstrings",
   "mkdocstrings-python",

src/himena/_open_recent.py

@@ -54,24 +54,24 @@ def __init__(
         self,
         app: HimenaApplication,
         menu_id: MenuId = MenuId.FILE_RECENT,
-        file_name: str = "recent.json",
+        dir_name: str = "recent",
         group: str = ActionGroup.RECENT_FILE,
         n_history: int = 60,
     ):
         self._disposer = lambda: None
         self._app = app
         self._menu_id = menu_id
-        self._file_name = file_name
+        self._dir_name = dir_name
         self._group = group
         self._n_history = n_history
 
     def update_menu(self):
         """Update the menu for the recent file list."""
         if self._app.name in self._MENU_UPDATED:
-            return None
+            return
         file_args = self._list_args_for_recent()[::-1]
         if len(file_args) == 0:
-            return None
+            return
         num_recent = self.num_recent_in_menu()
         actions = [
             self.action_for_file(path, plugin, in_menu=i < num_recent)
@@ -96,7 +96,7 @@ def default(cls, app: HimenaApplication) -> RecentFileManager:
     def _list_args_for_recent(self) -> list[tuple[_PathInput, str | None]]:
         """List the recent files (older first)."""
 
-        _path = data_dir() / self._file_name
+        _path = self.recent_json_path()
         if not _path.exists():
             return []
         with open(_path) as f:
@@ -120,9 +120,9 @@ def _list_args_for_recent(self) -> list[tuple[_PathInput, str | None]]:
     def append_recent_files(
         self,
         inputs: list[tuple[_PathInput, str | None]],
-    ) -> None:
+    ):
         """Append file(s) with plugin to the user history (duplication OK)."""
-        _path = data_dir() / self._file_name
+        _path = self.recent_json_path()
         if _path.exists():
             with open(_path) as f:
                 all_info = json.load(f)
@@ -141,17 +141,11 @@ def append_recent_files(
             if each in existing_paths:
                 to_remove.append(existing_paths.index(each))
             if isinstance(each, list):
-                all_info.append(
-                    {"type": "group", "path": each, "plugin": plugin, "time": now}
-                )
+                all_info.append(_make_info("group", each, plugin, now))
             elif Path(each).is_file():
-                all_info.append(
-                    {"type": "file", "path": each, "plugin": plugin, "time": now}
-                )
+                all_info.append(_make_info("file", each, plugin, now))
             else:
-                all_info.append(
-                    {"type": "folder", "path": each, "plugin": plugin, "time": now}
-                )
+                all_info.append(_make_info("folder", each, plugin, now))
         for i in sorted(to_remove, reverse=True):
             all_info.pop(i)
         if len(all_info) > self._n_history:
@@ -201,6 +195,14 @@ def id_title_for_file(self, file: _PathInput) -> tuple[str, str]:
             title = f"{len(file)} files such as {file[0]}"
         return id, title
 
+    def recent_json_path(self):
+        """Path to the JSON file that stores the recent file list."""
+        _data_dir = data_dir()
+        _recent_dir = _data_dir / self._dir_name
+        if not _recent_dir.exists():
+            _recent_dir.mkdir(parents=True, exist_ok=True)
+        return _recent_dir / f"{self._app.name}.json"
+
 
 class RecentSessionManager(RecentFileManager):
     _MENU_UPDATED: set[str] = set()
@@ -209,7 +211,7 @@ class RecentSessionManager(RecentFileManager):
     def default(cls, app: HimenaApplication) -> RecentSessionManager:
         return cls(
             app,
-            file_name="recent_sessions.json",
+            dir_name="recent_sessions",
             group=ActionGroup.RECENT_SESSION,
             n_history=20,
         )
@@ -250,3 +252,7 @@ def _update_annotation(obj):
 
     obj.__annotations__ = {"ui": MainWindow}
     return obj
+
+
+def _make_info(typ: str, path, plugin: str | None, now: str) -> dict:
+    return {"type": typ, "path": path, "plugin": plugin, "time": now}

src/himena/utils/ndobject.py

@@ -128,7 +128,6 @@ def extend(self, other: Self) -> None:
         else:
             self.items = np.concatenate([self.items, other.items], axis=0)
             self.indices = np.concatenate([self.indices, other.indices], axis=0)
-        return None
 
     def pop(self, index: int) -> _T:
         item = self.items[index]
@@ -202,8 +201,10 @@ def map_elements(
     def simplified(self) -> Self:
         """Drop axis"""
         cannot_drop = np.all(self.indices >= 0, axis=0)
+        if all(cannot_drop):
+            return self
         indices = np.take(self.indices, cannot_drop, axis=1)
-        axis_names = [a for i, a in enumerate(self.axis_names) if i in cannot_drop]
+        axis_names = [a for i, a in enumerate(self.axis_names) if cannot_drop[i]]
         return self.__class__(
             items=self.items,
             indices=indices,

src/himena_builtins/qt/widgets/image.py

@@ -436,13 +436,13 @@ def dropped_callback(self, model: WidgetDataModel):
         if model.type == StandardType.ROIS:
             # dropping ROIs to concatenate to the current ROI list
             if isinstance(roi_list := model.value, roi.RoiListModel):
+                roi_list = roi_list.coerce_dimensions(self._dims_slider.axis_names())
                 self._roi_col.extend_from_standard_roi_list(roi_list)
                 self._update_rois()
             self._is_modified = True
             return DropResult(delete_input=False)
         elif model.type == StandardType.IMAGE_LABELS:
             raise NotImplementedError("Merging with labels is not implemented yet.")
-        return None
 
     @validate_protocol
     def widget_resized_callback(self, old: Size, new: Size):