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

Thumbnails sort of show up

Browse Source
This commit is contained in:
Erik Ziegler 2020-05-15 14:53:31 +02:00
parent 304caba873
commit 44733b987e
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/default/src/getPanelModule.js
View File

@ -14,7 +14,6 @@ import MeasurementTable from './MeasurementTable.js';
// - show errors in UI for thumbnails if promise fails // - show errors in UI for thumbnails if promise fails
function getImageSrc(imageId, { cornerstone }) { function getImageSrc(imageId, { cornerstone }) {
// TODO: Switch to async/await when it stops failing
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
cornerstone.loadAndCacheImage(imageId).then(image => { cornerstone.loadAndCacheImage(imageId).then(image => {
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
@ -117,7 +116,7 @@ function StudyBrowserPanel({ getDataSources, commandsManager }) {
modality: ds.Modality, modality: ds.Modality,
date: ds.SeriesDate, date: ds.SeriesDate,
numInstances: ds.numImageFrames, numInstances: ds.numImageFrames,
//imageSrc, imageSrc: thumbnailImageSrcMap.get(ds.displaySetInstanceUid),
}; };
const displaySetViewportData = viewportData.find( const displaySetViewportData = viewportData.find(

25
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 dicomMetadataStore from '../dicomMetadataStore';
class MetadataProvider { class MetadataProvider {
constructor() { constructor() {
@ -22,7 +23,7 @@ class MetadataProvider {
}); });
} }
async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) { /*async addInstance(dicomJSONDatasetOrP10ArrayBuffer, options = {}) {
let dicomJSONDataset; let dicomJSONDataset;
// If Arraybuffer, parse to DICOMJSON before naturalizing. // If Arraybuffer, parse to DICOMJSON before naturalizing.
@ -61,7 +62,7 @@ class MetadataProvider {
await this._checkBulkDataAndInlineBinaries(instance, options.server); await this._checkBulkDataAndInlineBinaries(instance, options.server);
return instance; return instance;
} }*/
addImageIdToUIDs(imageId, uids) { addImageIdToUIDs(imageId, uids) {
// This method is a fallback for when you don't have WADO-URI or WADO-RS. // This method is a fallback for when you don't have WADO-URI or WADO-RS.
@ -122,7 +123,7 @@ class MetadataProvider {
const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = uids; const { StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID } = uids;
return this._getInstanceData( return dicomMetadataStore.getInstance(
StudyInstanceUID, StudyInstanceUID,
SeriesInstanceUID, SeriesInstanceUID,
SOPInstanceUID SOPInstanceUID
@ -428,24 +429,6 @@ class MetadataProvider {
return metadata; return metadata;
} }
_getInstanceData(StudyInstanceUID, SeriesInstanceUID, SOPInstanceUID) {
const study = this.studies.get(StudyInstanceUID);
if (!study) {
return;
}
const series = study.series.get(SeriesInstanceUID);
if (!series) {
return;
}
const instance = series.instances.get(SOPInstanceUID);
return instance;
}
_getUIDsFromImageID(imageId) { _getUIDsFromImageID(imageId) {
if (imageId.includes('wadors:')) { if (imageId.includes('wadors:')) {
const strippedImageId = imageId.split('studies/')[1]; const strippedImageId = imageId.split('studies/')[1];