From 71205618ecb8b592247c5acb32284bfe7e18fce5 Mon Sep 17 00:00:00 2001 From: James Petts Date: Thu, 23 Apr 2020 11:02:51 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Multiframe=20fix=20(#1661?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cornerstone/src/initCornerstoneTools.js | 10 +++++++ .../services/wado/studyInstanceHelpers.js | 10 ++++--- yarn.lock | 28 +------------------ 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/extensions/cornerstone/src/initCornerstoneTools.js b/extensions/cornerstone/src/initCornerstoneTools.js index a53f7d8e87e..8f05ec31dce 100644 --- a/extensions/cornerstone/src/initCornerstoneTools.js +++ b/extensions/cornerstone/src/initCornerstoneTools.js @@ -2,6 +2,9 @@ import Hammer from 'hammerjs'; import cornerstone from 'cornerstone-core'; import cornerstoneMath from 'cornerstone-math'; import cornerstoneTools from 'cornerstone-tools'; +import OHIF from '@ohif/core'; + +const { log } = OHIF; export default function(configuration = {}) { // For debugging @@ -12,6 +15,13 @@ export default function(configuration = {}) { cornerstoneTools.external.cornerstoneMath = cornerstoneMath; cornerstoneTools.init(configuration); + cornerstoneTools.loadHandlerManager.setErrorLoadingHandler( + (element, imageId, error) => { + log.error(imageId); + throw error; + } + ); + // Set the tool font and font size // context.font = "[style] [variant] [weight] [size]/[line height] [font family]"; const fontFamily = diff --git a/platform/core/src/studies/services/wado/studyInstanceHelpers.js b/platform/core/src/studies/services/wado/studyInstanceHelpers.js index 0aa59369d9a..bc99eaba4df 100644 --- a/platform/core/src/studies/services/wado/studyInstanceHelpers.js +++ b/platform/core/src/studies/services/wado/studyInstanceHelpers.js @@ -144,7 +144,7 @@ async function makeSOPInstance(server, study, instance) { wadorsuri, wadoRoot: server.wadoRoot, imageRendering: server.imageRendering, - thumbnailRendering: server.thumbnailRendering + thumbnailRendering: server.thumbnailRendering, }; series.instances.push(sopInstance); @@ -160,8 +160,10 @@ async function makeSOPInstance(server, study, instance) { const wadoRSMetadata = Object.assign(instance); - if (sopInstance.NumberOfFrames) { - for (let i = 0; i < sopInstance.NumberOfFrames; i++) { + const { NumberOfFrames } = sopInstance.metadata; + + if (NumberOfFrames) { + for (let i = 0; i < NumberOfFrames; i++) { const wadorsImageId = getWADORSImageId(sopInstance, i); cornerstoneWADOImageLoader.wadors.metaDataManager.add( @@ -190,7 +192,7 @@ async function makeSOPInstance(server, study, instance) { */ async function addInstancesToStudy(server, study, sopInstanceList) { return Promise.all( - sopInstanceList.map(function (sopInstance) { + sopInstanceList.map(function(sopInstance) { return makeSOPInstance(server, study, sopInstance); }) ); diff --git a/yarn.lock b/yarn.lock index c8fb0c16a0b..597c60d0117 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1247,34 +1247,13 @@ pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/runtime@7.1.2": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.2.tgz#81c89935f4647706fc54541145e6b4ecfef4b8e3" - integrity sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg== - dependencies: - regenerator-runtime "^0.12.0" - -"@babel/runtime@7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205" - integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5": +"@babel/runtime@7.1.2", "@babel/runtime@7.5.5", "@babel/runtime@7.6.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132" integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ== dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06" - integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" @@ -16411,11 +16390,6 @@ regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.12.0: - version "0.12.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de" - integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== - regenerator-runtime@^0.13.1, regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4: version "0.13.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"