cardio 2026.1.3__tar.gz → 2026.2.0__tar.gz

{cardio-2026.1.3 → cardio-2026.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cardio
-Version: 2026.1.3
+Version: 2026.2.0
 Summary: A simple web-based viewer for 3D and 4D ('cine') medical imaging data.
 Keywords: Medical,Imaging,3D,4D,Visualization
 Author: Davis Marc Vigneault
@@ -75,7 +75,7 @@ $ uv init
 $ uv add cardio
 $ . ./.venv/bin/activate
 (project) cardio --version
-cardio 2026.1.3
+cardio 2026.2.0
 ```
 
 ### Developing

{cardio-2026.1.3 → cardio-2026.2.0}/README.md

@@ -19,7 +19,7 @@ $ uv init
 $ uv add cardio
 $ . ./.venv/bin/activate
 (project) cardio --version
-cardio 2026.1.3
+cardio 2026.2.0
 ```
 
 ### Developing

{cardio-2026.1.3 → cardio-2026.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "cardio"
-version = "2026.1.3"
+version = "2026.2.0"
 authors = [
     {name = "Davis Marc Vigneault", email = "davis.vigneault@gmail.com"}
 ]
@@ -62,7 +62,7 @@ repository = "https://github.com/sudomakeinstall/cardio"
 profile = "black"
 
 [tool.bumpver]
-current_version = "2026.1.3"
+current_version = "2026.2.0"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "ENH: Bump version from {old_version} => {new_version}"
 commit = true

{cardio-2026.1.3 → cardio-2026.2.0}/src/cardio/__init__.py

@@ -26,4 +26,4 @@ __all__ = [
     "window_level",
 ]
 
-__version__ = "2026.1.3"
+__version__ = "2026.2.0"

{cardio-2026.1.3 → cardio-2026.2.0}/src/cardio/logic.py

@@ -28,8 +28,8 @@ class Logic:
         visible_index = 0
         for rotation in angles_list:
             if rotation.get("visible", True):
-                rotation_sequence.append({"axis": rotation["axes"]})
-                rotation_angles[visible_index] = rotation["angles"][0]
+                rotation_sequence.append({"axis": rotation["axis"]})
+                rotation_angles[visible_index] = rotation["angle"]
                 visible_index += 1
 
         # CRITICAL: VTK always needs rotations in ITK convention
@@ -201,17 +201,18 @@ class Logic:
         self.server.state.mpr_level = self.scene.mpr_level
         self.server.state.mpr_window_level_preset = self.scene.mpr_window_level_preset
 
-        # Initialize rotation data from RotationSequence
+        # Initialize rotation data from RotationSequence (includes metadata)
         self.server.state.mpr_rotation_data = (
-            self.scene.mpr_rotation_sequence.to_dict_for_ui()
+            self.scene.mpr_rotation_sequence.model_dump(mode="json")
         )
 
-        self.server.state.angle_units = (
-            self.scene.mpr_rotation_sequence.metadata.angle_units.value
-        )
-        self.server.state.index_order = (
-            self.scene.mpr_rotation_sequence.metadata.index_order.value
-        )
+        # Keep mirror variables for UI binding convenience
+        self.server.state.angle_units = self.server.state.mpr_rotation_data["metadata"][
+            "angle_units"
+        ]
+        self.server.state.index_order = self.server.state.mpr_rotation_data["metadata"][
+            "index_order"
+        ]
 
         # Initialize MPR presets data
         try:
@@ -541,23 +542,14 @@ class Logic:
         save_dir = self.scene.rotations_directory / active_volume_label
         save_dir.mkdir(parents=True, exist_ok=True)
 
-        rotation_data = getattr(
-            self.server.state, "mpr_rotation_data", {"angles_list": []}
-        )
-        rotation_seq = RotationSequence.from_ui_dict(rotation_data, active_volume_label)
+        rotation_data = getattr(self.server.state, "mpr_rotation_data", {})
 
-        mpr_origin = getattr(self.server.state, "mpr_origin", [0.0, 0.0, 0.0])
-        rotation_seq.mpr_origin = list(mpr_origin)
+        # Create RotationSequence directly from full data structure
+        rotation_seq = RotationSequence(**rotation_data)
 
+        # Update only timestamp and volume_label (rest already in metadata)
         rotation_seq.metadata.timestamp = timestamp.isoformat()
         rotation_seq.metadata.volume_label = active_volume_label
-        rotation_seq.metadata.coordinate_system = self.scene.coordinate_system
-        rotation_seq.metadata.index_order = (
-            self.scene.mpr_rotation_sequence.metadata.index_order
-        )
-        rotation_seq.metadata.angle_units = (
-            self.scene.mpr_rotation_sequence.metadata.angle_units
-        )
 
         output_path = save_dir / f"{timestamp_str}.toml"
         rotation_seq.to_file(output_path)
@@ -606,26 +598,31 @@ class Logic:
         if new_units is None or old_units == new_units:
             return
 
-        # Convert all existing rotation angles
-        rotation_data = getattr(
-            self.server.state, "mpr_rotation_data", {"angles_list": []}
+        # Get current rotation data (now includes metadata)
+        rotation_data = copy.deepcopy(
+            getattr(self.server.state, "mpr_rotation_data", {})
         )
-        if rotation_data.get("angles_list"):
-            updated_data = copy.deepcopy(rotation_data)
 
-            for rotation in updated_data["angles_list"]:
-                current_angle = rotation.get("angles", [0])[0]
+        # Convert all existing rotation angles
+        if rotation_data.get("angles_list"):
+            for rotation in rotation_data["angles_list"]:
+                current_angle = rotation.get("angle", 0)
 
                 # Convert based on old -> new units
                 if old_units == AngleUnits.DEGREES and new_units == AngleUnits.RADIANS:
-                    rotation["angles"][0] = np.radians(current_angle)
+                    rotation["angle"] = np.radians(current_angle)
                 elif (
                     old_units == AngleUnits.RADIANS and new_units == AngleUnits.DEGREES
                 ):
-                    rotation["angles"][0] = np.degrees(current_angle)
+                    rotation["angle"] = np.degrees(current_angle)
 
-            self.server.state.mpr_rotation_data = updated_data
+        # Update nested metadata
+        rotation_data["metadata"]["angle_units"] = angle_units
 
+        # Update state (triggers re-render)
+        self.server.state.mpr_rotation_data = rotation_data
+
+        # Update scene
         self.scene.mpr_rotation_sequence.metadata.angle_units = new_units
 
     def sync_index_order(self, index_order, **kwargs):
@@ -651,27 +648,33 @@ class Logic:
         if old_convention == new_convention:
             return
 
-        rotation_data = getattr(
-            self.server.state, "mpr_rotation_data", {"angles_list": []}
+        # Get current rotation data (now includes metadata)
+        rotation_data = copy.deepcopy(
+            getattr(self.server.state, "mpr_rotation_data", {})
         )
-        if rotation_data.get("angles_list"):
-            updated_data = copy.deepcopy(rotation_data)
 
-            for rotation in updated_data["angles_list"]:
-                current_axis = rotation.get("axes")
-                current_angle = rotation.get("angles", [0])[0]
+        # Convert rotation axes and angles
+        if rotation_data.get("angles_list"):
+            for rotation in rotation_data["angles_list"]:
+                current_axis = rotation.get("axis")
+                current_angle = rotation.get("angle", 0)
 
                 # Conversion is the same for both ITK<->ROMA directions
-                rotation["axes"] = {"X": "Z", "Y": "Y", "Z": "X"}[current_axis]
-                rotation["angles"][0] = -current_angle
+                rotation["axis"] = {"X": "Z", "Y": "Y", "Z": "X"}[current_axis]
+                rotation["angle"] = -current_angle
+
+        # Update nested metadata
+        rotation_data["metadata"]["index_order"] = index_order
 
-            self.server.state.mpr_rotation_data = updated_data
+        # Update state (triggers re-render)
+        self.server.state.mpr_rotation_data = rotation_data
 
         # Transform mpr_origin: swap X and Z (indices 0 and 2)
         mpr_origin = getattr(self.server.state, "mpr_origin", None)
         if mpr_origin is not None and len(mpr_origin) == 3:
             self.server.state.mpr_origin = [mpr_origin[2], mpr_origin[1], mpr_origin[0]]
 
+        # Update scene
         self.scene.mpr_rotation_sequence.metadata.index_order = new_convention
 
     def _initialize_clipping_state(self):
@@ -1030,8 +1033,8 @@ class Logic:
 
         angles_list.append(
             {
-                "axes": axis,
-                "angles": [0],
+                "axis": axis,
+                "angle": 0,
                 "visible": True,
                 "name": "",
                 "name_editable": True,
@@ -1065,13 +1068,21 @@ class Logic:
         angles_list = current_data["angles_list"]
 
         if 0 <= index < len(angles_list):
-            angles_list[index]["angles"][0] = 0
+            angles_list[index]["angle"] = 0
             current_data["angles_list"] = angles_list
             self.server.state.mpr_rotation_data = current_data
 
     def reset_mpr_rotations(self):
         """Reset all MPR rotations."""
-        self.server.state.mpr_rotation_data = {"angles_list": []}
+        from .rotation import RotationSequence
+
+        # Create fresh RotationSequence and serialize
+        new_rotation_seq = RotationSequence()
+        self.server.state.mpr_rotation_data = new_rotation_seq.model_dump(mode="json")
+
+        # Update mirror variables
+        self.server.state.angle_units = "radians"
+        self.server.state.index_order = "itk"
 
     def finalize_mpr_initialization(self, **kwargs):
         """Set the active volume label after UI is ready to avoid race condition."""

{cardio-2026.1.3 → cardio-2026.2.0}/src/cardio/rotation.py

@@ -15,33 +15,18 @@ from .orientation import AngleUnits, IndexOrder
 class RotationStep(pc.BaseModel):
     """Single rotation step.
 
-    Both angles and axes are stored in the current convention/units.
-    - Angles: stored in units specified by parent metadata.angle_units
-    - Axes: stored in convention specified by parent metadata.index_order
+    Both angle and axis are stored in the current convention/units.
+    - Angle: stored in units specified by parent metadata.angle_units
+    - Axis: stored in convention specified by parent metadata.index_order
     """
 
-    axes: ty.Literal["X", "Y", "Z"]
+    axis: ty.Literal["X", "Y", "Z"]
     angle: float = 0.0
     visible: bool = True
     name: str = ""
     name_editable: bool = True
     deletable: bool = True
 
-    @pc.model_validator(mode="before")
-    @classmethod
-    def handle_legacy_format(cls, data):
-        """Handle legacy 'angles' list format and 'axis' field."""
-        if isinstance(data, dict):
-            if "angles" in data and "angle" not in data:
-                angles = data["angles"]
-                if isinstance(angles, list) and len(angles) > 0:
-                    data["angle"] = angles[0]
-                else:
-                    data["angle"] = angles
-            if "axis" in data and "axes" not in data:
-                data["axes"] = data["axis"]
-        return data
-
 
 class RotationMetadata(pc.BaseModel):
     """Metadata for TOML files."""
@@ -51,14 +36,15 @@ class RotationMetadata(pc.BaseModel):
     angle_units: AngleUnits = AngleUnits.RADIANS
     timestamp: str = pc.Field(default_factory=lambda: dt.datetime.now().isoformat())
     volume_label: str = ""
+    deletable: bool = True
 
 
 class RotationSequence(pc.BaseModel):
     """Complete rotation sequence.
 
-    All data (angles, axes, and origin) are stored in the current convention/units:
-    - Angles: stored in units specified by metadata.angle_units
-    - Axes: stored in convention specified by metadata.index_order
+    All data (angle, axis, and origin) are stored in the current convention/units:
+    - Angle: stored in units specified by metadata.angle_units
+    - Axis: stored in convention specified by metadata.index_order
     - Origin: stored in axis order specified by metadata.index_order
 
     When convention/units change in the UI, all existing data is converted.
@@ -81,47 +67,6 @@ class RotationSequence(pc.BaseModel):
             raise ValueError("mpr_origin must be a 3-element list [x, y, z]")
         return [float(x) for x in v]
 
-    @pc.field_validator("angles_list", mode="before")
-    @classmethod
-    def convert_legacy_list(cls, v):
-        """Convert legacy list of dicts to list of RotationStep."""
-        if isinstance(v, list) and len(v) > 0 and isinstance(v[0], dict):
-            return [RotationStep(**item) for item in v]
-        return v
-
-    def to_dict_for_ui(self) -> dict:
-        """Convert to UI format.
-
-        Angles are passed through in their current units (metadata.angle_units).
-        UI expects 'angles' as a list for backward compatibility.
-        """
-        return {
-            "angles_list": [
-                {
-                    "axes": step.axes,
-                    "angles": [step.angle],
-                    "visible": step.visible,
-                    "name": step.name,
-                    "name_editable": step.name_editable,
-                    "deletable": step.deletable,
-                }
-                for step in self.angles_list
-            ],
-            "mpr_origin": self.mpr_origin,
-        }
-
-    @classmethod
-    def from_ui_dict(cls, data: dict, volume_label: str = "") -> "RotationSequence":
-        """Create from UI format.
-
-        Angles from UI are stored as-is (in current UI units).
-        Caller should set metadata.angle_units to match the UI's current units.
-        """
-        angles_list = [RotationStep(**step) for step in data.get("angles_list", [])]
-        metadata = RotationMetadata(volume_label=volume_label)
-        mpr_origin = data.get("mpr_origin", [0.0, 0.0, 0.0])
-        return cls(metadata=metadata, angles_list=angles_list, mpr_origin=mpr_origin)
-
     def to_toml(self) -> str:
         """Serialize to TOML using stored serialization preferences."""
         from . import __version__

{cardio-2026.1.3 → cardio-2026.2.0}/src/cardio/ui.py

@@ -8,7 +8,12 @@ from trame.widgets import html
 from trame.widgets import vtk as vtk_widgets
 from trame.widgets import vuetify3 as vuetify
 
-from .orientation import AngleUnits, EulerAxis, euler_angle_to_rotation_matrix
+from .orientation import (
+    AngleUnits,
+    EulerAxis,
+    IndexOrder,
+    euler_angle_to_rotation_matrix,
+)
 from .scene import Scene
 from .volume_property_presets import list_volume_property_presets
 from .window_level import presets
@@ -151,6 +156,10 @@ class UI:
         if view_name not in base_normals:
             return np.array([0.0, 0.0, 1.0])
 
+        current_convention = self.scene.mpr_rotation_sequence.metadata.index_order
+        if current_convention == IndexOrder.ROMA:
+            base_normals = {k: v[::-1] for k, v in base_normals.items()}
+
         # Build cumulative rotation from visible rotations
         rotation_data = getattr(
             self.server.state, "mpr_rotation_data", {"angles_list": []}
@@ -164,9 +173,9 @@ class UI:
 
         for rotation in angles_list:
             if rotation.get("visible", True):
-                angle = rotation.get("angles", [0])[0]
+                angle = rotation.get("angle", 0)
                 rotation_matrix = euler_angle_to_rotation_matrix(
-                    EulerAxis(rotation["axes"]), angle, angle_units
+                    EulerAxis(rotation["axis"]), angle, angle_units
                 )
                 cumulative_rotation = cumulative_rotation @ rotation_matrix
 
@@ -517,20 +526,6 @@ class UI:
                                 color="primary",
                             )
 
-                    # Reset rotations button
-                    vuetify.VBtn(
-                        "Remove All Rotations",
-                        v_if="!maximized_view && active_volume_label && mpr_rotation_data.angles_list && mpr_rotation_data.angles_list.length > 0",
-                        click=self.server.controller.reset_rotations,
-                        small=True,
-                        dense=True,
-                        outlined=True,
-                        color="warning",
-                        block=True,
-                        classes="mb-2",
-                        prepend_icon="mdi-refresh",
-                    )
-
                     # Individual rotation sliders with DeepReactive
                     with client.DeepReactive("mpr_rotation_data"):
                         for i in range(self.scene.max_mpr_rotations):
@@ -560,7 +555,7 @@ class UI:
                                     with vuetify.VCol(cols="12"):
                                         vuetify.VSlider(
                                             v_model=(
-                                                f"mpr_rotation_data.angles_list[{i}].angles[0]",
+                                                f"mpr_rotation_data.angles_list[{i}].angle",
                                             ),
                                             min=(
                                                 "angle_units === 'radians' ? -Math.PI : -180",
@@ -582,7 +577,7 @@ class UI:
                                     with vuetify.VCol(cols="4"):
                                         vuetify.VSelect(
                                             v_model=(
-                                                f"mpr_rotation_data.angles_list[{i}].axes",
+                                                f"mpr_rotation_data.angles_list[{i}].axis",
                                             ),
                                             items=(["X", "Y", "Z"],),
                                             dense=True,
@@ -683,6 +678,21 @@ class UI:
                         prepend_icon="mdi-content-save",
                     )
 
+                    # Delete rotations button
+                    vuetify.VBtn(
+                        "Delete All Rotations",
+                        v_if="!maximized_view && active_volume_label && mpr_rotation_data.angles_list && mpr_rotation_data.angles_list.length > 0",
+                        click=self.server.controller.reset_rotations,
+                        small=True,
+                        dense=True,
+                        outlined=True,
+                        color="error",
+                        block=True,
+                        classes="mb-2",
+                        prepend_icon="mdi-refresh",
+                        disabled=("!mpr_rotation_data.metadata.deletable",),
+                    )
+
                     vuetify.VDivider(classes="my-2")
 
                 vuetify.VListSubheader("Playback Controls")