chore: take reviews into account

Author: Justineantoine

examples/viewer_lib/logic/medical_viewer_logic.py

@@ -5,7 +5,7 @@
 from trame_slicer.core import LayoutManager, SlicerApp
 from trame_slicer.rca_view import register_rca_factories
 
-from ..ui import MedicalViewerUI, StateId
+from ..ui import MedicalViewerUI, SegmentEditorUI, StateId
 from .base_logic import BaseLogic
 from .layout_button_logic import LayoutButtonLogic
 from .load_volume_logic import LoadVolumeLogic
@@ -47,7 +47,7 @@ def layout_manager(self) -> LayoutManager:
         return self._layout_button_logic.layout_manager
 
     def set_ui(self, ui: MedicalViewerUI):
-        self._segment_editor_logic.set_ui(ui.segment_editor_ui)
+        self._segment_editor_logic.set_ui(ui.tool_registry[SegmentEditorUI])
         self._layout_button_logic.set_ui(ui.layout_button)
         self._markups_logic.set_ui(ui.markups_button)
         self._load_files_logic.set_ui(ui.load_volume_buttons)

examples/viewer_lib/logic/segmentation/segment_editor_logic.py

@@ -140,9 +140,9 @@ def _on_segment_display_changed(self, display_state: SegmentDisplayState) -> Non
         if not self._segmentation_display:
             return
 
-        self._segmentation_display.set_opacity_2d(display_state.opacity_2d)
-        self._segmentation_display.set_opacity_3d(display_state.opacity_3d)
-        self._segmentation_display.set_opacity_mode(display_state.display_mode)
+        self._segmentation_display.set_opacity_2d(display_state.opacity_2d.value)
+        self._segmentation_display.set_opacity_3d(display_state.opacity_3d.value)
+        self._segmentation_display.set_opacity_mode(display_state.opacity_mode)
         self.segmentation_editor.set_surface_representation_enabled(display_state.show_3d)
 
     def _on_volume_changed(self, **_kwargs) -> None:

examples/viewer_lib/logic/segmentation_app_logic.py

@@ -3,7 +3,7 @@
 from trame_slicer.core import LayoutManager, SlicerApp
 from trame_slicer.rca_view import register_rca_factories
 
-from ..ui import SegmentationAppUI, StateId
+from ..ui import SegmentationAppUI, SegmentEditorUI, StateId
 from .base_logic import BaseLogic
 from .layout_button_logic import LayoutButtonLogic
 from .load_volume_logic import LoadVolumeLogic
@@ -34,6 +34,6 @@ def layout_manager(self) -> LayoutManager:
         return self._layout_button_logic.layout_manager
 
     def set_ui(self, ui: SegmentationAppUI):
-        self._segment_editor_logic.set_ui(ui.segment_editor_ui)
+        self._segment_editor_logic.set_ui(ui.tool_registry[SegmentEditorUI])
         self._layout_button_logic.set_ui(ui.layout_button)
         self._load_files_logic.set_ui(ui.load_volume_items_buttons)

examples/viewer_lib/ui/__init__.py

@@ -17,6 +17,7 @@
     SegmentDisplayState,
     SegmentDisplayUI,
     SegmentEditorState,
+    SegmentEditorToolbarUI,
     SegmentEditorUI,
     SegmentEditState,
     SegmentEditUI,
@@ -61,6 +62,7 @@
     "SegmentEditState",
     "SegmentEditUI",
     "SegmentEditorState",
+    "SegmentEditorToolbarUI",
     "SegmentEditorUI",
     "SegmentList",
     "SegmentListState",

examples/viewer_lib/ui/medical_viewer_ui.py

@@ -2,34 +2,39 @@
 
 from trame_slicer.core import LayoutManager, SlicerApp
 
+from .control_button import ControlButton
 from .flex_container import FlexContainer
 from .layout_button import LayoutButton
 from .load_volume_ui import LoadVolumeDiv
 from .markups_button import MarkupsButton
 from .mpr_interaction_button import MprInteractionButton
-from .segmentation import SegmentEditorUI
+from .segmentation import SegmentEditorToolbarUI, SegmentEditorUI
 from .slab_button import SlabButton
 from .viewer_layout import ViewerLayout
 from .volume_property_button import VolumePropertyButton
 
 
 class MedicalViewerUI:
     def __init__(self, server: Server, slicer_app: SlicerApp, layout_manager: LayoutManager):
+        self.tool_registry = {}
         with ViewerLayout(server) as self.layout:
-            self.segment_editor_ui = SegmentEditorUI()
+            with self.layout.drawer:
+                self._register_tool_ui(SegmentEditorUI)
+
             with self.layout.toolbar, FlexContainer(fill_height=True):
                 self.load_volume_buttons = LoadVolumeDiv()
                 self.volume_property_button = VolumePropertyButton(server=server, slicer_app=slicer_app)
                 self.layout_button = LayoutButton()
                 self.markups_button = MarkupsButton()
-                self.segment_editor_ui.build_activator(click=self.activate_tool)
+                self._create_tool_button(
+                    icon="mdi-brush",
+                    name="segmentation panel",
+                    tool_ui_type=SegmentEditorUI,
+                )
                 self.slab_button = SlabButton()
                 self.mpr_interaction_button = MprInteractionButton()
 
-                self.segment_editor_ui.build_toolbar_ui()
-
-            with self.layout.drawer:
-                self.segment_editor_ui.build_drawer_ui()
+                self._register_toolbar_ui(SegmentEditorToolbarUI, SegmentEditorUI)
 
             with self.layout.content, FlexContainer(row=True, fill_height=True):
                 layout_manager.initialize_layout_grid(self.layout)
@@ -42,10 +47,31 @@ def data(self):
     def name(self):
         return self.layout.typed_state.name
 
-    def activate_tool(self, tool_name):
-        if self.data.is_drawer_visible and self.data.active_tool == tool_name:
-            self.data.is_drawer_visible = False
-            self.data.active_tool = None
-        else:
-            self.data.active_tool = tool_name
-            self.data.is_drawer_visible = True
+    def _is_tool_active(self, tool_ui_type: type):
+        return f"{self.name.active_tool} === '{tool_ui_type.__name__}'"
+
+    def _is_tool_drawer_visible(self, tool_ui_type: type):
+        return f"{self._is_tool_active(tool_ui_type)} && {self.name.is_drawer_visible}"
+
+    def _register_tool_ui(self, tool_ui_type: type):
+        tool_instance = tool_ui_type(v_if=(self._is_tool_active(tool_ui_type),))
+        self.tool_registry[tool_ui_type] = tool_instance
+
+    def _register_toolbar_ui(self, toolbar_ui_type: type, tool_ui_type: type):
+        toolbar_ui_type(self.tool_registry[tool_ui_type], v_if=(self._is_tool_active(tool_ui_type),))
+
+    def _create_tool_button(self, name: str, icon: str | tuple, tool_ui_type: type):
+        async def change_drawer_ui():
+            if self.data.is_drawer_visible and self.data.active_tool == tool_ui_type.__name__:
+                self.data.active_tool = None
+                self.data.is_drawer_visible = False
+            else:
+                self.data.active_tool = tool_ui_type.__name__
+                self.data.is_drawer_visible = True
+
+        ControlButton(
+            icon=icon,
+            name="{{ " + f"{self._is_tool_drawer_visible(tool_ui_type)} ? 'Close {name}' : 'Open {name}'" + " }}",
+            click=change_drawer_ui,
+            active=(self._is_tool_active(tool_ui_type),),
+        )

examples/viewer_lib/ui/segmentation/__init__.py

@@ -5,7 +5,11 @@
     SegmentEditState,
     SegmentEditUI,
 )
-from .segment_editor_ui import SegmentEditorState, SegmentEditorUI
+from .segment_editor_ui import (
+    SegmentEditorState,
+    SegmentEditorToolbarUI,
+    SegmentEditorUI,
+)
 from .segment_list import SegmentList, SegmentListState
 from .segment_state import SegmentState
 from .threshold_effect_ui import ThresholdEffectUI, ThresholdState
@@ -21,6 +25,7 @@
     "SegmentEditState",
     "SegmentEditUI",
     "SegmentEditorState",
+    "SegmentEditorToolbarUI",
     "SegmentEditorUI",
     "SegmentList",
     "SegmentListState",

examples/viewer_lib/ui/segmentation/segment_display_ui.py

@@ -4,27 +4,25 @@
 from trame_vuetify.widgets.vuetify3 import (
     Template,
     VBtn,
-    VBtnToggle,
     VCard,
     VCardItem,
     VCardText,
-    VSlider,
 )
 
 from trame_slicer.segmentation import SegmentationOpacityEnum
 
 from ..control_button import ControlButton
 from ..flex_container import FlexContainer
+from ..slider import Slider, SliderState
 from ..text_components import Text
 
 
 @dataclass
 class SegmentDisplayState:
-    display_mode: SegmentationOpacityEnum = SegmentationOpacityEnum.BOTH
-    opacity_2d: float = 0.5
-    opacity_3d: float = 1.0
+    opacity_mode: SegmentationOpacityEnum = SegmentationOpacityEnum.BOTH
+    opacity_2d: SliderState = field(default_factory=SliderState)
+    opacity_3d: SliderState = field(default_factory=SliderState)
     show_3d: bool = False
-    display_options: list[str] = field(default_factory=lambda: ["filled", "outlined"])
     is_extended: bool = False
 
 
@@ -33,7 +31,9 @@ def __init__(self, typed_state: TypedState[SegmentDisplayState], **kwargs):
         super().__init__(**kwargs)
 
         self._typed_state = typed_state
-        self._typed_state.bind_changes({self._typed_state.name.display_options: self._on_display_options_changed})
+        self._typed_state.data.opacity_2d.step = 0.01
+        self._typed_state.data.opacity_3d.step = 0.01
+        self._typed_state.data.opacity_3d.value = 1
 
         with self:
             with VCardItem():
@@ -51,25 +51,32 @@ def __init__(self, typed_state: TypedState[SegmentDisplayState], **kwargs):
                     justify="space-between",
                     row=True,
                 ):
-                    with VBtnToggle(
-                        v_model=(self._typed_state.name.display_options,),
-                        classes="align-center",
-                        mandatory=True,
-                        multiple=True,
+                    VBtn(
+                        active=(
+                            "["
+                            f"{self._typed_state.encode(SegmentationOpacityEnum.FILL)}, {self._typed_state.encode(SegmentationOpacityEnum.BOTH)}"
+                            f"].includes({self._typed_state.name.opacity_mode})",
+                        ),
+                        click=lambda: self._on_display_options_changed(SegmentationOpacityEnum.FILL),
+                        height=35,
+                        prepend_icon="mdi-circle",
                         rounded=0,
-                    ):
-                        VBtn(
-                            prepend_icon="mdi-circle",
-                            text="Filled",
-                            value="filled",
-                            height=35,
-                        )
-                        VBtn(
-                            prepend_icon="mdi-circle-outline",
-                            text="Outlined",
-                            value="outlined",
-                            height=35,
-                        )
+                        text="Filled",
+                        variant="text",
+                    )
+                    VBtn(
+                        active=(
+                            "["
+                            f"{self._typed_state.encode(SegmentationOpacityEnum.OUTLINE)}, {self._typed_state.encode(SegmentationOpacityEnum.BOTH)}"
+                            f"].includes({self._typed_state.name.opacity_mode})",
+                        ),
+                        click=lambda: self._on_display_options_changed(SegmentationOpacityEnum.OUTLINE),
+                        height=35,
+                        prepend_icon="mdi-circle-outline",
+                        rounded=0,
+                        text="Outlined",
+                        variant="text",
+                    )
 
                     ControlButton(
                         icon="mdi-video-3d",
@@ -79,29 +86,23 @@ def __init__(self, typed_state: TypedState[SegmentDisplayState], **kwargs):
                     )
 
                 Text("Opacity", subtitle=True)
-                VSlider(
-                    v_model=(self._typed_state.name.opacity_2d,),
-                    hide_details=True,
+                Slider(
+                    typed_state=self._typed_state.get_sub_state(self._typed_state.name.opacity_2d),
                     prepend_icon="mdi-video-2d",
-                    min=0.0,
-                    max=1.0,
-                    step=0.01,
                 )
-                VSlider(
-                    v_model=(self._typed_state.name.opacity_3d,),
-                    disabled=(f"!{self._typed_state.name.show_3d}",),
-                    hide_details=True,
+                Slider(
+                    typed_state=self._typed_state.get_sub_state(self._typed_state.name.opacity_3d),
                     prepend_icon="mdi-video-3d",
-                    min=0.0,
-                    max=1.0,
-                    step=0.01,
                 )
 
-    def _on_display_options_changed(self, display_options):
-        if "outlined" in display_options:
-            if "filled" in display_options:
-                self._typed_state.data.display_mode = SegmentationOpacityEnum.BOTH
-            else:
-                self._typed_state.data.display_mode = SegmentationOpacityEnum.OUTLINE
+    def _on_display_options_changed(self, opacity_mode):
+        if self._typed_state.data.opacity_mode == opacity_mode:
+            return
+        if self._typed_state.data.opacity_mode == SegmentationOpacityEnum.BOTH:
+            self._typed_state.data.opacity_mode = (
+                SegmentationOpacityEnum.FILL
+                if opacity_mode == SegmentationOpacityEnum.OUTLINE
+                else SegmentationOpacityEnum.OUTLINE
+            )
         else:
-            self._typed_state.data.display_mode = SegmentationOpacityEnum.FILL
+            self._typed_state.data.opacity_mode = SegmentationOpacityEnum.BOTH