From b1b4c8c861894328a3cf05b5a853da8f9b5b7cc0 Mon Sep 17 00:00:00 2001 From: James Petts Date: Mon, 13 Jul 2020 16:35:55 +0100 Subject: [PATCH] IDC 1856 - Update dcmjs version to prevent failed naturalization of some DICOM instances. (#1898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 🐛 Fix RT Panel hide/show * Prevent infinite loop by persisting load errors on displaySet. * fix: 🐛 Fix infinite error messages * Fix unit tests. * WIP * fix: 🐛 If no contours for structure, cleanly exit and notify ✅ Closes: #1892 * Update dcmjs to solve issue. * fix: 🐛 Update dcmjs to solve end of file issue --- extensions/cornerstone/package.json | 2 +- extensions/dicom-html/package.json | 2 +- extensions/dicom-rt/package.json | 2 +- extensions/dicom-rt/src/loadRTStruct.js | 2 -- extensions/dicom-segmentation/package.json | 2 +- extensions/vtk/package.json | 2 +- platform/core/package.json | 2 +- platform/viewer/package.json | 2 +- yarn.lock | 8 ++++---- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index b0cc70628..713cbf430 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -36,7 +36,7 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "4.15.1", "cornerstone-wado-image-loader": "^3.1.0", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "dicom-parser": "^1.8.3", "hammerjs": "^2.0.8", "prop-types": "^15.6.2", diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json index db676625a..55ce3492e 100644 --- a/extensions/dicom-html/package.json +++ b/extensions/dicom-html/package.json @@ -29,7 +29,7 @@ }, "peerDependencies": { "@ohif/core": "^0.50.0", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-rt/package.json b/extensions/dicom-rt/package.json index 72c0d83ff..eb17cfc72 100644 --- a/extensions/dicom-rt/package.json +++ b/extensions/dicom-rt/package.json @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.2.8", "cornerstone-tools": "4.15.1", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/dicom-rt/src/loadRTStruct.js b/extensions/dicom-rt/src/loadRTStruct.js index 659f2087a..cbbeeff96 100644 --- a/extensions/dicom-rt/src/loadRTStruct.js +++ b/extensions/dicom-rt/src/loadRTStruct.js @@ -16,7 +16,6 @@ export default async function loadRTStruct( studies ) { const rtStructModule = cornerstoneTools.getModule('rtstruct'); - // Set here is loading is asynchronous. // If this function throws its set back to false. rtStructDisplaySet.isLoaded = true; @@ -68,7 +67,6 @@ export default async function loadRTStruct( const rtStructDisplayToolName = TOOL_NAMES.RTSTRUCT_DISPLAY_TOOL; for (let i = 0; i < ROIContourSequence.length; i++) { - const ROIContour = ROIContourSequence[i]; const { ReferencedROINumber, ContourSequence } = ROIContour; diff --git a/extensions/dicom-segmentation/package.json b/extensions/dicom-segmentation/package.json index 9ae89d520..28012284d 100644 --- a/extensions/dicom-segmentation/package.json +++ b/extensions/dicom-segmentation/package.json @@ -31,7 +31,7 @@ "@ohif/core": "^0.50.0", "cornerstone-core": "^2.2.8", "cornerstone-tools": "4.15.1", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "prop-types": "^15.6.2", "react": "^16.8.6", "react-dom": "^16.8.6" diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json index a004584f4..4458d0152 100644 --- a/extensions/vtk/package.json +++ b/extensions/vtk/package.json @@ -35,7 +35,7 @@ "cornerstone-core": "^2.2.8", "cornerstone-tools": "4.15.1", "cornerstone-wado-image-loader": "^3.1.0", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "dicom-parser": "^1.8.3", "i18next": "^17.0.3", "i18next-browser-languagedetector": "^3.0.1", diff --git a/platform/core/package.json b/platform/core/package.json index a288db234..ff188d1fd 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -39,7 +39,7 @@ "dependencies": { "@babel/runtime": "^7.5.5", "ajv": "^6.10.0", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "dicomweb-client": "^0.6.0", "immer": "6.0.2", "isomorphic-base64": "^1.0.2", diff --git a/platform/viewer/package.json b/platform/viewer/package.json index 7f1587acc..ea704de1a 100644 --- a/platform/viewer/package.json +++ b/platform/viewer/package.json @@ -67,7 +67,7 @@ "cornerstone-math": "^0.1.8", "cornerstone-tools": "4.15.1", "cornerstone-wado-image-loader": "^3.1.0", - "dcmjs": "0.13.0", + "dcmjs": "0.16.0", "dicom-parser": "^1.8.3", "dicomweb-client": "^0.4.4", "hammerjs": "^2.0.8", diff --git a/yarn.lock b/yarn.lock index 8ff61e999..b80c37c75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6534,10 +6534,10 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dcmjs@0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.13.0.tgz#16310a137a0fe800ccb2d4751a28cf023765f347" - integrity sha512-U+qGwlnkG8vwDKB4R7ryqQUtWQM1JHMKMBw5+Oy8wcPxS+vDmaRTqIcAItMh1DcZ0ia8RN0VI5TBVCOJl7GVhA== +dcmjs@0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/dcmjs/-/dcmjs-0.16.0.tgz#714755d006c3a49cf65ef13e627ff7a23151d35a" + integrity sha512-41nY3Isg5i5FoSd1s67aUgUHi146r+fb8JuiRvDsxvm7MEkkdjIzMYMtxjsrVwKRW1xRH+x34nxbV9+8cc7WQw== dependencies: "@babel/polyfill" "^7.8.3" "@babel/runtime" "^7.8.4"