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

Fix palette colour display in OHIF v3 (#2731)

Browse Source 
* fix(OHIFv3):Fix palette colour data display

* PR comments - added params description
This commit is contained in:
Bill Wallace authored and GitHub committed 2022-03-11 11:18:56 -05:00
1 parent 3184e5572f
commit f3822f98a3
4 files changed
+67 -231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

platform/core/src/classes/MetadataProvider.js
+7 -80
View File
@@ -2,6 +2,7 @@ import queryString from 'query-string';
import dicomParser from 'dicom-parser';
import getPixelSpacingInformation from '../utils/metadataProvider/getPixelSpacingInformation';
import DicomMetadataStore from '../services/DicomMetadataStore';
import fetchPaletteColorLookupTableData from '../utils/metadataProvider/fetchPaletteColorLookupTableData';
class MetadataProvider {
constructor() {
@@ -20,46 +21,6 @@ class MetadataProvider {
});
}
/*async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
let dicomJSONDataset;
// If Arraybuffer, parse to DICOMJSON before naturalizing.
if (dicomJSONDatasetOrP10ArrayBuffer instanceof ArrayBuffer) {
const dicomData = DicomMessage.readFile(dicomJSONDatasetOrP10ArrayBuffer);
dicomJSONDataset = dicomData.dict;
} else {
dicomJSONDataset = dicomJSONDatasetOrP10ArrayBuffer;
}
// Check if dataset is already naturalized.
let naturalizedDataset;
if (dicomJSONDataset['SeriesInstanceUID'] === undefined) {
naturalizedDataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(
dicomJSONDataset
);
} else {
naturalizedDataset = dicomJSONDataset;
}
const {
StudyInstanceUID,
SeriesInstanceUID,
SOPInstanceUID,
} = naturalizedDataset;
const study = this._getAndCacheStudy(StudyInstanceUID);
const series = this._getAndCacheSeriesFromStudy(study, SeriesInstanceUID);
const instance = this._getAndCacheInstanceFromStudy(series, SOPInstanceUID);
Object.assign(instance, naturalizedDataset);
await this._checkBulkDataAndInlineBinaries(instance, options.server);
return instance;
}*/
addImageIdToUIDs(imageId, uids) {
// This method is a fallback for when you don't have WADO-URI or WADO-RS.
@@ -69,40 +30,6 @@ class MetadataProvider {
this.imageIdToUIDs.set(imageId, uids);
}
// _getAndCacheStudy(StudyInstanceUID) {
// const studies = this.studies;
// let study = studies.get(StudyInstanceUID);
// if (!study) {
// study = { series: new Map() };
// studies.set(StudyInstanceUID, study);
// }
// return study;
// }
// _getAndCacheSeriesFromStudy(study, SeriesInstanceUID) {
// let series = study.series.get(SeriesInstanceUID);
// if (!series) {
// series = { instances: new Map() };
// study.series.set(SeriesInstanceUID, series);
// }
// return series;
// }
// _getAndCacheInstanceFromStudy(series, SOPInstanceUID) {
// let instance = series.instances.get(SOPInstanceUID);
// if (!instance) {
// instance = {};
// series.instances.set(SOPInstanceUID, instance);
// }
// return instance;
// }
_getInstance(imageId) {
const uids = this._getUIDsFromImageID(imageId);
@@ -254,14 +181,14 @@ class MetadataProvider {
bluePaletteColorLookupTableDescriptor: validNumber(
instance.BluePaletteColorLookupTableDescriptor
),
redPaletteColorLookupTableData: validNumber(
instance.RedPaletteColorLookupTableData
redPaletteColorLookupTableData: fetchPaletteColorLookupTableData(
instance, "RedPaletteColorLookupTableData", "RedPaletteColorLookupTableDescriptor"
),
greenPaletteColorLookupTableData: validNumber(
instance.GreenPaletteColorLookupTableData
greenPaletteColorLookupTableData: fetchPaletteColorLookupTableData(
instance, "GreenPaletteColorLookupTableData", "GreenPaletteColorLookupTableDescriptor"
),
bluePaletteColorLookupTableData: validNumber(
instance.BluePaletteColorLookupTableData
bluePaletteColorLookupTableData: fetchPaletteColorLookupTableData(
instance, "BluePaletteColorLookupTableData", "BluePaletteColorLookupTableDescriptor"
),
};