diff --git a/src/components/VtkTwoView.vue b/src/components/VtkTwoView.vue index 5952d4b76..17df7fb5e 100644 --- a/src/components/VtkTwoView.vue +++ b/src/components/VtkTwoView.vue @@ -310,7 +310,7 @@ export default defineComponent({ get: () => windowingStore.getConfig(viewID.value, curImageID.value), set: (newValue) => { const imageID = curImageID.value; - if (imageID !== null && newValue != null) { + if (imageID != null && newValue != null) { windowingStore.updateConfig(viewID.value, imageID, newValue); } }, @@ -320,7 +320,7 @@ export default defineComponent({ const windowLevel = computed(() => wlConfig.value?.level); const dicomInfo = computed(() => { if ( - curImageID.value !== null && + curImageID.value != null && curImageID.value in dicomStore.imageIDToVolumeKey ) { const volumeKey = dicomStore.imageIDToVolumeKey[curImageID.value]; @@ -362,7 +362,7 @@ export default defineComponent({ // --- setters --- // const setSlice = (slice: number) => { - if (curImageID.value !== null) { + if (curImageID.value != null) { viewSliceStore.updateConfig(viewID.value, curImageID.value, { slice, }); diff --git a/src/components/tools/SliceScrollTool.vue b/src/components/tools/SliceScrollTool.vue index cd04de824..0feaf6c51 100644 --- a/src/components/tools/SliceScrollTool.vue +++ b/src/components/tools/SliceScrollTool.vue @@ -96,7 +96,7 @@ export default defineComponent({ range.step, () => scrollVal.value, (slice) => { - if (currentImageID.value !== null) { + if (currentImageID.value != null) { viewSliceStore.updateConfig(viewID.value, currentImageID.value, { slice, }); diff --git a/src/composables/usePersistCameraConfig.ts b/src/composables/usePersistCameraConfig.ts index 2fdfb5eea..5bddbe127 100644 --- a/src/composables/usePersistCameraConfig.ts +++ b/src/composables/usePersistCameraConfig.ts @@ -1,12 +1,13 @@ import { manageVTKSubscription } from '@/src/composables/manageVTKSubscription'; import { Ref } from 'vue'; +import { Maybe } from '@/src/types'; import { CameraConfig } from '../store/view-configs/types'; import { vtkLPSViewProxy } from '../types/vtk-types'; import useViewCameraStore from '../store/view-configs/camera'; export function usePersistCameraConfig( viewID: Ref, - dataID: Ref, + dataID: Ref>, viewProxy: Ref, ...toPersist: (keyof CameraConfig)[] ) { @@ -19,7 +20,7 @@ export function usePersistCameraConfig( if (toPersist.indexOf('position') > -1) { persist.push(() => { - if (dataID.value !== null && persistCameraConfig) { + if (dataID.value != null && persistCameraConfig) { viewCameraStore.updateConfig(viewID.value, dataID.value, { position: viewProxy.value.getCamera().getPosition(), }); @@ -28,7 +29,7 @@ export function usePersistCameraConfig( } if (toPersist.indexOf('viewUp') > -1) { persist.push(() => { - if (dataID.value !== null && persistCameraConfig) { + if (dataID.value != null && persistCameraConfig) { viewCameraStore.updateConfig(viewID.value, dataID.value, { viewUp: viewProxy.value.getCamera().getViewUp(), }); @@ -37,7 +38,7 @@ export function usePersistCameraConfig( } if (toPersist.indexOf('focalPoint') > -1) { persist.push(() => { - if (dataID.value !== null && persistCameraConfig) { + if (dataID.value != null && persistCameraConfig) { viewCameraStore.updateConfig(viewID.value, dataID.value, { focalPoint: viewProxy.value.getCamera().getFocalPoint(), }); @@ -46,7 +47,7 @@ export function usePersistCameraConfig( } if (toPersist.indexOf('directionOfProjection') > -1) { persist.push(() => { - if (dataID.value !== null && persistCameraConfig) { + if (dataID.value != null && persistCameraConfig) { viewCameraStore.updateConfig(viewID.value, dataID.value, { directionOfProjection: viewProxy.value .getCamera() @@ -57,7 +58,7 @@ export function usePersistCameraConfig( } if (toPersist.indexOf('parallelScale') > -1) { persist.push(() => { - if (dataID.value !== null && persistCameraConfig) { + if (dataID.value != null && persistCameraConfig) { viewCameraStore.updateConfig(viewID.value, dataID.value, { parallelScale: viewProxy.value.getCamera().getParallelScale(), }); diff --git a/src/composables/useSceneBuilder.ts b/src/composables/useSceneBuilder.ts index d3d02838c..1fbcd7c91 100644 --- a/src/composables/useSceneBuilder.ts +++ b/src/composables/useSceneBuilder.ts @@ -1,11 +1,12 @@ import vtkAbstractRepresentationProxy from '@kitware/vtk.js/Proxy/Core/AbstractRepresentationProxy'; import { computed, Ref, watch } from 'vue'; +import { Maybe } from '@/src/types'; import { useViewStore } from '../store/views'; import { vtkLPSViewProxy } from '../types/vtk-types'; import { arrayEquals } from '../utils'; interface Scene { - baseImage?: Ref; + baseImage?: Ref>; labelmaps?: Ref; layers?: Ref; models?: Ref; diff --git a/src/store/tools/crop.ts b/src/store/tools/crop.ts index 81a181ec1..3af2dd7cb 100644 --- a/src/store/tools/crop.ts +++ b/src/store/tools/crop.ts @@ -8,6 +8,7 @@ import { MaybeRef } from '@vueuse/core'; import { vec3 } from 'gl-matrix'; import { defineStore } from 'pinia'; import { arrayEqualsWithComparator } from '@/src/utils'; +import { Maybe } from '@/src/types'; import { useImageStore } from '../datasets-images'; import { LPSCroppingPlanes } from '../../types/crop'; import { ImageMetadata } from '../../types/image'; @@ -60,7 +61,7 @@ export const useCropStore = defineStore('crop', () => { croppingByImageID: {} as Record, }); - const getComputedVTKPlanes = (imageID: MaybeRef) => + const getComputedVTKPlanes = (imageID: MaybeRef>) => computed(() => { const id = unref(imageID); if (id && id in state.croppingByImageID && id in imageStore.metadata) { diff --git a/src/store/tools/paint.ts b/src/store/tools/paint.ts index 5df201a79..bbe44d3d5 100644 --- a/src/store/tools/paint.ts +++ b/src/store/tools/paint.ts @@ -4,6 +4,7 @@ import { Manifest, StateFile } from '@/src/io/state-file/schema'; import { computed, ref, watch } from 'vue'; import { vec3 } from 'gl-matrix'; import { defineStore } from 'pinia'; +import { Maybe } from '@/src/types'; import { Tools } from './types'; import { useLabelmapStore } from '../datasets-labelmaps'; @@ -34,7 +35,7 @@ export const usePaintToolStore = defineStore('paint', () => { // --- actions --- // - function selectOrCreateLabelmap(imageID: string | null) { + function selectOrCreateLabelmap(imageID: Maybe) { if (!imageID) { activeLabelmapID.value = null; return;