Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@ export const DEFAULT_OPACITY = 0.5;
export const DEFAULT_OPACITY_PERCENT = DEFAULT_OPACITY * 100;
export const DERIVED_OVERLAY_MODALITIES = ['SEG', 'RTSTRUCT'];

const getImageIdsFromDisplaySet = displaySet =>
displaySet?.imageIds ||
displaySet?.images?.map(image => image?.imageId).filter(Boolean) ||
displaySet?.instances?.map(instance => instance?.imageId).filter(Boolean) ||
[];
Comment thread
WillianVarela marked this conversation as resolved.

const isValidVolumeDisplaySet = imageIds => {
if (!imageIds?.length) {
return false;
}

try {
return csUtils.isValidVolume(imageIds);
} catch {
return false;
}
Comment thread
WillianVarela marked this conversation as resolved.
};

/**
* Get modality-specific color and opacity settings from the customization service
*/
Expand Down Expand Up @@ -60,11 +78,12 @@ export function getEnhancedDisplaySets({ viewportId, services }) {
displaySetService.getDisplaySetByUID(displaySetUID)
);

const backgroundCanBeVolume = csUtils.isValidVolume(viewportDisplaySets[0].imageIds || []);
const backgroundDisplaySet = viewportDisplaySets[0];
const backgroundImageIds = getImageIdsFromDisplaySet(backgroundDisplaySet);
const backgroundCanBeVolume = isValidVolumeDisplaySet(backgroundImageIds);

const enhancedDisplaySets = otherDisplaySets.map(displaySet => {
if (!backgroundDisplaySet.isReconstructable) {
if (!backgroundDisplaySet?.isReconstructable) {
return {
...displaySet,
isOverlayable: false,
Expand Down Expand Up @@ -98,10 +117,10 @@ export function getEnhancedDisplaySets({ viewportId, services }) {
};
}

const imageIds = displaySet.imageIds || displaySet.images?.map(image => image.imageId);
const imageIds = getImageIdsFromDisplaySet(displaySet);
const isMultiframe = displaySet.isMultiFrame;

if (!isMultiframe && imageIds?.length > 0 && !csUtils.isValidVolume(imageIds)) {
if (!isMultiframe && imageIds?.length > 0 && !isValidVolumeDisplaySet(imageIds)) {
return {
...displaySet,
isOverlayable: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class CornerstoneCacheService {
// the 1st display set is the one of interest
const [displaySet] = displaySets;
if (!displaySet.imageIds) {
displaySet.imagesIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
displaySet.imageIds = this._getCornerstoneStackImageIds(displaySet, dataSource);
}
const { imageIds: data, viewportType: dsViewportType } = displaySet;
return {
Expand Down