IDC2361: fix seg combobox filling
This commit is contained in:
1 parent
d2e75b0f20
commit
e41ba2bfde
7 files changed
+68
-25
No files matched your search
@@ -298,7 +298,7 @@ const SegmentationPanel = ({
|
||||
);
|
||||
|
||||
const filteredReferencedSegDisplaysets = referencedSegDisplaysets.filter(
|
||||
(segDisplay => segDisplay.loadError !== true && segDisplay.isLoaded));
|
||||
(segDisplay => segDisplay.loadError !== true));
|
||||
|
||||
return filteredReferencedSegDisplaysets.map((displaySet, index) => {
|
||||
const {
|
||||
|
||||
@@ -55,6 +55,7 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
||||
referencedDisplaySetUID: null, // Assigned when loaded.
|
||||
labelmapIndex: null, // Assigned when loaded.
|
||||
isLoaded: false,
|
||||
loadError: false,
|
||||
hasOverlapping: false,
|
||||
SeriesDate,
|
||||
SeriesTime,
|
||||
@@ -68,7 +69,6 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
||||
};
|
||||
|
||||
segDisplaySet.load = async function(referencedDisplaySet, studies) {
|
||||
segDisplaySet.isLoading = true;
|
||||
segDisplaySet.isLoaded = true;
|
||||
const { StudyInstanceUID } = referencedDisplaySet;
|
||||
const segArrayBuffer = await DicomLoaderService.findDicomDataPromise(
|
||||
@@ -129,7 +129,6 @@ export default function getSopClassHandlerModule({ servicesManager }) {
|
||||
}
|
||||
};
|
||||
|
||||
segDisplaySet.isLoading = false;
|
||||
return segDisplaySet;
|
||||
},
|
||||
};
|
||||
|
||||
@@ -36,14 +36,32 @@ const _getReferencedDisplaySet = (segDisplaySet, studies) => {
|
||||
referencedSeriesInstanceUIDs = ReferencedSeriesSequence.map(
|
||||
ReferencedSeries => ReferencedSeries.SeriesInstanceUID
|
||||
);
|
||||
} else {
|
||||
const { PerFrameFunctionalGroupsSequence } = metadata;
|
||||
}
|
||||
|
||||
if (metadata.ReferencedImageSequence &&
|
||||
(!referencedSeriesInstanceUIDs || referencedSeriesInstanceUIDs.length === 0)) {
|
||||
const referencedImageArray = _toArray(metadata.ReferencedImageSequence);
|
||||
for (let i = 0; i < referencedImageArray.length; i++) {
|
||||
const { ReferencedSOPInstanceUID } = referencedImageArray[i];
|
||||
|
||||
referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromSOPInstanceUID(
|
||||
otherDisplaySets,
|
||||
ReferencedSOPInstanceUID
|
||||
);
|
||||
|
||||
if (referencedSeriesInstanceUIDs && referencedSeriesInstanceUIDs.length !== 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!referencedSeriesInstanceUIDs || referencedSeriesInstanceUIDs.length === 0) {
|
||||
let SourceImageSequence;
|
||||
|
||||
if (metadata.SourceImageSequence) {
|
||||
SourceImageSequence = metadata.SourceImageSequence;
|
||||
} else {
|
||||
const { PerFrameFunctionalGroupsSequence } = metadata;
|
||||
const firstFunctionalGroups = _toArray(
|
||||
PerFrameFunctionalGroupsSequence
|
||||
)[0];
|
||||
@@ -52,14 +70,23 @@ const _getReferencedDisplaySet = (segDisplaySet, studies) => {
|
||||
SourceImageSequence = DerivationImageSequence;
|
||||
}
|
||||
|
||||
const firstSourceImage = _toArray(SourceImageSequence)[0];
|
||||
const sourceImageArray = _toArray(SourceImageSequence);
|
||||
for (let i = 0; i < sourceImageArray.length; i++) {
|
||||
const { ReferencedSOPInstanceUID } = sourceImageArray[i];
|
||||
|
||||
const { ReferencedSOPInstanceUID } = firstSourceImage;
|
||||
referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromSOPInstanceUID(
|
||||
otherDisplaySets,
|
||||
ReferencedSOPInstanceUID
|
||||
);
|
||||
|
||||
referencedSeriesInstanceUIDs = _findReferencedSeriesInstanceUIDsFromSOPInstanceUID(
|
||||
otherDisplaySets,
|
||||
ReferencedSOPInstanceUID
|
||||
);
|
||||
if (referencedSeriesInstanceUIDs && referencedSeriesInstanceUIDs.length !== 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!referencedSeriesInstanceUIDs || referencedSeriesInstanceUIDs.length === 0) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const referencedDisplaySet = otherDisplaySets.find(ds =>
|
||||
|
||||
@@ -47,16 +47,11 @@ export default async function setActiveLabelmap(
|
||||
return labelmapIndex;
|
||||
}
|
||||
|
||||
if (displaySet.isLoading) {
|
||||
return activeLabelmapIndex;
|
||||
}
|
||||
|
||||
if (!displaySet.isLoaded) {
|
||||
try {
|
||||
await displaySet.load(referencedDisplaySet, studies);
|
||||
} catch (error) {
|
||||
displaySet.isLoaded = false;
|
||||
displaySet.isLoading = false;
|
||||
displaySet.loadError = true;
|
||||
onDisplaySetLoadFailure(error);
|
||||
|
||||
@@ -74,8 +69,11 @@ export default async function setActiveLabelmap(
|
||||
|
||||
// This might have just been created, so need to use the non-cached value.
|
||||
state = cornerstoneTools.getModule('segmentation').state;
|
||||
|
||||
brushStackState = state.series[firstImageId];
|
||||
brushStackState.activeLabelmapIndex = labelmapIndex;
|
||||
if (brushStackState) {
|
||||
brushStackState.activeLabelmapIndex = labelmapIndex;
|
||||
}
|
||||
|
||||
refreshViewports();
|
||||
callback();
|
||||
|
||||
Reference in new issue
Block a user