IDC2361: fix seg combobox filling

This commit is contained in:
Davide Punzo committed 2021-04-19 19:42:30 +02:00
1 parent d2e75b0f20
commit e41ba2bfde
7 files changed
+68 -25

No files matched your search

@@ -241,6 +241,7 @@ export class StudyMetadata extends Metadata {
referencedFrameOfReferenceUID,
} = filter;
let tempReferencedFrameOfReferenceUID = referencedFrameOfReferenceUID;
let filteredDerivedDisplaySets = this._derivedDisplaySets;
if (Modality) {
@@ -249,8 +250,9 @@ export class StudyMetadata extends Metadata {
);
}
let finalDerivedDisplaySets;
if (referencedSeriesInstanceUID) {
filteredDerivedDisplaySets = filteredDerivedDisplaySets.filter(
finalDerivedDisplaySets = filteredDerivedDisplaySets.filter(
displaySet => {
if (!displaySet.metadata.ReferencedSeriesSequence) {
return false;
@@ -270,15 +272,28 @@ export class StudyMetadata extends Metadata {
);
}
if (referencedFrameOfReferenceUID) {
filteredDerivedDisplaySets = filteredDerivedDisplaySets.filter(
if ((!finalDerivedDisplaySets || finalDerivedDisplaySets.length === 0)
&& !tempReferencedFrameOfReferenceUID) {
const referencedDisplaySets = this._displaySets.filter(
displaySet =>
displaySet.ReferencedFrameOfReferenceUID ===
referencedFrameOfReferenceUID
displaySet.SeriesInstanceUID ===
referencedSeriesInstanceUID
);
if (referencedDisplaySets[0]) {
tempReferencedFrameOfReferenceUID = referencedDisplaySets[0].images[0]._study.FrameOfReferenceUID
}
}
if (tempReferencedFrameOfReferenceUID) {
finalDerivedDisplaySets = filteredDerivedDisplaySets.filter(
displaySet =>
displaySet.FrameOfReferenceUID ===
tempReferencedFrameOfReferenceUID
);
}
return filteredDerivedDisplaySets;
return finalDerivedDisplaySets;
}
/**
@@ -106,11 +106,11 @@ async function loadAndCacheDerivedDisplaySets(referencedDisplaySet, studies, log
}
});
recentDisplaySet.isLoading = true;
try {
await recentDisplaySet.load(referencedDisplaySet, studies);
} catch (error) {
recentDisplaySet.isLoaded = false;
recentDisplaySet.loadError = true;
logger.error({ error, message: error.message });
snackbar.show({
title: 'Error loading derived display set:',