Skip to content

Commit 9e650be

Browse files
florystfloryst
authored
Merge pull request #594 from Kitware/unify-ids
feat: unify data IDs
2 parents a7b6290 + e4da486 commit 9e650be

27 files changed

+179
-360
lines changed

‎src/components/DataBrowser.vue

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script lang="ts">
22
import { computed, defineComponent, ref, watch } from 'vue';
3+
import { isRegularImage } from '@/src/utils/dataSelection';
34
import SampleDataBrowser from './SampleDataBrowser.vue';
45
import { useDicomWebStore } from '../store/dicom-web/dicom-web-store';
56
import ImageDataBrowser from './ImageDataBrowser.vue';
@@ -42,9 +43,7 @@ export default defineComponent({
4243
);
4344
4445
const hasAnonymousImages = computed(
45-
() =>
46-
imageStore.idList.filter((id) => !(id in dicomStore.imageIDToVolumeKey))
47-
.length > 0
46+
() => imageStore.idList.filter((id) => isRegularImage(id)).length > 0
4847
);
4948
5049
const panels = ref<string[]>([SAMPLE_DATA_KEY, DICOM_WEB_KEY]);

‎src/components/DicomQuickInfoButton.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import { useDICOMStore } from '@/src/store/datasets-dicom';
33
import { Maybe } from '@/src/types';
4+
import { isDicomImage } from '@/src/utils/dataSelection';
45
import { computed, toRef } from 'vue';
56
67
interface Props {
@@ -12,8 +13,8 @@ const imageId = toRef(props, 'imageId');
1213
1314
const dicomStore = useDICOMStore();
1415
const dicomInfo = computed(() => {
15-
if (imageId.value != null && imageId.value in dicomStore.imageIDToVolumeKey) {
16-
const volumeKey = dicomStore.imageIDToVolumeKey[imageId.value];
16+
const volumeKey = imageId.value;
17+
if (volumeKey && isDicomImage(volumeKey)) {
1718
const volumeInfo = dicomStore.volumeInfo[volumeKey];
1819
const studyKey = dicomStore.volumeStudy[volumeKey];
1920
const studyInfo = dicomStore.studyInfo[studyKey];

‎src/components/ImageDataBrowser.vue

+12-23
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import ImageListCard from '@/src/components/ImageListCard.vue';
66
import { createVTKImageThumbnailer } from '@/src/core/thumbnailers/vtk-image';
77
import { useSegmentGroupStore } from '@/src/store/segmentGroups';
88
import {
9-
DataSelection,
10-
ImageSelection,
9+
isRegularImage,
10+
type DataSelection,
1111
selectionEquals,
1212
} from '@/src/utils/dataSelection';
1313
import { useImageStore } from '../store/datasets-images';
14-
import { useDICOMStore } from '../store/datasets-dicom';
1514
import { useDatasetStore } from '../store/datasets';
1615
1716
import { useMultiSelection } from '../composables/useMultiSelection';
@@ -29,39 +28,32 @@ export default defineComponent({
2928
},
3029
setup() {
3130
const imageStore = useImageStore();
32-
const dicomStore = useDICOMStore();
3331
const dataStore = useDatasetStore();
3432
const layersStore = useLayersStore();
3533
const segmentGroupStore = useSegmentGroupStore();
3634
3735
const primarySelection = computed(() => dataStore.primarySelection);
3836
3937
const nonDICOMImages = computed(() =>
40-
imageStore.idList.filter((id) => !(id in dicomStore.imageIDToVolumeKey))
38+
imageStore.idList.filter((id) => isRegularImage(id))
4139
);
4240
4341
const images = computed(() => {
4442
const { metadata } = imageStore;
4543
4644
const layerImages = layersStore
4745
.getLayers(primarySelection.value)
48-
.filter(({ selection }) => selection.type === 'image');
49-
const layerImageIDs = layerImages.map(
50-
({ selection }) => (selection as ImageSelection).dataID
51-
);
46+
.filter(({ selection }) => isRegularImage(selection));
47+
const layerImageIDs = layerImages.map(({ selection }) => selection);
5248
const loadedLayerImageIDs = layerImages
5349
.filter(({ id }) => id in layersStore.layerImages)
54-
.map(({ selection }) => (selection as ImageSelection).dataID);
50+
.map(({ selection }) => selection);
5551
5652
const selectedImageID =
57-
primarySelection.value?.type === 'image' &&
58-
primarySelection.value?.dataID;
53+
isRegularImage(primarySelection.value) && primarySelection.value;
5954
6055
return nonDICOMImages.value.map((id) => {
61-
const selectionKey = {
62-
type: 'image',
63-
dataID: id,
64-
} as DataSelection;
56+
const selectionKey = id as DataSelection;
6557
const isLayer = layerImageIDs.includes(id);
6658
const layerLoaded = loadedLayerImageIDs.includes(id);
6759
const layerLoading = isLayer && !layerLoaded;
@@ -136,10 +128,7 @@ export default defineComponent({
136128
137129
function convertToLabelMap(key: string) {
138130
if (primarySelection.value) {
139-
segmentGroupStore.convertImageToLabelmap(
140-
{ type: 'image', dataID: key },
141-
primarySelection.value
142-
);
131+
segmentGroupStore.convertImageToLabelmap(key, primarySelection.value);
143132
}
144133
}
145134
@@ -261,9 +250,9 @@ export default defineComponent({
261250
image.layerable ? convertToLabelMap(image.id) : null
262251
"
263252
>
264-
<v-icon v-if="!image.layerable" class="mr-1"
265-
>mdi-alert</v-icon
266-
>
253+
<v-icon v-if="!image.layerable" class="mr-1">
254+
mdi-alert
255+
</v-icon>
267256
Convert to Segment Group
268257
<v-tooltip
269258
activator="parent"

‎src/components/LayerProperties.vue

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
22
import { computed, defineComponent, PropType, toRefs } from 'vue';
3-
import { getImageID } from '@/src/utils/dataSelection';
43
import { InitViewSpecs } from '../config';
54
import { useImageStore } from '../store/datasets-images';
65
import { BlendConfig } from '../types/views';
@@ -25,9 +24,7 @@ export default defineComponent({
2524
2625
const imageName = computed(() => {
2726
const { selection } = props.layer;
28-
const imageID = getImageID(selection);
29-
if (imageID === undefined) throw new Error('imageID is undefined');
30-
return imageStore.metadata[imageID].name;
27+
return imageStore.metadata[selection].name;
3128
});
3229
3330
const layerColoringStore = useLayerColoringStore();

‎src/components/PatientBrowser.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { computed, defineComponent, ref, toRefs, watch } from 'vue';
33
import ItemGroup from '@/src/components/ItemGroup.vue';
4-
import { DataSelection, selectionEquals } from '@/src/utils/dataSelection';
4+
import { type DataSelection, selectionEquals } from '@/src/utils/dataSelection';
55
import { useDICOMStore } from '../store/datasets-dicom';
66
import { useDatasetStore } from '../store/datasets';
77
import { useMultiSelection } from '../composables/useMultiSelection';

‎src/components/PatientStudyVolumeBrowser.vue

+6-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { computed, defineComponent, reactive, toRefs, watch } from 'vue';
33
import { Image } from 'itk-wasm';
44
import type { PropType } from 'vue';
55
import GroupableItem from '@/src/components/GroupableItem.vue';
6-
import { DataSelection, DICOMSelection } from '@/src/utils/dataSelection';
6+
import { DataSelection, isDicomImage } from '@/src/utils/dataSelection';
77
import { getDisplayName, useDICOMStore } from '../store/datasets-dicom';
88
import { useDatasetStore } from '../store/datasets';
99
import { useMultiSelection } from '../composables/useMultiSelection';
@@ -78,21 +78,16 @@ export default defineComponent({
7878
const primarySelection = primarySelectionRef.value;
7979
const layerVolumes = layersStore
8080
.getLayers(primarySelection)
81-
.filter(({ selection }) => selection.type === 'dicom');
82-
const layerVolumeKeys = layerVolumes.map(
83-
({ selection }) => (selection as DICOMSelection).volumeKey
84-
);
81+
.filter(({ selection }) => isDicomImage(selection));
82+
const layerVolumeKeys = layerVolumes.map(({ selection }) => selection);
8583
const loadedLayerVolumeKeys = layerVolumes
8684
.filter(({ id }) => id in layersStore.layerImages)
87-
.map(({ selection }) => (selection as DICOMSelection).volumeKey);
85+
.map(({ selection }) => selection);
8886
const selectedVolumeKey =
89-
primarySelection?.type === 'dicom' && primarySelection.volumeKey;
87+
isDicomImage(primarySelection) && primarySelection;
9088
9189
return volumeKeys.value.map((volumeKey) => {
92-
const selectionKey = {
93-
type: 'dicom',
94-
volumeKey,
95-
} as DataSelection;
90+
const selectionKey = volumeKey as DataSelection;
9691
const isLayer = layerVolumeKeys.includes(volumeKey);
9792
const layerLoaded = loadedLayerVolumeKeys.includes(volumeKey);
9893
const layerLoading = isLayer && !layerLoaded;

‎src/components/SampleDataBrowser.vue

+3-5
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,10 @@ export default defineComponent({
102102
103103
const selection = convertSuccessResultToDataSelection(loadResult);
104104
if (selection) {
105-
const id =
106-
selection.type === 'image' ? selection.dataID : selection.volumeKey;
107-
loaded.idToURL[id] = sample.url;
108-
loaded.urlToID[sample.url] = id;
105+
loaded.idToURL[selection] = sample.url;
106+
loaded.urlToID[sample.url] = selection;
109107
110-
useVolumeColoringStore().setDefaults(id, {
108+
useVolumeColoringStore().setDefaults(selection, {
111109
transferFunction: {
112110
preset: sample.defaults?.colorPreset,
113111
},

‎src/components/SliceViewer.vue

+8
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ import VtkMouseInteractionManipulator from '@/src/components/vtk/VtkMouseInterac
177177
import vtkMouseCameraTrackballPanManipulator from '@kitware/vtk.js/Interaction/Manipulators/MouseCameraTrackballPanManipulator';
178178
import vtkMouseCameraTrackballZoomToMouseManipulator from '@kitware/vtk.js/Interaction/Manipulators/MouseCameraTrackballZoomToMouseManipulator';
179179
import { useResetViewsEvents } from '@/src/components/tools/ResetViews.vue';
180+
import { whenever } from '@vueuse/core';
180181
181182
interface Props extends LayoutViewProps {
182183
viewDirection: LPSAxisDir;
@@ -216,6 +217,13 @@ const { slice: currentSlice, range: sliceRange } = useSliceConfig(
216217
currentImageID
217218
);
218219
220+
whenever(
221+
computed(() => !isImageLoading.value),
222+
() => {
223+
resetCamera();
224+
}
225+
);
226+
219227
// segmentations
220228
const segmentations = computed(() => {
221229
if (!currentImageID.value) return [];

‎src/components/VolumeViewer.vue

+8
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ import VtkOrientationMarker from '@/src/components/vtk/VtkOrientationMarker.vue'
7474
import ViewOverlayGrid from '@/src/components/ViewOverlayGrid.vue';
7575
import useVolumeColoringStore from '@/src/store/view-configs/volume-coloring';
7676
import { useResetViewsEvents } from '@/src/components/tools/ResetViews.vue';
77+
import { whenever } from '@vueuse/core';
7778
7879
interface Props extends LayoutViewProps {
7980
viewDirection: LPSAxisDir;
@@ -100,6 +101,13 @@ useViewAnimationListener(vtkView, viewId, viewType);
100101
// base image
101102
const { currentImageID, isImageLoading } = useCurrentImage();
102103
104+
whenever(
105+
computed(() => !isImageLoading.value),
106+
() => {
107+
resetCamera();
108+
}
109+
);
110+
103111
// color preset
104112
const coloringStore = useVolumeColoringStore();
105113
const coloringConfig = computed(() =>

‎src/components/tools/windowing/WindowLevelControls.vue

+5-10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import useWindowingStore, {
77
import { useViewStore } from '@/src/store/views';
88
import { WLAutoRanges, WLPresetsCT, WL_AUTO_DEFAULT } from '@/src/constants';
99
import { getWindowLevels, useDICOMStore } from '@/src/store/datasets-dicom';
10+
import { isDicomImage } from '@/src/utils/dataSelection';
1011
1112
export default defineComponent({
1213
setup() {
@@ -31,11 +32,8 @@ export default defineComponent({
3132
// --- CT Preset Options --- //
3233
3334
const modality = computed(() => {
34-
if (
35-
currentImageID.value &&
36-
currentImageID.value in dicomStore.imageIDToVolumeKey
37-
) {
38-
const volKey = dicomStore.imageIDToVolumeKey[currentImageID.value];
35+
if (currentImageID.value && isDicomImage(currentImageID.value)) {
36+
const volKey = currentImageID.value;
3937
const { Modality } = dicomStore.volumeInfo[volKey];
4038
return Modality;
4139
}
@@ -98,11 +96,8 @@ export default defineComponent({
9896
9997
// --- Tag WL Options --- //
10098
const tags = computed(() => {
101-
if (
102-
currentImageID.value &&
103-
currentImageID.value in dicomStore.imageIDToVolumeKey
104-
) {
105-
const volKey = dicomStore.imageIDToVolumeKey[currentImageID.value];
99+
if (currentImageID.value && isDicomImage(currentImageID.value)) {
100+
const volKey = currentImageID.value;
106101
return getWindowLevels(dicomStore.volumeInfo[volKey]);
107102
}
108103
return [];

‎src/composables/useCurrentImage.ts

+4-10
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
import { useLayersStore } from '@/src/store/datasets-layers';
1616
import { createLPSBounds, getAxisBounds } from '@/src/utils/lps';
1717
import { useDatasetStore } from '@/src/store/datasets';
18-
import { getDataSelection, getImageID } from '@/src/utils/dataSelection';
1918
import { storeToRefs } from 'pinia';
2019

2120
export interface CurrentImageContext {
@@ -57,21 +56,16 @@ export function getImageData(imageID: Maybe<string>) {
5756
}
5857

5958
export function getIsImageLoading(imageID: Maybe<string>) {
60-
const dataStore = useDatasetStore();
61-
if (!dataStore.primarySelection) return false;
62-
63-
const selectedImageID = getImageID(dataStore.primarySelection);
64-
if (selectedImageID !== unref(imageID)) return false;
65-
66-
return !!dataStore.primarySelection && !dataStore.primaryDataset;
59+
if (!imageID) return false;
60+
const imageStore = useImageStore();
61+
return !imageStore.dataIndex[imageID];
6762
}
6863

6964
export function getImageLayers(imageID: Maybe<string>) {
7065
if (!imageID) return [];
71-
const selection = getDataSelection(imageID);
7266
const layersStore = useLayersStore();
7367
return layersStore
74-
.getLayers(selection)
68+
.getLayers(imageID)
7569
.filter(({ id }) => id in layersStore.layerImages);
7670
}
7771

‎src/composables/useSliceConfigInitializer.ts

+12-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function useSliceConfigInitializer(
1616
) {
1717
const store = useViewSliceStore();
1818
const { config: sliceConfig } = useSliceConfig(viewID, imageID);
19-
const { metadata } = useImage(imageID);
19+
const { metadata, isLoading } = useImage(imageID);
2020

2121
const viewAxis = computed(() => getLPSAxisFromDir(unref(viewDirection)));
2222
const sliceDomain = computed(() => {
@@ -33,17 +33,22 @@ export function useSliceConfigInitializer(
3333
});
3434

3535
watchImmediate(
36-
[toRef(sliceDomain), toRef(viewDirection)] as const,
37-
([domain, axisDirection]) => {
36+
[
37+
toRef(sliceDomain),
38+
toRef(viewDirection),
39+
toRef(imageID),
40+
isLoading,
41+
] as const,
42+
([domain, axisDirection, id, loading]) => {
43+
if (loading || !id) return;
44+
3845
const configExisted = !!sliceConfig.value;
39-
const imageIdVal = unref(imageID);
40-
if (!imageIdVal) return;
41-
store.updateConfig(unref(viewID), imageIdVal, {
46+
store.updateConfig(unref(viewID), id, {
4247
...domain,
4348
axisDirection,
4449
});
4550
if (!configExisted) {
46-
store.resetSlice(unref(viewID), imageIdVal);
51+
store.resetSlice(unref(viewID), id);
4752
}
4853
}
4954
);

‎src/composables/useVolumeColoringInitializer.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ export function useVolumeColoringInitializer(
1313
store.getConfig(unref(viewId), unref(imageId))
1414
);
1515

16-
const { imageData } = useImage(imageId);
16+
const { imageData, isLoading } = useImage(imageId);
1717

18-
watchImmediate(coloringConfig, (config) => {
19-
if (config) return;
18+
watchImmediate([coloringConfig, viewId, imageId, isLoading], () => {
19+
if (coloringConfig.value || isLoading.value) return;
2020

2121
const viewIdVal = unref(viewId);
2222
const imageIdVal = unref(imageId);

‎src/composables/useWindowingConfigInitializer.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { getWindowLevels, useDICOMStore } from '@/src/store/datasets-dicom';
99
import useWindowingStore from '@/src/store/view-configs/windowing';
1010
import { Maybe } from '@/src/types';
1111
import { useResetViewsEvents } from '@/src/components/tools/ResetViews.vue';
12+
import { isDicomImage } from '@/src/utils/dataSelection';
1213

1314
function useAutoRangeValues(imageID: MaybeRef<Maybe<string>>) {
1415
const { imageData } = useImage(imageID);
@@ -80,8 +81,8 @@ export function useWindowingConfigInitializer(
8081

8182
const firstTag = computed(() => {
8283
const id = unref(imageID);
83-
if (id && id in dicomStore.imageIDToVolumeKey) {
84-
const volKey = dicomStore.imageIDToVolumeKey[id];
84+
if (id && isDicomImage(id)) {
85+
const volKey = id;
8586
const windowLevels = getWindowLevels(dicomStore.volumeInfo[volKey]);
8687
if (windowLevels.length) {
8788
return windowLevels[0];

0 commit comments

Comments
 (0)