diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index f55520406..4473e9d6c 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.77.0", - "@cornerstonejs/core": "^1.77.0", + "@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 f17ebe438..b8649ae27 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.77.0", - "@cornerstonejs/core": "^1.77.0", - "@cornerstonejs/tools": "^1.77.0", + "@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 176a935a1..5d923ff36 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.77.0", - "@cornerstonejs/streaming-image-volume-loader": "^1.77.0", - "@cornerstonejs/tools": "^1.77.0", + "@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 a5d37098e..dcffae7b2 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.77.0", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.9.0-beta.31", "@ohif/ui": "3.9.0-beta.31", @@ -55,10 +55,10 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^1.77.0", - "@cornerstonejs/core": "^1.77.0", - "@cornerstonejs/streaming-image-volume-loader": "^1.77.0", - "@cornerstonejs/tools": "^1.77.0", + "@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 448f4c77a..b416f7433 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.77.0", - "@cornerstonejs/tools": "^1.77.0", + "@cornerstonejs/core": "^1.77.3", + "@cornerstonejs/tools": "^1.77.3", "@ohif/core": "3.9.0-beta.31", "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.31", "@ohif/ui": "3.9.0-beta.31", 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/platform/app/cypress/integration/ImageConsistency.spec.js b/platform/app/cypress/integration/ImageConsistency.spec.js index 45dea2e41..90672a190 100644 --- a/platform/app/cypress/integration/ImageConsistency.spec.js +++ b/platform/app/cypress/integration/ImageConsistency.spec.js @@ -1,5 +1,3 @@ -import { utilities } from '@cornerstonejs/core'; - /** * Add tests to ensure image consistency and quality */ diff --git a/platform/app/package.json b/platform/app/package.json index d7db076d1..a2c4c33e2 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.77.0", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.9.0-beta.31", "@ohif/extension-cornerstone": "3.9.0-beta.31", diff --git a/platform/core/package.json b/platform/core/package.json index 8d124d867..091709c16 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.77.0", + "@cornerstonejs/dicom-image-loader": "^1.77.3", "@ohif/ui": "3.9.0-beta.31", "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 e5c398220..cc7305dee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2329,13 +2329,13 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cornerstonejs/adapters@^1.77.0": - version "1.77.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.77.0.tgz#c94d7ff566c4036b79ded3501171e54bce5f7605" - integrity sha512-VumgZgCZE60Q6iiEWdVqxKWviKihOg/DLYVOdid+xbhzYHkOIZDMS9wbMLTHy3MJTEEXG/ZhgWJ9Rv5yT93v2Q== +"@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.77.0" + "@cornerstonejs/tools" "^1.77.3" buffer "^6.0.3" dcmjs "^0.29.8" gl-matrix "^3.4.3" @@ -2382,10 +2382,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.77.0": - version "1.77.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.77.0.tgz#c348b4318871c5f89e8fce8b35773eac5a3e3eaa" - integrity sha512-H6QZjHpExD948nYessEfc5DNHTSnF519YUk9Z/2wmt+yM+jmFmTtdkQQIt5Sy5mZ1vJ/47umldGdkU+pRX+XFQ== +"@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" @@ -2393,34 +2393,34 @@ gl-matrix "^3.4.3" lodash.clonedeep "4.5.0" -"@cornerstonejs/dicom-image-loader@^1.77.0": - version "1.77.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.77.0.tgz#2ede9252bdb1292aeacea37fc2f8e52438f10ff4" - integrity sha512-OKUjSWBXNwSr2xv6EPyYFPu5omnQBOIkzQYAMr4bVA6/h9Nc7eWGRbb2ugBWH54RAraM8+9kn/zT1EwcYTBUPw== +"@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.77.0" + "@cornerstonejs/core" "^1.77.3" dicom-parser "^1.8.9" pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/streaming-image-volume-loader@^1.77.0": - version "1.77.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.77.0.tgz#a98b469992d74c5a2b4276bafa5a2d386e8952dc" - integrity sha512-HoWMCB7PqCw+zRBlXwKX5mUNFrPBE6m8CJNunIkX+0XvZ8YHfs0G1SHomoKKKsFt5WMhBXmD+yU4UnoVq1ae8A== +"@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.77.0" + "@cornerstonejs/core" "^1.77.3" comlink "^4.4.1" -"@cornerstonejs/tools@^1.77.0": - version "1.77.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.77.0.tgz#a8ff93208dd70a209dfedc28dab0011ffdfc87c4" - integrity sha512-vp7mZmXWR3v7m7J80V6hfrBTWLL2IjoQK15ws7StOZDTtX6waj1z0CRu70uOMR276xz3W2RsqTZQ6IFclmfcuw== +"@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.77.0" + "@cornerstonejs/core" "^1.77.3" "@icr/polyseg-wasm" "0.4.0" "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"