Skip to content

Commit f5ee37e

Browse files
PaulHaxPaulHax
committed
refactor: replace session-zip test with session-state-lifecycle
- Add session-state-lifecycle.e2e.ts testing 5.0.1 manifest migration - Verify rectangle, polygon, and labelmap->segmentGroup migration - Test label strokeWidth persistence through save/load cycle - Use minimal DICOM fixture for faster test execution - Remove old session-zip.e2e.ts (was excluded from test suite)
1 parent 66d4f4c commit f5ee37e

9 files changed

Lines changed: 266 additions & 284 deletions

File tree

‎src/components/tools/ScalarProbe.vue‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -118,47 +118,49 @@ const getImageSamples = (x: number, y: number) => {
118118
firstToSample.image.indexToWorld(pickedIjk) as vec3
119119
);
120120
121-
const samples = sampleSet.value.map((item: any) => {
122-
// Convert world position to this specific image's IJK
123-
const itemIjk = worldPointToIndex(item.image, worldPosition);
124-
const dims = item.image.getDimensions();
125-
const scalarData = item.image.getPointData().getScalars();
126-
127-
// Round to nearest integer indices
128-
const i = Math.round(itemIjk[0]);
129-
const j = Math.round(itemIjk[1]);
130-
const k = Math.round(itemIjk[2]);
131-
132-
// Check bounds
133-
if (
134-
i < 0 ||
135-
j < 0 ||
136-
k < 0 ||
137-
i >= dims[0] ||
138-
j >= dims[1] ||
139-
k >= dims[2]
140-
) {
141-
return null;
142-
}
143-
144-
const index = dims[0] * dims[1] * k + dims[0] * j + i;
145-
const scalars = scalarData.getTuple(index) as number[];
146-
const baseInfo = { id: item.id, name: item.name };
147-
148-
if (item.type === 'segmentGroup') {
149-
return {
150-
...baseInfo,
151-
displayValues: scalars.map(
152-
(v) => item.segments.byValue[v]?.name || 'Background'
153-
),
154-
};
155-
}
156-
return { ...baseInfo, displayValues: scalars };
157-
});
121+
const samples = sampleSet.value
122+
.map((item: any) => {
123+
// Convert world position to this specific image's IJK
124+
const itemIjk = worldPointToIndex(item.image, worldPosition);
125+
const dims = item.image.getDimensions();
126+
const scalarData = item.image.getPointData().getScalars();
127+
128+
// Round to nearest integer indices
129+
const i = Math.round(itemIjk[0]);
130+
const j = Math.round(itemIjk[1]);
131+
const k = Math.round(itemIjk[2]);
132+
133+
// Check bounds
134+
if (
135+
i < 0 ||
136+
j < 0 ||
137+
k < 0 ||
138+
i >= dims[0] ||
139+
j >= dims[1] ||
140+
k >= dims[2]
141+
) {
142+
return null;
143+
}
144+
145+
const index = dims[0] * dims[1] * k + dims[0] * j + i;
146+
const scalars = scalarData.getTuple(index) as number[];
147+
const baseInfo = { id: item.id, name: item.name };
148+
149+
if (item.type === 'segmentGroup') {
150+
return {
151+
...baseInfo,
152+
displayValues: scalars.map(
153+
(v) => item.segments.byValue[v]?.name || 'Background'
154+
),
155+
};
156+
}
157+
return { ...baseInfo, displayValues: scalars };
158+
})
159+
.filter((s): s is NonNullable<typeof s> => s !== null);
158160
159161
return {
160162
pos: worldPosition,
161-
samples: samples.filter((s): s is NonNullable<typeof s> => s !== null),
163+
samples,
162164
};
163165
};
164166

‎src/components/tools/polygon/PolygonTool.vue‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -280,41 +280,41 @@ export default defineComponent({
280280
paintStore.setActiveSegment(segment.value);
281281
}
282282
283-
const labelmap = segmentGroupStore.dataIndex[segmentGroupID];
284-
if (!labelmap) {
283+
const segmentGroup = segmentGroupStore.dataIndex[segmentGroupID];
284+
if (!segmentGroup) {
285285
throw new Error(
286-
`Failed to get labelmap for segment group ${segmentGroupID}`
286+
`Failed to get segment group data for ${segmentGroupID}`
287287
);
288288
}
289289
290-
// Convert parent slice index to labelmap slice index
290+
// Convert parent slice index to segment group slice index
291291
const parentMeta = imageMetadata.value;
292-
const labelmapSlice = convertSliceIndex(
292+
const segmentGroupSlice = convertSliceIndex(
293293
slice.value,
294294
parentMeta.lpsOrientation,
295295
parentMeta.indexToWorld,
296-
labelmap,
296+
segmentGroup,
297297
viewAxis.value
298298
);
299299
300300
const points = activeToolStore.getPoints(toolId);
301-
const labelmapIjkIndex = getLPSDirections(labelmap.getDirection())[
302-
viewAxis.value
303-
];
301+
const segmentGroupIjkIndex = getLPSDirections(
302+
segmentGroup.getDirection()
303+
)[viewAxis.value];
304304
305305
const indexSpacePoints2D = points.map((pt) => {
306-
const output = [...labelmap.worldToIndex(pt)];
307-
output.splice(labelmapIjkIndex, 1);
306+
const output = [...segmentGroup.worldToIndex(pt)];
307+
output.splice(segmentGroupIjkIndex, 1);
308308
return output as Vector2;
309309
});
310310
311311
const grid = createGridAccessor(
312-
labelmap,
313-
labelmapSlice,
314-
labelmapIjkIndex
312+
segmentGroup,
313+
segmentGroupSlice,
314+
segmentGroupIjkIndex
315315
);
316316
fillPoly(grid, indexSpacePoints2D, segment.value);
317-
labelmap.modified();
317+
segmentGroup.modified();
318318
}
319319
320320
return {

‎src/components/vtk/VtkSegmentationSliceRepresentation.vue‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,38 +91,38 @@ watchEffect(() => {
9191
const parentImageId = computed(() => metadata.value?.parentImage);
9292
const { metadata: parentMetadata } = useImage(parentImageId);
9393
94-
// Compute labelmap's LPS orientation from its direction matrix
95-
const labelmapLpsOrientation = computed(() => {
96-
const labelmap = imageData.value;
97-
if (!labelmap) return null;
98-
return getLPSDirections(labelmap.getDirection());
94+
// Compute segment group's LPS orientation from its direction matrix
95+
const segmentGroupLpsOrientation = computed(() => {
96+
const segmentGroup = imageData.value;
97+
if (!segmentGroup) return null;
98+
return getLPSDirections(segmentGroup.getDirection());
9999
});
100100
101-
// Set slicing mode based on labelmap's own orientation
101+
// Set slicing mode based on segment group's own orientation
102102
watchEffect(() => {
103-
const lpsOrientation = labelmapLpsOrientation.value;
103+
const lpsOrientation = segmentGroupLpsOrientation.value;
104104
if (!lpsOrientation) return;
105105
const ijkIndex = lpsOrientation[axis.value];
106106
const mode = [SlicingMode.I, SlicingMode.J, SlicingMode.K][ijkIndex];
107107
sliceRep.mapper.setSlicingMode(mode);
108108
});
109109
110-
// sync slicing - convert parent slice to labelmap slice via world coordinates
110+
// sync slicing - convert parent slice to segment group slice via world coordinates
111111
const slice = vtkFieldRef(sliceRep.mapper, 'slice');
112112
const { slice: storedSlice } = useSliceConfig(viewId, parentImageId);
113113
114114
watchImmediate(
115-
[storedSlice, labelmapLpsOrientation, () => parentMetadata.value],
115+
[storedSlice, segmentGroupLpsOrientation, parentMetadata],
116116
() => {
117117
const parentImage = parentMetadata.value;
118-
const labelmap = imageData.value;
119-
if (!parentImage || !labelmap || storedSlice.value == null) return;
118+
const segmentGroup = imageData.value;
119+
if (!parentImage || !segmentGroup || storedSlice.value == null) return;
120120
121121
slice.value = convertSliceIndex(
122122
storedSlice.value,
123123
parentImage.lpsOrientation,
124124
parentImage.indexToWorld,
125-
labelmap,
125+
segmentGroup,
126126
axis.value
127127
);
128128
}

‎src/io/import/common.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,49 @@ import { ChainHandler } from '@/src/utils/evaluateChain';
77
import type { Manifest } from '@/src/io/state-file/schema';
88
import type { FileEntry } from '@/src/io/types';
99

10-
export interface LoadableResult {
10+
export type LoadableResult = {
1111
type: 'data';
1212
dataID: string;
1313
dataSource: DataSource;
1414
dataType: 'image' | 'model';
15-
}
15+
};
1616

17-
export interface LoadableVolumeResult extends LoadableResult {
17+
export type LoadableVolumeResult = LoadableResult & {
1818
dataType: 'image';
19-
}
19+
};
2020

21-
export interface LoadableModelResult extends LoadableResult {
21+
export type LoadableModelResult = LoadableResult & {
2222
dataType: 'model';
23-
}
23+
};
2424

25-
export interface ConfigResult {
25+
export type ConfigResult = {
2626
type: 'config';
2727
config: Config;
2828
dataSource: DataSource;
29-
}
29+
};
3030

31-
export interface OkayResult {
31+
export type OkayResult = {
3232
type: 'ok';
3333
dataSource: DataSource;
34-
}
34+
};
3535

36-
export interface IntermediateResult {
36+
export type IntermediateResult = {
3737
type: 'intermediate';
3838
dataSources: DataSource[];
39-
}
39+
};
4040

41-
export interface StateFileSetupResult {
41+
export type StateFileSetupResult = {
4242
type: 'stateFileSetup';
4343
dataSources: DataSource[];
4444
manifest: Manifest;
4545
stateFiles: FileEntry[];
46-
}
46+
};
4747

48-
export interface ErrorResult {
48+
export type ErrorResult = {
4949
type: 'error';
5050
error: Error;
5151
dataSource: DataSource;
52-
}
52+
};
5353

5454
export type ImportResult =
5555
| LoadableResult
@@ -109,15 +109,15 @@ export const asOkayResult = (dataSource: DataSource): OkayResult => ({
109109
export type ArchiveContents = Record<string, File>;
110110
export type ArchiveCache = Map<File, Awaitable<ArchiveContents>>;
111111

112-
export interface ImportContext {
112+
export type ImportContext = {
113113
fetchFileCache?: FetchCache<File>;
114114
archiveCache?: ArchiveCache;
115115
dicomDataSources?: DataSource[];
116116
onCleanup?: (fn: () => void) => void;
117117
importDataSources?: (
118118
dataSources: DataSource[]
119119
) => Promise<ImportDataSourcesResult[]>;
120-
}
120+
};
121121

122122
export type ImportHandler = ChainHandler<
123123
DataSource,

‎src/io/import/dataSource.ts‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,58 @@ import { Maybe } from '@/src/types';
55
/**
66
* Represents a URI source with a file name for the downloaded resource.
77
*/
8-
export interface UriSource {
8+
export type UriSource = {
99
type: 'uri';
1010
uri: string;
1111
name: string;
1212
mime?: string;
1313
fetcher?: Fetcher;
14-
}
14+
};
1515

1616
/**
1717
* Represents a user-specified file.
1818
*/
19-
export interface FileSource {
19+
export type FileSource = {
2020
type: 'file';
2121
file: File;
2222
fileType: string;
23-
}
23+
};
2424

2525
/**
2626
* Represents an archive member. The parent should exist and be a FileSource.
2727
*/
28-
export interface ArchiveSource {
28+
export type ArchiveSource = {
2929
type: 'archive';
30-
// Full path + filename inside the archive
3130
path: string;
3231
parent: FileSource;
33-
}
32+
};
3433

3534
/**
3635
* Represents a collection of data sources.
3736
*
3837
* This is used for data that is derived from a collection of data sources,
3938
* e.g. reconstructed DICOM.
4039
*/
41-
export interface CollectionSource {
40+
export type CollectionSource = {
4241
type: 'collection';
43-
4442
sources: DataSource[];
45-
}
43+
};
4644

4745
/**
4846
* Represents a data chunk for further processing and import.
4947
*/
50-
export interface ChunkSource {
48+
export type ChunkSource = {
5149
type: 'chunk';
5250
chunk: Chunk;
5351
mime: string;
54-
}
52+
};
5553

56-
export interface StateFileLeaf {
54+
/**
55+
* Used to map DICOM volumes back to state file datasets.
56+
*/
57+
export type StateFileLeaf = {
5758
stateID: string;
58-
}
59+
};
5960

6061
/**
6162
* Represents a source of data.

‎tests/specs/configTestUtils.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ export const MINIMAL_DICOM = {
1111
name: 'minimal.dcm',
1212
} as const;
1313

14+
export const MINIMAL_501_SESSION = {
15+
url: 'https://data.kitware.com/api/v1/file/693077d880eaefe49a4abb88/download',
16+
name: 'minimal-501-session.volview.zip',
17+
} as const;
18+
1419
export const ANOTHER_DICOM = {
1520
url: 'https://data.kitware.com/api/v1/file/655d42a694ef39bf0a4a8bb3/download',
1621
name: '1-001.dcm',

0 commit comments

Comments
 (0)