Skip to content

Commit

Permalink
fix(tools): enable additional tools in volume viewport (#4620)
Browse files Browse the repository at this point in the history
  • Loading branch information
@IbrahimCSAE
IbrahimCSAE authored Dec 20, 2024
1 parent ede5724 commit 1992002
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 38 deletions.
Binary file modified bun.lockb
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions extensions/cornerstone-dicom-pmap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^2.11.2",
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/adapters": "^2.14.2",
"@cornerstonejs/core": "^2.14.2",
"@kitware/vtk.js": "32.1.1",
"react-color": "^2.19.3"
}
Expand Down
4 changes: 2 additions & 2 deletions extensions/cornerstone-dicom-seg/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^2.11.2",
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/adapters": "^2.14.2",
"@cornerstonejs/core": "^2.14.2",
"@kitware/vtk.js": "32.1.1",
"react-color": "^2.19.3"
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/cornerstone-dicom-sr/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^2.11.2",
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/tools": "^2.11.2",
"@cornerstonejs/adapters": "^2.14.2",
"@cornerstonejs/core": "^2.14.2",
"@cornerstonejs/tools": "^2.14.2",
"classnames": "^2.3.2"
}
}
4 changes: 2 additions & 2 deletions extensions/cornerstone-dynamic-volume/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/tools": "^2.11.2",
"@cornerstonejs/core": "^2.14.2",
"@cornerstonejs/tools": "^2.14.2",
"classnames": "^2.3.2"
}
}
8 changes: 4 additions & 4 deletions extensions/cornerstone/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/dicom-image-loader": "^2.11.2",
"@cornerstonejs/dicom-image-loader": "^2.14.2",
"@icr/polyseg-wasm": "^0.4.0",
"@ohif/core": "3.10.0-beta.32",
"@ohif/ui": "3.10.0-beta.32",
Expand All @@ -55,9 +55,9 @@
},
"dependencies": {
"@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^2.11.2",
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/tools": "^2.11.2",
"@cornerstonejs/adapters": "^2.14.2",
"@cornerstonejs/core": "^2.14.2",
"@cornerstonejs/tools": "^2.14.2",
"@icr/polyseg-wasm": "^0.4.0",
"@kitware/vtk.js": "32.1.1",
"html2canvas": "^1.4.1",
Expand Down
4 changes: 2 additions & 2 deletions extensions/measurement-tracking/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"start": "yarn run dev"
},
"peerDependencies": {
"@cornerstonejs/core": "^2.11.2",
"@cornerstonejs/tools": "^2.11.2",
"@cornerstonejs/core": "^2.14.2",
"@cornerstonejs/tools": "^2.14.2",
"@ohif/core": "3.10.0-beta.32",
"@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.32",
"@ohif/extension-default": "3.10.0-beta.32",
Expand Down
1 change: 1 addition & 0 deletions modes/basic-test-mode/src/initToolGroups.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) {
{ toolName: toolNames.WindowLevelRegion },
{ toolName: toolNames.PlanarFreehandROI },
{ toolName: toolNames.SplineROI },
{ toolName: toolNames.LivewireContour },
],
disabled: [
{
Expand Down
2 changes: 2 additions & 0 deletions modes/longitudinal/src/initToolGroups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m
{ toolName: toolNames.Angle },
{ toolName: toolNames.CobbAngle },
{ toolName: toolNames.PlanarFreehandROI },
{ toolName: toolNames.SplineROI },
{ toolName: toolNames.LivewireContour },
{ toolName: toolNames.WindowLevelRegion },
{
toolName: toolNames.PlanarFreehandContourSegmentation,
Expand Down
1 change: 0 additions & 1 deletion platform/app/cypress/integration/volume/MPR.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ describe('OHIF MPR', () => {
.its('cornerstone')
.then(cornerstone => {
const viewports = cornerstone.getRenderingEngines()[0].getViewports();

// The stack viewport still exists after the changes to viewportId and inde
const imageData1 = viewports[0].getImageData();
const imageData2 = viewports[1].getImageData();
Expand Down
2 changes: 1 addition & 1 deletion platform/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/dicom-image-loader": "^2.11.2",
"@cornerstonejs/dicom-image-loader": "^2.14.2",
"@emotion/serialize": "^1.1.3",
"@ohif/core": "3.10.0-beta.32",
"@ohif/extension-cornerstone": "3.10.0-beta.32",
Expand Down
2 changes: 1 addition & 1 deletion platform/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.4",
"@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/dicom-image-loader": "^2.11.2",
"@cornerstonejs/dicom-image-loader": "^2.14.2",
"@ohif/ui": "3.10.0-beta.32",
"cornerstone-math": "0.1.9",
"dicom-parser": "^1.8.21"
Expand Down
73 changes: 53 additions & 20 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2580,10 +2580,10 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==

"@cornerstonejs/adapters@^2.11.2":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.12.0.tgz#cc3a4c5bcf7909e9b5ddd49200eb65f4223f5f02"
integrity sha512-ic1GsbuFijo+hBbCgEvy2OJZf4qgFBH7HNW4xsW4L66XoRVHRUTcO++UCqRWkCT4wd9jCdynuoHlKeeOhEIBDg==
"@cornerstonejs/adapters@^2.14.2":
version "2.14.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.14.2.tgz#cd1f750c34a7b723e09092ba3b2486d287a9ccb2"
integrity sha512-/zKVRwyHa0qjYWYKLQXx5776MJGcyEKYt7sXmtsKDj6AJlfx0W8UMP2/DFDlaadfX5jKckHCSDrPOtzzjYbIbQ==
dependencies:
"@babel/runtime-corejs2" "^7.17.8"
buffer "^6.0.3"
Expand Down Expand Up @@ -2616,19 +2616,19 @@
resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0"
integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg==

"@cornerstonejs/core@^2.11.2":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.12.0.tgz#866aba96c2a392035aff01fbe60cbb9da04032b5"
integrity sha512-vs36uAf70UlPjtVboKMoQghB8SSu77nf0t7qoQ3nxzCcJS0iU0k3nmmuQDMg5c4Ot5ijRoaMvRrGZdh7a+Ej9Q==
"@cornerstonejs/core@^2.14.2":
version "2.14.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.14.2.tgz#35817e0c5cc9e3641df757e43e071ee3c91fde54"
integrity sha512-1a8+b4RtnyPRI6bevfEu4KXhVNiEd1CNeaByKegWbd+FyE5yek6DIwW0fJPIxdhA+z6nacFVdKtgbdAwuTDqoA==
dependencies:
"@kitware/vtk.js" "32.1.1"
comlink "^4.4.1"
gl-matrix "^3.4.3"

"@cornerstonejs/dicom-image-loader@^2.11.2":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.12.0.tgz#2bf3056561a02f3c202ae58f669b6413c3c0bccb"
integrity sha512-ppJQF1NZWBf4L8nknJC+vnqqCa3ymVJSF6IO0pDqlBaXeRtEgoHtPnuxSs6GJcOFiS9kcsuoCe0s0i9XBjJ0CQ==
"@cornerstonejs/dicom-image-loader@^2.14.2":
version "2.14.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.14.2.tgz#643c3d7d1f8ba6632665bce94e9a54c52dedc2b7"
integrity sha512-qNKN+7FoiT6flhhWrNoBYs/v6meiuWtiteo08IKIf+uVpjABnk7lEHXozsQ4GQIieCJ7jhqHHXPMbSHQh6Jktw==
dependencies:
"@cornerstonejs/codec-charls" "^1.2.3"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2"
Expand All @@ -2639,10 +2639,10 @@
pako "^2.0.4"
uuid "^9.0.0"

"@cornerstonejs/tools@^2.11.2":
version "2.12.0"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.12.0.tgz#11bc60af33c5c9e8dd8aa675423bf0b01ee10d9d"
integrity sha512-w01lx0OAM1lM+5jQy4spMgWj5nfHSl40I/XU/dYiTBmAXUXJiNdlmOrfnWzXedUola9hyNnbve2vk6DFi1OmGA==
"@cornerstonejs/tools@^2.14.2":
version "2.14.2"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.14.2.tgz#2647a564bfda88fa11c7edb6ad691fb4b1ec080c"
integrity sha512-kiWD/hmXxX7N60KLghuN7aItJ2z1jaO3TnCR2gkQ865Rl/aV5yGZEonUqlH4iHrCDS2d7f0NcXQX0sKAc7PJXw==
dependencies:
"@types/offscreencanvas" "2019.7.3"
comlink "^4.4.1"
Expand Down Expand Up @@ -3203,7 +3203,7 @@
"@docusaurus/theme-search-algolia" "3.6.1"
"@docusaurus/types" "3.6.1"

"@docusaurus/[email protected]", "react-loadable@npm:@docusaurus/[email protected]":
"@docusaurus/[email protected]":
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==
Expand Down Expand Up @@ -20853,6 +20853,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1:
dependencies:
"@babel/runtime" "^7.10.3"

"react-loadable@npm:@docusaurus/[email protected]":
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-loadable@npm:@docusaurus/[email protected]":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@docusaurus/react-loadable/-/react-loadable-6.0.0.tgz#de6c7f73c96542bd70786b8e522d535d69069dc4"
Expand Down Expand Up @@ -22765,7 +22773,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@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0":
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==
Expand All @@ -22783,6 +22791,15 @@ 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.1.0, string-width@^4.2.0, 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.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
Expand Down Expand Up @@ -22893,7 +22910,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@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm: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==
Expand All @@ -22914,6 +22931,13 @@ strip-ansi@^4.0.0:
dependencies:
ansi-regex "^3.0.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"
Expand Down Expand Up @@ -25231,7 +25255,7 @@ [email protected], 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@^7.0.0:
"wrap-ansi-cjs@npm: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==
Expand All @@ -25257,6 +25281,15 @@ 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"
Expand Down

0 comments on commit 1992002

Please sign in to comment.