From 1b290bdaa1a0ba750a4e5f539a51a636de529240 Mon Sep 17 00:00:00 2001 From: Alireza Date: Tue, 21 May 2024 16:43:47 -0400 Subject: [PATCH] fix(segmentation): Address issue where segmentation creation failed on layout change (#4153) --- extensions/cornerstone-dicom-seg/package.json | 4 +- extensions/cornerstone-dicom-sr/package.json | 6 +-- .../cornerstone-dynamic-volume/package.json | 6 +-- extensions/cornerstone/package.json | 10 ++-- .../SegmentationService.ts | 2 + extensions/measurement-tracking/package.json | 4 +- platform/app/package.json | 2 +- platform/core/package.json | 2 +- yarn.lock | 48 +++++++++---------- 9 files changed, 43 insertions(+), 41 deletions(-) diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index a48643939..d98f0c42b 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.70.14", - "@cornerstonejs/core": "^1.70.14", + "@cornerstonejs/adapters": "^1.74.4", + "@cornerstonejs/core": "^1.74.4", "@kitware/vtk.js": "30.4.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index 20587f939..08298602f 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.70.14", - "@cornerstonejs/core": "^1.70.14", - "@cornerstonejs/tools": "^1.70.14", + "@cornerstonejs/adapters": "^1.74.4", + "@cornerstonejs/core": "^1.74.4", + "@cornerstonejs/tools": "^1.74.4", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index 7b40838fc..5f035fd00 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -42,9 +42,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^1.70.14", - "@cornerstonejs/streaming-image-volume-loader": "^1.70.14", - "@cornerstonejs/tools": "^1.70.14", + "@cornerstonejs/core": "^1.74.4", + "@cornerstonejs/streaming-image-volume-loader": "^1.74.4", + "@cornerstonejs/tools": "^1.74.4", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 19fde9a7f..18e8c1872 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.2", - "@cornerstonejs/dicom-image-loader": "^1.70.14", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.8.0", "@ohif/ui": "3.8.0", @@ -55,10 +55,10 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.70.14", - "@cornerstonejs/core": "^1.70.14", - "@cornerstonejs/streaming-image-volume-loader": "^1.70.14", - "@cornerstonejs/tools": "^1.70.14", + "@cornerstonejs/adapters": "^1.74.4", + "@cornerstonejs/core": "^1.74.4", + "@cornerstonejs/streaming-image-volume-loader": "^1.74.4", + "@cornerstonejs/tools": "^1.74.4", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "30.4.1", "html2canvas": "^1.4.1", diff --git a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts index 35587e886..cab72537c 100644 --- a/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts +++ b/extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts @@ -1015,6 +1015,8 @@ class SegmentationService extends PubSubService { ): Promise => { const segmentation = this.getSegmentation(segmentationId); + toolGroupId = toolGroupId || this._getApplicableToolGroupId(); + if (!segmentation) { throw new Error(`Segmentation with segmentationId ${segmentationId} not found.`); } diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index a9c5f5be4..24d47af50 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^1.70.14", - "@cornerstonejs/tools": "^1.70.14", + "@cornerstonejs/core": "^1.74.4", + "@cornerstonejs/tools": "^1.74.4", "@ohif/core": "3.8.0", "@ohif/extension-cornerstone-dicom-sr": "3.8.0", "@ohif/ui": "3.8.0", diff --git a/platform/app/package.json b/platform/app/package.json index 5e6181094..a6d00fafb 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -54,7 +54,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^1.70.14", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.8.0", "@ohif/extension-cornerstone": "3.8.0", diff --git a/platform/core/package.json b/platform/core/package.json index 5449b7a25..05a2a17b4 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjph": "^2.4.2", - "@cornerstonejs/dicom-image-loader": "^1.70.14", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@ohif/ui": "3.8.0", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/yarn.lock b/yarn.lock index 7dd5f3fe5..7e5d0c5b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1497,13 +1497,13 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cornerstonejs/adapters@^1.70.14": - version "1.70.14" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.70.14.tgz#1eba07366a66f4d261f3a1e3769260ccf74660af" - integrity sha512-jqMIpvqDH1CPO6rPa7P9CtINOOinwfZpPU6UAuoV8zSJtwOpwViP0Xp9rx9smSmzCc3l3ZZcQ9Wq1DnuzpgPJw== +"@cornerstonejs/adapters@^1.74.4": + version "1.74.4" + resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.74.4.tgz#d612a9606545fb800e01b2f1df27a980dfe23cad" + integrity sha512-H2nDqfhcZrrqd31KTMAKc+dkFw5K2DBmuqByCo/uRqXZRV8QlimnFdVu3eAsKL+qrx17lUZTVHMchjix7OLHow== dependencies: "@babel/runtime-corejs2" "^7.17.8" - "@cornerstonejs/tools" "^1.70.14" + "@cornerstonejs/tools" "^1.74.4" buffer "^6.0.3" dcmjs "^0.29.8" gl-matrix "^3.4.3" @@ -1550,10 +1550,10 @@ resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0" integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg== -"@cornerstonejs/core@^1.70.14": - version "1.70.14" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.70.14.tgz#f19c9c3da793513b0f6163661f98c633a83ee2b9" - integrity sha512-DrhjlbtGiV9EyHUiGh2RhPzhFQWxZwDCqqkhxBOLl5QiUalByZNyZyN1OHtX0zOyIwVsFw58yvVKYX7s3bpqOw== +"@cornerstonejs/core@^1.74.4": + version "1.74.4" + resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.74.4.tgz#68ffc9457b1655b697edd75456c384f39111bb4a" + integrity sha512-SUpAGb9yLCa0/ZzV/+ntq19HozRBlHTyT2GFIkLda3ShUOO5EeElf5MgoSKhwGCwHKIZK0MyxWkTOHYWQ25yrw== dependencies: "@kitware/vtk.js" "30.4.1" comlink "^4.4.1" @@ -1561,34 +1561,34 @@ gl-matrix "^3.4.3" lodash.clonedeep "4.5.0" -"@cornerstonejs/dicom-image-loader@^1.70.14": - version "1.70.14" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.70.14.tgz#3f776bc92b627ec1a80aec0581ee40d06f1ff815" - integrity sha512-bpYf9s/jhTegxCrrgvvtfJoFDOltkEWAKxqaUjt01g7Z6lnkC6IUaH3XoMZy/0n4un28tTk3xVHF1vAw0upCig== +"@cornerstonejs/dicom-image-loader@^1.74.4": + version "1.74.4" + resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.74.4.tgz#9a7652956062236aff1e62b96855bcab7bc5153e" + integrity sha512-2C50FZ5tFUbYlTPio7U+uZWvqnpfaA8IgeMVeUdVS3/5boKH22sCwwCdTNU2758ch9vYuyvjvre+BMo6jC+3kQ== dependencies: "@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" "@cornerstonejs/codec-openjpeg" "^1.2.2" "@cornerstonejs/codec-openjph" "^2.4.5" - "@cornerstonejs/core" "^1.70.14" + "@cornerstonejs/core" "^1.74.4" dicom-parser "^1.8.9" pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/streaming-image-volume-loader@^1.70.14": - version "1.70.14" - resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.70.14.tgz#e46a4152f6b5ac9a1ce7079d765b8ce9bdcc91ef" - integrity sha512-yObvU8CB/2F0gLyeRzM5NIxNLQimNHEfJnXuv/EYNATq+wOeKWle3jfUm9xN/ZTiSp1MrBMaG7g26OlyIjEp4Q== +"@cornerstonejs/streaming-image-volume-loader@^1.74.4": + version "1.74.4" + resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.74.4.tgz#d35e1a5f2650f0f9327148e429325b2e2331a829" + integrity sha512-iFQKEDLOFoBFRYk1OhtLAq8UnYBYCXAvB/8HUeqtGMSat+kgs0nNGK+Il0B92lavQbuE+eApzBntmpzs9dcF1w== dependencies: - "@cornerstonejs/core" "^1.70.14" + "@cornerstonejs/core" "^1.74.4" comlink "^4.4.1" -"@cornerstonejs/tools@^1.70.14": - version "1.70.14" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.70.14.tgz#7083459c3e206c280cf728d44fe9f4ca09874d2b" - integrity sha512-NI4yLC9PNHwa2KO0DqjZET2vZz8VfW095m637gk5E5wojq3dvSJot7w4y+zTCiyaxXjUUoMzc0TJYmmqtdbWPg== +"@cornerstonejs/tools@^1.74.4": + version "1.74.4" + resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.74.4.tgz#67d262e6ca27fe35a01c7def457513d9f1364216" + integrity sha512-dD1nUTGbC/jf+gFs33GqwIQ7MGtgeIrNL6WsZq9989LjFQOKsVKFWUWyxcPK5Y2MidNh2TPirUsZ81dEW4A4Hg== dependencies: - "@cornerstonejs/core" "^1.70.14" + "@cornerstonejs/core" "^1.74.4" "@icr/polyseg-wasm" "0.4.0" "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"