Merge pull request #742 from PaulHax/fix-layout-change

fix(VtkViews): reset clipping planes on view layout change

Author: floryst

src/components/SliceViewer.vue

@@ -40,7 +40,6 @@
           class="vtk-view"
           ref="vtkView"
           data-testid="vtk-view vtk-two-view"
-          :disable-auto-reset-camera="disableCameraAutoReset"
           :view-id="id"
           :image-id="currentImageID"
           :view-direction="viewDirection"
@@ -186,7 +185,6 @@ import SliceSlider from '@/src/components/SliceSlider.vue';
 import SliceViewerOverlay from '@/src/components/SliceViewerOverlay.vue';
 import { useToolSelectionStore } from '@/src/store/tools/toolSelection';
 import { useAnnotationToolStore, useToolStore } from '@/src/store/tools';
-import { useViewCameraStore } from '@/src/store/view-configs/camera';
 import { doesToolFrameMatchViewAxis } from '@/src/composables/annotationTool';
 import { useWebGLWatchdog } from '@/src/composables/useWebGLWatchdog';
 import { useSliceConfig } from '@/src/composables/useSliceConfig';
@@ -211,8 +209,6 @@ const segSliceReps = ref([]);
 
 const props = defineProps<Props>();
 
-const { disableCameraAutoReset } = storeToRefs(useViewCameraStore());
-
 const { id: viewId, type: viewType, viewDirection, viewUp } = toRefs(props);
 const viewAxis = computed(() => getLPSAxisFromDir(viewDirection.value));
 

src/components/vtk/VtkSliceView.vue

@@ -20,7 +20,6 @@ interface Props {
   imageId: Maybe<string>;
   viewDirection: LPSAxisDir;
   viewUp: LPSAxisDir;
-  disableAutoResetCamera?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -91,8 +90,11 @@ function resetCamera() {
 }
 
 watchImmediate([imageMetadata, disableCameraAutoReset], () => {
-  if (!imageMetadata.value || disableCameraAutoReset.value) return;
-  if (viewCameraStore.isCameraInitialized(viewID.value, imageID.value)) {
+  if (!imageMetadata.value) return;
+  if (
+    viewCameraStore.isCameraInitialized(viewID.value, imageID.value) ||
+    disableCameraAutoReset.value
+  ) {
     view.renderer.resetCameraClippingRange(imageMetadata.value.worldBounds);
     return;
   }

src/components/vtk/VtkVolumeView.vue

@@ -102,8 +102,11 @@ function resetCamera() {
 }
 
 watchImmediate([imageMetadata, disableCameraAutoReset], () => {
-  if (!imageMetadata.value || disableCameraAutoReset.value) return;
-  if (viewCameraStore.isCameraInitialized(viewID.value, imageID.value)) {
+  if (!imageMetadata.value) return;
+  if (
+    viewCameraStore.isCameraInitialized(viewID.value, imageID.value) ||
+    disableCameraAutoReset.value
+  ) {
     view.renderer.resetCameraClippingRange(imageMetadata.value.worldBounds);
     return;
   }

src/core/vtk/useVtkView.ts

@@ -119,6 +119,7 @@ export function useVtkView(container: MaybeRef<Maybe<HTMLElement>>): View {
     const scaledWidth = Math.max(1, width * globalThis.devicePixelRatio);
     const scaledHeight = Math.max(1, height * globalThis.devicePixelRatio);
     renderWindowView.setSize(scaledWidth, scaledHeight);
+    renderer.resetCameraClippingRange();
     requestRender({ immediate: true });
   };
 

src/store/view-configs/camera.ts

@@ -36,6 +36,7 @@ export const useViewCameraStore = defineStore('viewCamera', () => {
     patchDoubleKeyRecord(configs, viewID, dataID, config);
   };
 
+  // For disabling calls to resetCamera but not resetCameraClippingRange
   const disableCameraAutoReset = ref(false);
 
   const toggleCameraAutoReset = () => {