refactor(cine): route remaining view-axis call sites through getEffectiveViewAxis

useSliceInfo and crosshairs read view.options.orientation directly, which
diverges from what cine views actually render (Axial). Route all three
remaining sites — useSliceInfo (powers annotation widget plane math),
crosshairs (cross-view slice sync), and SliceViewer (its own inline cine
override) — through getEffectiveViewAxis so the cine collapse is applied
consistently and the helper is the single source of truth.

Author: PaulHax

src/components/SliceViewer.vue

@@ -163,7 +163,7 @@ import { ref, toRefs, computed, watch } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useCurrentImage } from '@/src/composables/useCurrentImage';
 import { useProbeStore } from '@/src/store/probe';
-import { getLPSAxisFromDir } from '@/src/utils/lps';
+import { getEffectiveViewAxis } from '@/src/core/cine/getEffectiveViewAxis';
 import VtkSliceView from '@/src/components/vtk/VtkSliceView.vue';
 import { VtkViewApi } from '@/src/types/vtk-types';
 import { Tools } from '@/src/store/tools/types';
@@ -198,17 +198,13 @@ import vtkMouseCameraTrackballZoomToMouseManipulator from '@kitware/vtk.js/Inter
 import { useResetViewsEvents } from '@/src/components/tools/ResetViews.vue';
 import { onVTKEvent } from '@/src/composables/onVTKEvent';
 import { useViewStore } from '@/src/store/views';
-import { LPSAxis } from '@/src/types/lps';
+import { ViewInfo2D } from '@/src/types/views';
 import { get2DViewingVectors } from '@/src/utils/getViewingVectors';
 
 interface Props {
   viewId: string;
 }
 
-interface SliceViewerOptions {
-  orientation: LPSAxis;
-}
-
 const vtkView = ref<VtkViewApi>();
 const baseSliceRep = ref();
 const layerSliceReps = ref([]);
@@ -218,10 +214,7 @@ const props = defineProps<Props>();
 const { viewId } = toRefs(props);
 
 const viewStore = useViewStore();
-const viewInfo = computed(() => viewStore.getView(viewId.value)!);
-const viewOptions = computed(
-  () => viewInfo.value.options as SliceViewerOptions
-);
+const viewInfo = computed(() => viewStore.getView(viewId.value) as ViewInfo2D);
 
 // base image
 const {
@@ -233,12 +226,12 @@ const {
 } = useCurrentImage();
 
 const isCine = computed(() => isCineImage(currentImageID.value));
-const viewingVectors = computed(() =>
-  get2DViewingVectors(isCine.value ? 'Axial' : viewOptions.value.orientation)
+const viewAxis = computed(() =>
+  getEffectiveViewAxis(viewInfo.value, currentImageID.value)
 );
+const viewingVectors = computed(() => get2DViewingVectors(viewAxis.value));
 const viewDirection = computed(() => viewingVectors.value.viewDirection);
 const viewUp = computed(() => viewingVectors.value.viewUp);
-const viewAxis = computed(() => getLPSAxisFromDir(viewDirection.value));
 
 const hover = ref(false);
 

src/composables/useSliceInfo.ts

@@ -1,12 +1,12 @@
 import type { Vector3 } from '@kitware/vtk.js/types';
 import type { MaybeRef } from 'vue';
 import { computed, unref } from 'vue';
-import { getLPSAxisFromDir } from '@/src/utils/lps';
 import { useImage } from '@/src/composables/useCurrentImage';
 import { Maybe } from '@/src/types';
 import { useSliceConfig } from '@/src/composables/useSliceConfig';
 import { useViewStore } from '@/src/store/views';
 import { get2DViewingVectors } from '@/src/utils/getViewingVectors';
+import { getEffectiveViewAxis } from '@/src/core/cine/getEffectiveViewAxis';
 
 /**
  * Returns information about the current slice.
@@ -29,10 +29,9 @@ export function useSliceInfo(
   return computed(() => {
     if (!view.value || view.value.type !== '2D') return null;
 
-    const { orientation } = view.value.options;
-    const { viewDirection } = get2DViewingVectors(orientation);
+    const axis = getEffectiveViewAxis(view.value, unref(imageID));
+    const { viewDirection } = get2DViewingVectors(axis);
     const { lpsOrientation } = imageMetadata.value;
-    const axis = getLPSAxisFromDir(viewDirection);
     const planeOrigin = [0, 0, 0] as Vector3;
     planeOrigin[lpsOrientation[axis]] = slice.value;
     return {

src/store/tools/crosshairs.ts

@@ -5,12 +5,11 @@ import vtkBoundingBox from '@kitware/vtk.js/Common/DataModel/BoundingBox';
 import { computed, ref, unref, watch } from 'vue';
 import { vec3 } from 'gl-matrix';
 import { defineStore } from 'pinia';
-import { getLPSAxisFromDir } from '@/src/utils/lps';
 import { Manifest, StateFile } from '@/src/io/state-file/schema';
 import { useViewStore } from '@/src/store/views';
 import useViewSliceStore from '@/src/store/view-configs/slicing';
 import { ViewInfo2D } from '@/src/types/views';
-import { get2DViewingVectors } from '@/src/utils/getViewingVectors';
+import { getEffectiveViewAxis } from '@/src/core/cine/getEffectiveViewAxis';
 
 export const useCrosshairsToolStore = defineStore('crosshairs', () => {
   type _This = ReturnType<typeof useCrosshairsToolStore>;
@@ -64,9 +63,7 @@ export const useCrosshairsToolStore = defineStore('crosshairs', () => {
     const { lpsOrientation } = unref(currentImageMetadata);
 
     otherViews.value.forEach((view) => {
-      const { orientation } = view.options;
-      const { viewDirection } = get2DViewingVectors(orientation);
-      const axis = getLPSAxisFromDir(viewDirection);
+      const axis = getEffectiveViewAxis(view, imageID);
       const index = lpsOrientation[axis];
       const slice = Math.round(indexPos[index]);
       viewSliceStore.updateConfig(view.id, imageID, { slice });