fix: fallback to original dataset VR for XS
Co-authored-by: Davide Punzo <punzodavide@hotmail.it>
This commit is contained in:
1 parent
138e0fb3bf
commit
f57725ac8b
3 files changed
+55
-25
No files matched your search
@@ -20,6 +20,7 @@ class MetadataProvider {
|
||||
writable: false,
|
||||
value: new Map(),
|
||||
});
|
||||
this.datasets = {};
|
||||
}
|
||||
|
||||
async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
|
||||
@@ -52,6 +53,7 @@ class MetadataProvider {
|
||||
SOPInstanceUID,
|
||||
} = naturalizedDataset;
|
||||
|
||||
this._getAndCacheStudyDataset(StudyInstanceUID, dicomJSONDataset);
|
||||
const study = this._getAndCacheStudy(StudyInstanceUID);
|
||||
const series = this._getAndCacheSeriesFromStudy(study, SeriesInstanceUID);
|
||||
const instance = this._getAndCacheInstanceFromStudy(series, SOPInstanceUID);
|
||||
@@ -71,6 +73,16 @@ class MetadataProvider {
|
||||
this.imageIdToUIDs.set(imageId, uids);
|
||||
}
|
||||
|
||||
_getAndCacheStudyDataset(StudyInstanceUID, dataset) {
|
||||
if (!this.datasets[StudyInstanceUID]) {
|
||||
this.datasets[StudyInstanceUID] = dataset;
|
||||
}
|
||||
}
|
||||
|
||||
getStudyDataset(StudyInstanceUID) {
|
||||
return this.datasets[StudyInstanceUID];
|
||||
}
|
||||
|
||||
_getAndCacheStudy(StudyInstanceUID) {
|
||||
const studies = this.studies;
|
||||
|
||||
@@ -83,6 +95,7 @@ class MetadataProvider {
|
||||
|
||||
return study;
|
||||
}
|
||||
|
||||
_getAndCacheSeriesFromStudy(study, SeriesInstanceUID) {
|
||||
let series = study.series.get(SeriesInstanceUID);
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ const ErrorFallback = ({ error, componentStack, resetErrorBoundary }) => {
|
||||
|
||||
const OHIFErrorBoundary = ({
|
||||
context = 'OHIF',
|
||||
onReset = () => {},
|
||||
onError = () => {},
|
||||
onReset = () => { },
|
||||
onError = () => { },
|
||||
fallbackComponent,
|
||||
children,
|
||||
}) => {
|
||||
@@ -45,7 +45,7 @@ OHIFErrorBoundary.propTypes = {
|
||||
onReset: PropTypes.func,
|
||||
onError: PropTypes.func,
|
||||
children: PropTypes.node.isRequired,
|
||||
fallbackComponent: PropTypes.element,
|
||||
fallbackComponent: PropTypes.oneOfType([PropTypes.node, PropTypes.func, PropTypes.element]),
|
||||
};
|
||||
|
||||
export default OHIFErrorBoundary;
|
||||
Reference in new issue
Block a user