diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index 868d43c68ee..b9b6d3ccffc 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.71.2", - "@cornerstonejs/core": "^1.71.2", + "@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 239714051d1..e176e160aa0 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.71.2", - "@cornerstonejs/core": "^1.71.2", - "@cornerstonejs/tools": "^1.71.2", + "@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 cdc55d30fde..2a861e5e6b0 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.71.2", - "@cornerstonejs/streaming-image-volume-loader": "^1.71.2", - "@cornerstonejs/tools": "^1.71.2", + "@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 7b401cfcec5..a33153bb8f0 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.71.2", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.9.0-beta.11", "@ohif/ui": "3.9.0-beta.11", @@ -55,10 +55,10 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.71.2", - "@cornerstonejs/core": "^1.71.2", - "@cornerstonejs/streaming-image-volume-loader": "^1.71.2", - "@cornerstonejs/tools": "^1.71.2", + "@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 bc2c2a838f8..d0e8b175241 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 209afd634cb..587ddfa91e9 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.71.2", - "@cornerstonejs/tools": "^1.71.2", + "@cornerstonejs/core": "^1.74.4", + "@cornerstonejs/tools": "^1.74.4", "@ohif/core": "3.9.0-beta.11", "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.11", "@ohif/ui": "3.9.0-beta.11", diff --git a/platform/app/package.json b/platform/app/package.json index ad9d430fde4..a36e5936007 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,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.71.2", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.9.0-beta.11", "@ohif/extension-cornerstone": "3.9.0-beta.11", diff --git a/platform/core/package.json b/platform/core/package.json index d393a1e01a3..22761c799ef 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.71.2", + "@cornerstonejs/dicom-image-loader": "^1.74.4", "@ohif/ui": "3.9.0-beta.11", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/yarn.lock b/yarn.lock index c4543404aa3..39d172edbcf 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.71.2": - version "1.71.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.71.2.tgz#9efe3a7bffc2eb8d3efaf59cf13d28e39c779733" - integrity sha512-x8gHKQLCBN/B+HRPFih9TsxUa9ouyCGW87cdDAaMDCsZ8sesP67iDbpSasxErI+rBo0CLWnO91Ee5GRmP6YOhQ== +"@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.71.2" + "@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.71.2": - version "1.71.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.71.2.tgz#76f50efa8b5efa74b36fec8c10f4adc5f57269b0" - integrity sha512-JkmovK4xePFraXyAu3DsYRvANVFvd65yXpKTPjDVLQUJ4ti2EAdOOewsEulHvFgaiXuLT2zSckeknyqcg9N8vg== +"@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.71.2": - version "1.71.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.71.2.tgz#9dc75241328759bce7d362d0280a8ae8fddcb310" - integrity sha512-y970GVQucbSc5kqQugIX0a2/XS02JTHZzMEi6QsxBpApyPpBp9D8eAs4LBU1stkwah98Lr4N0bz8S2w1mx6T4A== +"@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.71.2" + "@cornerstonejs/core" "^1.74.4" dicom-parser "^1.8.9" pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/streaming-image-volume-loader@^1.71.2": - version "1.71.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.71.2.tgz#64b92c71f1550000edaa79f10259ebec05092748" - integrity sha512-sCP9oYwtb0+eL23a1/1pWuJy9PadAOxOzeIMEsBQhl174pjbyMi290NerAr6uOpQL9tP8CC0uTEDwtsHGr5faA== +"@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.71.2" + "@cornerstonejs/core" "^1.74.4" comlink "^4.4.1" -"@cornerstonejs/tools@^1.71.2": - version "1.71.2" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.71.2.tgz#fe426e63a11f960555d3f3875a3a6a763e0feae5" - integrity sha512-9LxDGx6arzD7mM5e1SkoXUpagpNQUEE9OgiRW3LFWxpgfg8Mbgy82RJkGcYb6DZNOVW6YsvF5Mu4kKqlRCnD3Q== +"@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.71.2" + "@cornerstonejs/core" "^1.74.4" "@icr/polyseg-wasm" "0.4.0" "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1" @@ -2086,7 +2086,7 @@ "@docusaurus/theme-search-algolia" "2.4.3" "@docusaurus/types" "2.4.3" -"@docusaurus/react-loadable@5.5.2": +"@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce" integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ== @@ -17783,14 +17783,6 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: dependencies: "@babel/runtime" "^7.10.3" -"react-loadable@npm:@docusaurus/react-loadable@5.5.2": - version "5.5.2" - resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-5.5.2.tgz#81aae0db81ecafbdaee3651f12804580868fa6ce" - integrity sha512-A3dYjdBGuy0IGT+wyLIGIKLRE+sAk1iNk0f1HjNDysO7u8lhL4N3VEm+FAubmJbAztn94F7MxBTPmnixbiyFdQ== - dependencies: - "@types/react" "*" - prop-types "^15.6.2" - react-modal@3.11.2: version "3.11.2" resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.11.2.tgz#bad911976d4add31aa30dba8a41d11e21c4ac8a4" @@ -19581,7 +19573,7 @@ string-natural-compare@^3.0.1: resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4" integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw== -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -19599,15 +19591,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -19703,7 +19686,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -19731,13 +19714,6 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.0, strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -21781,7 +21757,7 @@ worker-loader@3.0.8, worker-loader@^3.0.8: loader-utils "^2.0.0" schema-utils "^3.0.0" -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -21807,15 +21783,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"