cardio 2026.1.2__py3-none-any.whl → 2026.1.3__py3-none-any.whl

cardio/__init__.py

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

cardio/logic.py

@@ -338,10 +338,18 @@ class Logic:
 
     def _apply_current_mpr_settings(self, active_volume, frame):
         """Apply current slice positions and window/level to MPR actors."""
+        from .orientation import IndexOrder
+
         # Apply slice positions
         origin = getattr(self.server.state, "mpr_origin", [0.0, 0.0, 0.0])
         rotation_sequence, rotation_angles = self._get_visible_rotation_data()
 
+        # VTK needs origin in ITK convention - convert if necessary
+        current_convention = self.scene.mpr_rotation_sequence.metadata.index_order
+        if current_convention == IndexOrder.ROMA:
+            # Convert Roma to ITK: swap X and Z
+            origin = [origin[2], origin[1], origin[0]]
+
         active_volume.update_slice_positions(
             frame,
             origin,
@@ -659,6 +667,11 @@ class Logic:
 
             self.server.state.mpr_rotation_data = updated_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]]
+
         self.scene.mpr_rotation_sequence.metadata.index_order = new_convention
 
     def _initialize_clipping_state(self):
@@ -744,6 +757,8 @@ class Logic:
 
         # Initialize origin to volume center (in LPS coordinates)
         try:
+            from .orientation import IndexOrder
+
             current_frame = getattr(self.server.state, "frame", 0)
             volume_actor = active_volume.actors[current_frame]
             image_data = volume_actor.GetMapper().GetInput()
@@ -752,7 +767,16 @@ class Logic:
             # Set origin to volume center if it's at default [0,0,0]
             current_origin = getattr(self.server.state, "mpr_origin", [0.0, 0.0, 0.0])
             if current_origin == [0.0, 0.0, 0.0]:
-                self.server.state.mpr_origin = list(center)
+                # VTK returns center in ITK convention (X=L, Y=P, Z=S)
+                # Transform to current convention if needed
+                center_list = list(center)
+                if (
+                    self.scene.mpr_rotation_sequence.metadata.index_order
+                    == IndexOrder.ROMA
+                ):
+                    # Convert ITK -> Roma: swap X and Z
+                    center_list = [center_list[2], center_list[1], center_list[0]]
+                self.server.state.mpr_origin = center_list
         except (RuntimeError, IndexError) as e:
             print(f"Error: Cannot get center for volume '{active_volume_label}': {e}")
             return
@@ -821,6 +845,7 @@ class Logic:
 
     def update_slice_positions(self, **kwargs):
         """Update MPR slice positions when sliders change."""
+        from .orientation import IndexOrder
 
         if not getattr(self.server.state, "mpr_enabled", False):
             return
@@ -845,6 +870,12 @@ class Logic:
 
         rotation_sequence, rotation_angles = self._get_visible_rotation_data()
 
+        # VTK needs origin in ITK convention - convert if necessary
+        current_convention = self.scene.mpr_rotation_sequence.metadata.index_order
+        if current_convention == IndexOrder.ROMA:
+            # Convert Roma to ITK: swap X and Z
+            origin = [origin[2], origin[1], origin[0]]
+
         # Update slice positions with rotation
         active_volume.update_slice_positions(
             current_frame,
@@ -921,6 +952,8 @@ class Logic:
 
     def update_mpr_rotation(self, **kwargs):
         """Update MPR views when rotation changes."""
+        from .orientation import IndexOrder
+
         if not getattr(self.server.state, "mpr_enabled", False):
             return
 
@@ -944,6 +977,12 @@ class Logic:
 
         rotation_sequence, rotation_angles = self._get_visible_rotation_data()
 
+        # VTK needs origin in ITK convention - convert if necessary
+        current_convention = self.scene.mpr_rotation_sequence.metadata.index_order
+        if current_convention == IndexOrder.ROMA:
+            # Convert Roma to ITK: swap X and Z
+            origin = [origin[2], origin[1], origin[0]]
+
         # Update slice positions with rotation
         active_volume.update_slice_positions(
             current_frame,

cardio/rotation.py

@@ -56,11 +56,12 @@ class RotationMetadata(pc.BaseModel):
 class RotationSequence(pc.BaseModel):
     """Complete rotation sequence.
 
-    Both angles and axes are always stored in the current convention/units:
+    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
+    - Origin: stored in axis order specified by metadata.index_order
 
-    When convention/units change in the UI, all existing rotations are converted.
+    When convention/units change in the UI, all existing data is converted.
     """
 
     model_config = pc.ConfigDict(frozen=False)
@@ -69,7 +70,7 @@ class RotationSequence(pc.BaseModel):
     angles_list: list[RotationStep] = pc.Field(default_factory=list)
     mpr_origin: list[float] = pc.Field(
         default_factory=lambda: [0.0, 0.0, 0.0],
-        description="MPR origin position [x, y, z] in LPS coordinates",
+        description="MPR origin position [x, y, z] in current index_order convention",
     )
 
     @pc.field_validator("mpr_origin")
@@ -123,8 +124,13 @@ class RotationSequence(pc.BaseModel):
 
     def to_toml(self) -> str:
         """Serialize to TOML using stored serialization preferences."""
+        from . import __version__
+
         data = self.model_dump(mode="json")
-        return tk.dumps(data)
+        toml_str = tk.dumps(data)
+
+        version_comment = f"# Generated by cardio version {__version__}\n\n"
+        return version_comment + toml_str
 
     @classmethod
     def from_toml(cls, toml_content: str) -> "RotationSequence":

{cardio-2026.1.2.dist-info → cardio-2026.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cardio
-Version: 2026.1.2
+Version: 2026.1.3
 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.2
+cardio 2026.1.3
 ```
 
 ### Developing

{cardio-2026.1.2.dist-info → cardio-2026.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cardio/__init__.py,sha256=1g0tFk2oSQTiQO_WcuDGxiGlutHUn7H4yLY3iMyFIm8,601
+cardio/__init__.py,sha256=07x-I5z0KKgiJwm-tqtY1qZTh5YKg32IScpzzFVEeno,601
 cardio/app.py,sha256=h-Xh57Txw3Hom-fDv08YxjXzovuIxY8_5qPy6MJThZs,1354
 cardio/assets/bone.toml,sha256=vv8uVYSHIoKuHkNCoBOkGe2_qoEbXMvQO6ypm3mMOtA,675
 cardio/assets/vascular_closed.toml,sha256=XtaZS_Zd6NSAtY3ZlUfiog3T86u9Ii0oSutU2wBQy78,1267
@@ -6,13 +6,13 @@ cardio/assets/vascular_open.toml,sha256=1M3sV1IGt3zh_3vviysKEk9quKfjF9xUBcIq3kxV
 cardio/assets/xray.toml,sha256=siPem0OZ2OkWH0e5pizftpItJKGJgxKJ_S2K0316ubQ,693
 cardio/blend_transfer_functions.py,sha256=fkLDYGMj_QXYs0vmXYT_B1tgTfl3YICLYimtWlxrmbQ,2958
 cardio/color_transfer_function.py,sha256=uTyPdwxi0HjR4wm418cQN9-q9SspkkeqvLNqXaF3zzg,792
-cardio/logic.py,sha256=XR7e5sb8vm7t3himwxOBR3OBP2QZxadb2hoGhqSTwiw,42877
+cardio/logic.py,sha256=AuKQZ_ACTRrtB4oxPuaKYjajsoA3yoszw7GnZK11UdQ,44721
 cardio/mesh.py,sha256=wYdU0BU84eXrrHp0U0VLwYW7ZpRJ6GbT5Kl_-K6CBzY,9356
 cardio/object.py,sha256=98A32VpFR4UtVqW8dZsRJR13VVyUoJJ20uoOZBgN4js,6168
 cardio/orientation.py,sha256=xsWAFPwf3-toT4XFYyGiZJkcGFQ2uz3eLxpC1_i6yZ8,6266
 cardio/piecewise_function.py,sha256=X-_C-BVStufmFjfF8IbkqKk9Xw_jh00JUmjC22ZqeqQ,764
 cardio/property_config.py,sha256=YrWIyCoSAfJPigkhriIQybQpJantGnXjT4nJfrtIJco,1689
-cardio/rotation.py,sha256=IoIoyhAdtBB90myY2GezXMjPbQ-JLMRTgQCpFSVZKBg,5096
+cardio/rotation.py,sha256=BCh3x347AdnsRMK-6-N9o12jnGiwg7vG-DuJirzn468,5341
 cardio/scene.py,sha256=FrUQIJrBR_jPrW7utOI3uDbaUxjmZEapzVTEVIgEWaA,15365
 cardio/screenshot.py,sha256=l8bLgxnU5O0FlnmsyVAzKwM9Y0401IzcdnDP0WqFSTY,640
 cardio/segmentation.py,sha256=KT1ClgultXyGpZDdpYxor38GflY7uCgRzfA8JEGQVaU,6642
@@ -24,7 +24,7 @@ cardio/volume.py,sha256=sdQ7gtX4jQDD9U8U95xD9LIV_1hpykj8NTCo1_aIKVM,15035
 cardio/volume_property.py,sha256=-EUMV9sWCaetgGjnqIWxPp39qrxEZKTNDJ5GHUgLMlk,1619
 cardio/volume_property_presets.py,sha256=4-hjo-dukm5sMMmWidbWnVXq0IN4sWpBnDITY9MqUFg,1625
 cardio/window_level.py,sha256=XMkwLAHcmsEYcI0SoHySQZvptq4VwX2gj--ps3hV8AQ,784
-cardio-2026.1.2.dist-info/WHEEL,sha256=4n27za1eEkOnA7dNjN6C5-O2rUiw6iapszm14Uj-Qmk,79
-cardio-2026.1.2.dist-info/entry_points.txt,sha256=xRd1otqKtW9xmidJ4CFRX1V9KWmsBbtxrgMtDColq3w,40
-cardio-2026.1.2.dist-info/METADATA,sha256=STZ2oobYKN12HQD_jH_w0HANJ_b4L-PM9bB41eIJZ0Q,3518
-cardio-2026.1.2.dist-info/RECORD,,
+cardio-2026.1.3.dist-info/WHEEL,sha256=4n27za1eEkOnA7dNjN6C5-O2rUiw6iapszm14Uj-Qmk,79
+cardio-2026.1.3.dist-info/entry_points.txt,sha256=xRd1otqKtW9xmidJ4CFRX1V9KWmsBbtxrgMtDColq3w,40
+cardio-2026.1.3.dist-info/METADATA,sha256=BE_DMgEZ959_kbfIfIMTbDs-hIhjep_SGFSmoeMm3Ag,3518
+cardio-2026.1.3.dist-info/RECORD,,