TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wl): fix metadata provider window level issues after dicomweb update (string vs number)

Browse Source
This commit is contained in:
igoroctaviano 2021-04-15 09:15:42 -03:00
parent 4bb36704ee
commit 8681036b21
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/core/src/classes/MetadataProvider.js
View File

@ -4,6 +4,7 @@ import dicomParser from 'dicom-parser';
import getPixelSpacingInformation from '../utils/metadataProvider/getPixelSpacingInformation'; import getPixelSpacingInformation from '../utils/metadataProvider/getPixelSpacingInformation';
import fetchPaletteColorLookupTableData from '../utils/metadataProvider/fetchPaletteColorLookupTableData'; import fetchPaletteColorLookupTableData from '../utils/metadataProvider/fetchPaletteColorLookupTableData';
import fetchOverlayData from '../utils/metadataProvider/fetchOverlayData'; import fetchOverlayData from '../utils/metadataProvider/fetchOverlayData';
import validNumber from '../utils/metadataProvider/validNumber';
class MetadataProvider { class MetadataProvider {
constructor() { constructor() {
@ -284,7 +285,7 @@ class MetadataProvider {
break; break;
case WADO_IMAGE_LOADER_TAGS.VOI_LUT_MODULE: case WADO_IMAGE_LOADER_TAGS.VOI_LUT_MODULE:
const { WindowCenter, WindowWidth } = instance; let { WindowCenter, WindowWidth } = instance;
const windowCenter = Array.isArray(WindowCenter) const windowCenter = Array.isArray(WindowCenter)
? WindowCenter ? WindowCenter
@ -294,15 +295,17 @@ class MetadataProvider {
: [WindowWidth]; : [WindowWidth];
metadata = { metadata = {
windowCenter, windowCenter: validNumber(windowCenter),
windowWidth, windowWidth: validNumber(windowWidth),
}; };
break; break;
case WADO_IMAGE_LOADER_TAGS.MODALITY_LUT_MODULE: case WADO_IMAGE_LOADER_TAGS.MODALITY_LUT_MODULE:
const rescaleSlope = validNumber(instance.RescaleSlope);
const rescaleIntercept = validNumber(instance.RescaleIntercept);
metadata = { metadata = {
rescaleIntercept: instance.RescaleIntercept, rescaleIntercept,
rescaleSlope: instance.RescaleSlope, rescaleSlope,
rescaleType: instance.RescaleType, rescaleType: instance.RescaleType,
}; };
break; break;

9
platform/core/src/utils/metadataProvider/validNumber.js Normal file
View File

@ -0,0 +1,9 @@
const validNumber = val => {
if (Array.isArray(val)) {
return val.map(v => (v !== undefined ? Number(v) : v));
} else {
return val !== undefined ? Number(val) : val;
}
};
export default validNumber;