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

fix(filesToStudies): Improve error handling for local file viewing (#652)

Browse Source
This commit is contained in:
Erik Ziegler 2019-07-11 14:34:29 +02:00 committed by GitHub
parent ef6819cf40
commit 8b3e5dffb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/filesToStudies.js
View File

@ -130,11 +130,19 @@ function datasetsToStudies(datasets) {
export default async function filesToStudies(files) { export default async function filesToStudies(files) {
const imagePromises = files.map(file => { const imagePromises = files.map(file => {
const imageId = cornerstoneWADOImageLoader.wadouri.fileManager.add(file); const imageId = cornerstoneWADOImageLoader.wadouri.fileManager.add(file);
return cornerstone.loadAndCacheImage(imageId); return cornerstone
.loadAndCacheImage(imageId)
.catch(error => console.warn(error));
}); });
const images = await Promise.all(imagePromises); const images = await Promise.all(imagePromises);
const datasets = images.map(image => { const datasets = [];
images.forEach(image => {
if (!image || !image.data) {
return;
}
const arrayBuffer = image.data.byteArray.buffer; const arrayBuffer = image.data.byteArray.buffer;
const dicomData = dcmjs.data.DicomMessage.readFile(arrayBuffer); const dicomData = dcmjs.data.DicomMessage.readFile(arrayBuffer);
const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset( const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(
@ -145,7 +153,7 @@ export default async function filesToStudies(files) {
); );
dataset.imageId = image.imageId; dataset.imageId = image.imageId;
return dataset; datasets.push(dataset);
}); });
return datasetsToStudies(datasets); return datasetsToStudies(datasets);