diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index b70fac1f3..d885afdc9 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.74.7", - "@cornerstonejs/core": "^1.74.7", + "@cornerstonejs/adapters": "^1.77.3", + "@cornerstonejs/core": "^1.77.3", "@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 c1454051d..84ea4e4b3 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.74.7", - "@cornerstonejs/core": "^1.74.7", - "@cornerstonejs/tools": "^1.74.7", + "@cornerstonejs/adapters": "^1.77.3", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index b09b2dde3..2193e48b6 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.74.7", - "@cornerstonejs/streaming-image-volume-loader": "^1.74.7", - "@cornerstonejs/tools": "^1.74.7", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/streaming-image-volume-loader": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index eeed1e716..4367beb7c 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.74.7", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@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.74.7", - "@cornerstonejs/core": "^1.74.7", - "@cornerstonejs/streaming-image-volume-loader": "^1.74.7", - "@cornerstonejs/tools": "^1.74.7", + "@cornerstonejs/adapters": "^1.77.3", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/streaming-image-volume-loader": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "30.4.1", "html2canvas": "^1.4.1", diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index c8a1bb40f..1af936331 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.74.7", - "@cornerstonejs/tools": "^1.74.7", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "@ohif/core": "3.8.0", "@ohif/extension-cornerstone-dicom-sr": "3.8.0", "@ohif/ui": "3.8.0", diff --git a/extensions/tmtv/src/utils/hpViewports.ts b/extensions/tmtv/src/utils/hpViewports.ts index a93392170..8b76cf89c 100644 --- a/extensions/tmtv/src/utils/hpViewports.ts +++ b/extensions/tmtv/src/utils/hpViewports.ts @@ -127,7 +127,7 @@ const ptAXIAL = { source: true, target: false, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -174,7 +174,7 @@ const ptSAGITTAL = { source: true, target: false, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -221,7 +221,7 @@ const ptCORONAL = { source: true, target: false, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -277,7 +277,7 @@ const fusionAXIAL = { source: false, target: true, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -343,7 +343,7 @@ const fusionSAGITTAL = { source: false, target: true, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -409,7 +409,7 @@ const fusionCORONAL = { source: false, target: true, options: { - syncInvertState: false, + syncColormap: false, }, }, ], @@ -460,7 +460,7 @@ const mipSAGITTAL = { source: true, target: false, options: { - syncInvertState: false, + syncColormap: false, }, }, ], diff --git a/modes/segmentation/src/toolbarButtons.ts b/modes/segmentation/src/toolbarButtons.ts index 11229f031..1aaf42045 100644 --- a/modes/segmentation/src/toolbarButtons.ts +++ b/modes/segmentation/src/toolbarButtons.ts @@ -1,5 +1,5 @@ import type { Button } from '@ohif/core/types'; -import { defaults, ToolbarService, ViewportGridService } from '@ohif/core'; +import { ToolbarService, ViewportGridService } from '@ohif/core'; const { createButton } = ToolbarService; diff --git a/modes/tmtv/src/index.ts b/modes/tmtv/src/index.ts index c9774551d..1ef04ca73 100644 --- a/modes/tmtv/src/index.ts +++ b/modes/tmtv/src/index.ts @@ -53,7 +53,6 @@ function modeFactory({ modeConfiguration }) { customizationService, hangingProtocolService, displaySetService, - viewportGridService, } = servicesManager.services; const utilityModule = extensionManager.getModuleEntry( @@ -97,7 +96,6 @@ function modeFactory({ modeConfiguration }) { 'WindowLevel', 'Crosshairs', 'Pan', - 'SyncToggle', ]); toolbarService.createButtonSection('ROIThresholdToolbox', [ 'RectangleROIStartEndThreshold', diff --git a/modes/tmtv/src/initToolGroups.js b/modes/tmtv/src/initToolGroups.js index c062fd811..899bcc32d 100644 --- a/modes/tmtv/src/initToolGroups.js +++ b/modes/tmtv/src/initToolGroups.js @@ -132,12 +132,6 @@ function _initToolGroups( { toolName: toolNames.Crosshairs, configuration: { - viewportIndicators: true, - viewportIndicatorsConfig: { - circleRadius: 5, - xOffset: 0.95, - yOffset: 0.05, - }, disableOnPassive: true, autoPan: { enabled: false, diff --git a/package.json b/package.json index c52519e0e..6509a404f 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,8 @@ "dependencies": { "@babel/runtime": "^7.20.13", "@kitware/vtk.js": "30.4.1", - "core-js": "^3.2.1" + "core-js": "^3.2.1", + "comlink": "^4.4.1" }, "peerDependencies": { "react": "17.0.2", diff --git a/platform/app/package.json b/platform/app/package.json index 76fdeee4d..639a494ea 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.74.7", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@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 5a36fce0e..9380629f2 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.74.7", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@ohif/ui": "3.8.0", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts index d71626062..f40b27324 100644 --- a/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts +++ b/platform/core/src/services/HangingProtocolService/HangingProtocolService.ts @@ -1020,6 +1020,8 @@ export default class HangingProtocolService extends PubSubService { if (this.registeredImageLoadStrategies[imageLoadStrategy] instanceof Function) { this.activeImageLoadStrategyName = imageLoadStrategy; } + } else { + this.activeImageLoadStrategyName = null; } this._updateStageStatus(options); diff --git a/yarn.lock b/yarn.lock index 08d791b0e..38356d104 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.74.7": - version "1.74.7" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.74.7.tgz#7fca3f8b464dd810eebce0f241ae8d522714d5ed" - integrity sha512-+k5Pw9YC2GdGJqigcPdaok9ouLg4GWd9n4nh5KAmf6CC9gtwa3gv9g+lP97NYFEsD+T1L95zMUsz5nocjdtduQ== +"@cornerstonejs/adapters@^1.77.3": + version "1.77.3" + resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.77.3.tgz#3cac2b8747f437af98fb7a586473445d786ede69" + integrity sha512-+Ik0SLgTzBfcAeys8naiNxXxS5N5+JVKfWzvDi5qDprsK4xXvcJZpfg0O/Ry6rO9kZpjnQl61CMiHaMzMmyERw== dependencies: "@babel/runtime-corejs2" "^7.17.8" - "@cornerstonejs/tools" "^1.74.7" + "@cornerstonejs/tools" "^1.77.3" 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.74.7": - version "1.74.7" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.74.7.tgz#5dda0c83eaaebd2ac3ae24424042259e87ae7c72" - integrity sha512-nHHZStrZj4avLXbf+cULOtzXAFOMsraSANuCZtSVtXY5qtlTe5QzqPxtJw0nmZyMuv5JXZ8HJhxibzKarX9c+A== +"@cornerstonejs/core@^1.77.3": + version "1.77.3" + resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.77.3.tgz#e29455259ed151fbd772a24a7574414217a6675c" + integrity sha512-QSu8TkIWc0lZBWbCByYhEySqmU8xleiqbQqQrgO9iMp2M4M+XOz8pIvox2WsQteqCLonZWMVI2T4J7q6osSX6A== 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.74.7": - version "1.74.7" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.74.7.tgz#e3f8a7df256570b06880190397d16655dbc2a964" - integrity sha512-YKi80odvgYLZNU/Fm27KTE0Vmr8uDiCkdaozvVL+zvcULRGjENoyVVakWqvgHDF9a18W0cnI+lXHLN0W8QG6Yw== +"@cornerstonejs/dicom-image-loader@^1.77.3": + version "1.77.3" + resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.77.3.tgz#90fb8407a20bd6f52b4e2921a2bd62e791810b07" + integrity sha512-b+ysKZvmA1+sFEb+6//GsjmhhPstsX4a7Gj7pflKGqX+8aPMQ+nF8zv3R0D26eAejoC9hGcaGupYlXfiVq7dBA== 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.74.7" + "@cornerstonejs/core" "^1.77.3" dicom-parser "^1.8.9" pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/streaming-image-volume-loader@^1.74.7": - version "1.74.7" - resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.74.7.tgz#baa0cdb8f35ac3dec1c8e737fec98d5083e94871" - integrity sha512-FgNdPJkiD9qQLCpeqb1aWX/mxhRACFUtBvkNMM0rZY/952K9HAdmvDhGtFLo0vX5VsDA3JFkSMhBaHkhDYB+IA== +"@cornerstonejs/streaming-image-volume-loader@^1.77.3": + version "1.77.3" + resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.77.3.tgz#6ce50784106282ab3db65a5561515b8c23b3411f" + integrity sha512-HqJ+Qj8IfmR+0kpw+XXTKNs09WVzdAubmE41RR2i8b4BckT4qaY0EmYaAMlG+sxJtIVBsb4QnvQ6lXkRhjJW4w== dependencies: - "@cornerstonejs/core" "^1.74.7" + "@cornerstonejs/core" "^1.77.3" comlink "^4.4.1" -"@cornerstonejs/tools@^1.74.7": - version "1.74.7" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.74.7.tgz#65db685bc65b826f43a9484aeaa208ba37568bac" - integrity sha512-Rhq+xzpFgZij904PmUwAZRQIGiDYrK3RqbteToYu/+cjZ9g3uvJh3f9Bu9plDWwQOqfdFKzAuOlnQCnSaJs3qg== +"@cornerstonejs/tools@^1.77.3": + version "1.77.3" + resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.77.3.tgz#7a26df4a95ad7d25de272adf52da072f3717e4a0" + integrity sha512-vUi0+2pSJ0xLwysj2mWMiFEZJ50ZAfU+5JjKly30aECxCfmURrhnEEOMsECwVxEeBGM5hHNc/Cl4SZGy87dV2Q== dependencies: - "@cornerstonejs/core" "^1.74.7" + "@cornerstonejs/core" "^1.77.3" "@icr/polyseg-wasm" "0.4.0" "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"