Merge pull request #85 from KitwareMedical/fix-layout-manager-registered-layouts-changed

Fix layout manager registered layouts changed

Author: Thibault-Pelletier

tests/test_layout_manager.py

@@ -368,3 +368,48 @@ def test_on_initialize_refreshes_if_current_layout(
         layout_manager.initialize_layout_grid(ui)
 
     a_mock_ui.clear.assert_called_once()
+
+
+def test_emit_current_layout_changed(
+    a_mock_ui,
+    a_mock_view_manager,
+    a_slicer_scene,
+    a_server,
+    a_sagittal_layout,
+    a_coronal_layout,
+):
+    layout_manager = LayoutManager(
+        a_slicer_scene, a_mock_view_manager, a_server, virtual_node=a_mock_ui, is_virtual_node_initialized=False
+    )
+    on_current_layout_changed = mock.MagicMock()
+    layout_manager.current_layout_changed.connect(on_current_layout_changed)
+    layout_manager.register_layout_dict(
+        {
+            "Sagittal": a_sagittal_layout,
+            "Coronal": a_coronal_layout,
+        }
+    )
+    layout_manager.set_layout("Coronal")
+    on_current_layout_changed.assert_called_once_with("Coronal")
+
+
+def test_emit_registered_layouts_changed(
+    a_mock_ui,
+    a_mock_view_manager,
+    a_slicer_scene,
+    a_server,
+    a_sagittal_layout,
+    a_coronal_layout,
+):
+    layout_manager = LayoutManager(
+        a_slicer_scene, a_mock_view_manager, a_server, virtual_node=a_mock_ui, is_virtual_node_initialized=False
+    )
+    on_registered_layouts_changed = mock.MagicMock()
+    layout_manager.registered_layouts_changed.connect(on_registered_layouts_changed)
+    layout_manager.register_layout_dict(
+        {
+            "Sagittal": a_sagittal_layout,
+            "Coronal": a_coronal_layout,
+        }
+    )
+    on_registered_layouts_changed.assert_called_once()

trame_slicer/core/layout_manager.py

@@ -61,13 +61,13 @@ def register_layout(self, layout_id: str, layout: Layout, lazy_initialization: b
         If lazy_initialization is False, the views will not be instantiated unless the passed layout id matches the
         current selected layout id.
         """
-        with self.registered_layouts_changed.emit_once():
-            self._layouts[layout_id] = layout
-            if not lazy_initialization:
-                self.create_layout_views_if_needed(layout_id)
+        self._layouts[layout_id] = layout
+        if not lazy_initialization:
+            self.create_layout_views_if_needed(layout_id)
 
-            if self._current_layout == layout_id:
-                self._refresh_layout()
+        if self._current_layout == layout_id:
+            self._refresh_layout()
+        self.registered_layouts_changed.emit()
 
     def set_layout(self, layout_id: str) -> None:
         if layout_id == self._current_layout:
@@ -137,8 +137,9 @@ def register_layout_dict(self, layout_dict: dict[str, Layout], lazy_initializati
         :param lazy_initialization: If True, the layout views will not be created until explicitly requested by
             set_layout or create_layout_views_if_needed
         """
-        for layout_id, layout in layout_dict.items():
-            self.register_layout(layout_id, layout, lazy_initialization)
+        with self.registered_layouts_changed.emit_once():
+            for layout_id, layout in layout_dict.items():
+                self.register_layout(layout_id, layout, lazy_initialization)
 
     @classmethod
     def default_grid_configuration(cls) -> dict[str, Layout]: