This commit is contained in:
Davide Punzo committed 2021-04-20 16:39:04 +02:00
1 parent e41ba2bfde
commit e421bc7df9
7 files changed
+237 -159

No files matched your search

@@ -61,7 +61,20 @@ const mapDispatchToProps = (dispatch, ownProps) => {
});
};
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata, true, onDisplaySetLoadFailureHandler);
const {referencedDisplaySet, activatedLabelmapPromise} = displaySet.getSourceDisplaySet(
ownProps.studyMetadata,
true,
onDisplaySetLoadFailureHandler
);
displaySet = referencedDisplaySet;
activatedLabelmapPromise.then((activatedLabelmapIndex) => {
const selectionFired = new CustomEvent("extensiondicomsegmentationsegselected", {
"detail": {"activatedLabelmapIndex":activatedLabelmapIndex}
});
document.dispatchEvent(selectionFired);
});
} else {
displaySet = displaySet.getSourceDisplaySet(ownProps.studyMetadata);
}
@@ -433,12 +433,12 @@ const _checkForSeriesInconsistencesWarnings = async function (displaySet, studie
return warningsList;
}
const sourceDisplaySet = displaySet.getSourceDisplaySet(studies, false);
if (!sourceDisplaySet) {
const { referencedDisplaySet } = displaySet.getSourceDisplaySet(studies, false);
if (!referencedDisplaySet) {
return warningsList;
}
const imageIds = sourceDisplaySet.images.map(image => image.getImageId());
const imageIds = referencedDisplaySet.images.map(image => image.getImageId());
if (!imageIds || imageIds.length === 0) {
return warningsList;
}
@@ -153,7 +153,13 @@ class ViewerMain extends Component {
});
};
displaySet = displaySet.getSourceDisplaySet(this.props.studies, true, onDisplaySetLoadFailureHandler);
const {referencedDisplaySet} = displaySet.getSourceDisplaySet(
this.props.studies,
true,
onDisplaySetLoadFailureHandler
);
displaySet = referencedDisplaySet;
} else {
displaySet = displaySet.getSourceDisplaySet(this.props.studies);
}